From b2811edaf1ca61c1d1867df5c4c8a563040589c5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 8 Oct 2005 11:52:18 +0000 Subject: [PATCH] linux-oz-2.6: Add joint defconfig handling for cxx00 models --- .../{defconfig-spitz => defconfig-cxx00} | 0 .../{defconfig-spitz => defconfig-cxx00} | 0 packages/linux/linux-openzaurus.inc | 9 ++++++++- packages/linux/linux-openzaurus_2.6.14-rc1.bb | 2 +- packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) rename packages/linux/linux-openzaurus-2.6.14-rc1/{defconfig-spitz => defconfig-cxx00} (100%) rename packages/linux/linux-openzaurus-2.6.14-rc2-mm1/{defconfig-spitz => defconfig-cxx00} (100%) diff --git a/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-cxx00 similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-spitz rename to packages/linux/linux-openzaurus-2.6.14-rc1/defconfig-cxx00 diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-cxx00 similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-spitz rename to packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-cxx00 diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index c4722a1fdf..907801a382 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -45,7 +45,14 @@ module_autoload_pxaficp_ir = "pxaficp_ir" do_configure() { - install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." + case ${MACHINE} in + akita | spitz | borzoi ) + install -m 0644 ${WORKDIR}/defconfig-cxx00 ${S}/.config || die "No default configuration for cxx00 available." + ;; + *) + install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." + ;; + esac if [ "${MACHINE}" == "collie" ]; then mempos=`echo "obase=16; $mem * 1024 * 1024" | bc` diff --git a/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/packages/linux/linux-openzaurus_2.6.14-rc1.bb index 981880710f..18eb8bb4a0 100644 --- a/packages/linux/linux-openzaurus_2.6.14-rc1.bb +++ b/packages/linux/linux-openzaurus_2.6.14-rc1.bb @@ -76,7 +76,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ file://defconfig-ipaq-pxa270 \ file://defconfig-collie \ file://defconfig-poodle \ - file://defconfig-spitz \ + file://defconfig-cxx00 \ file://defconfig-tosa " # These patches would really help collie/poodle but we diff --git a/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb b/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb index 01532c1bb5..136d18a414 100644 --- a/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb @@ -85,7 +85,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ file://defconfig-ipaq-pxa270 \ file://defconfig-collie \ file://defconfig-poodle \ - file://defconfig-spitz \ + file://defconfig-cxx00 \ file://defconfig-tosa " # These patches would really help collie/poodle but we -- 2.39.5