From 22cd91206ed18233a83feaf7668485854a4ab4f4 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 15 Jun 2006 14:46:18 +0000
Subject: linux-oz-2.6: Sync with OE. Includes .bb cleanup, patch
 classification and poky specific logo handling

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@484 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/packages/linux/linux-openzaurus.inc | 43 ++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'openembedded/packages/linux/linux-openzaurus.inc')

diff --git a/openembedded/packages/linux/linux-openzaurus.inc b/openembedded/packages/linux/linux-openzaurus.inc
index e99bd0731..64da31ea7 100644
--- a/openembedded/packages/linux/linux-openzaurus.inc
+++ b/openembedded/packages/linux/linux-openzaurus.inc
@@ -107,6 +107,43 @@ do_configure() {
 		echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
 	fi
 
+	if [ "${DISTRO}" == "openzaurus" ]; then
+		case ${MACHINE} in
+			c7x0 | akita | spitz )
+				echo "CONFIG_LOGO_OZ640_CLUT224=y"            >> ${S}/.config
+				echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config
+				echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
+				;;
+			tosa )
+				echo "CONFIG_LOGO_OZ480_CLUT224=y"            >> ${S}/.config
+				echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config
+				echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
+				;;
+			poodle | collie )
+				echo "CONFIG_LOGO_OZ240_CLUT224=y"            >> ${S}/.config
+				echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config
+				echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config
+				;;
+		esac 
+		echo "CONFIG_LOGO=y"                          >> ${S}/.config
+		echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config
+		echo "# CONFIG_LOGO_OHAND_CLUT224 is not set" >> ${S}/.config
+	elif [ "${DISTRO}" == "poky" ]; then
+		echo "CONFIG_LOGO=y"                          >> ${S}/.config
+		echo "CONFIG_LOGO_OHAND_CLUT224=y"            >> ${S}/.config
+		echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
+		echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config
+		echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config
+		echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config
+	else 
+		echo "# CONFIG_LOGO is not set"               >> ${S}/.config
+		echo "# CONFIG_LOGO_OHAND_CLUT224 is not set" >> ${S}/.config
+		echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config
+		echo "# CONFIG_LOGO_OZ240_CLUT224 is not set" >> ${S}/.config
+		echo "# CONFIG_LOGO_OZ480_CLUT224 is not set" >> ${S}/.config
+		echo "# CONFIG_LOGO_OZ640_CLUT224 is not set" >> ${S}/.config
+	fi
+
 	sed -e '/CONFIG_AEABI/d' \
 	    -e '/CONFIG_OABI_COMPAT=/d' \
 	    -e '/CONFIG_CMDLINE=/d' \
@@ -114,6 +151,12 @@ do_configure() {
 	    -e '/CONFIG_MTDRAM_TOTAL_SIZE=/d' \
 	    -e '/CONFIG_MTDRAM_ERASE_SIZE=/d' \
 	    -e '/CONFIG_MTDRAM_ABS_POS=/d' \
+	    -e '/CONFIG_LOGO=/d' \
+	    -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \
+	    -e '/CONFIG_LOGO_OHAND_CLUT224=/d' \
+	    -e '/CONFIG_LOGO_OZ240_CLUT224=/d' \
+	    -e '/CONFIG_LOGO_OZ480_CLUT224=/d' \
+	    -e '/CONFIG_LOGO_OZ640_CLUT224=/d' \
 	    '${WORKDIR}/defconfig-${MACHINE}' >>'${S}/.config'
 
 	yes '' | oe_runmake oldconfig
-- 
cgit v1.2.3