diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-06-15 14:46:18 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-06-15 14:46:18 +0000 |
| commit | 22cd91206ed18233a83feaf7668485854a4ab4f4 (patch) | |
| tree | 4b3e395f97a813554bbeec366acb2011ba961a26 /openembedded/packages/linux/linux-openzaurus.inc | |
| parent | 7b663c1ac26daad55eb71c9cb75b531251446c88 (diff) | |
| download | openembedded-core-22cd91206ed18233a83feaf7668485854a4ab4f4.tar.gz openembedded-core-22cd91206ed18233a83feaf7668485854a4ab4f4.tar.bz2 openembedded-core-22cd91206ed18233a83feaf7668485854a4ab4f4.tar.xz openembedded-core-22cd91206ed18233a83feaf7668485854a4ab4f4.zip | |
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
Diffstat (limited to 'openembedded/packages/linux/linux-openzaurus.inc')
| -rw-r--r-- | openembedded/packages/linux/linux-openzaurus.inc | 43 |
1 files changed, 43 insertions, 0 deletions
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 |