From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 8 Oct 2005 11:52:18 +0000 (+0000)
Subject: linux-oz-2.6: Add joint defconfig handling for cxx00 models
X-Git-Tag: Release-2010-05/1~9453^2~3314
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2811edaf1ca61c1d1867df5c4c8a563040589c5;p=openembedded.git

linux-oz-2.6: Add joint defconfig handling for cxx00 models
---

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