diff options
| -rw-r--r-- | packages/linux/linux-openzaurus.inc | 43 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.16.bb | 15 |
2 files changed, 48 insertions, 10 deletions
diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index e99bd07316..64da31ea7a 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/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 diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index dc187ad3b4..e39f5a968e 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -50,6 +50,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \ ${RPSRC}/fbmem_fix-r1.patch;patch=1 \ ${RPSRC}/mmc_oops_fix-r0.patch;patch=1 \ + ${RPSRC}/pxaohci_pwrlimit-r0.patch;patch=1 \ ${RPSRC}/scoop_linkage-r0.patch;patch=1 \ ${RPSRC}/ssp_cleanup-r0.patch;patch=1 \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ @@ -87,6 +88,9 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ ${RPSRC}/poodle_ts_hack-r0.patch;patch=1 \ ${RPSRC}/integrator_rgb-r0.patch;patch=1 \ + ${RPSRC}/logo_oh-r0.patch.bz2;patch=1 \ + ${RPSRC}/logo_oz-r1.patch.bz2;patch=1 \ + ${RPSRC}/logo_rotate_fix-r1.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ ${RPSRC}/pxa-linking-bug.patch;patch=1 \ @@ -97,6 +101,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ file://locomo-kbd-hotkeys.patch;patch=1 \ file://locomo-sysrq+keyrepeat.patch;patch=1 \ file://locomo-lcd-def-bightness.patch;patch=1 \ + file://squashfs3.0-2.6.15.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-ipaq-pxa270 \ file://defconfig-collie \ @@ -106,16 +111,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ file://defconfig-qemuarm \ file://defconfig-tosa " -SRC_URI_append_c7x0 = " file://oz-logo-640.patch.bz2;patch=1 " -SRC_URI_append_akita = " file://oz-logo-640.patch.bz2;patch=1 " -SRC_URI_append_spitz = " file://oz-logo-640.patch.bz2;patch=1 " -SRC_URI_append_collie = " file://oz-logo-240.patch.bz2;patch=1 " -SRC_URI_append_poodle = " file://oz-logo-240.patch.bz2;patch=1 " -SRC_URI_append_tosa = " file://oz-logo-480.patch.bz2;patch=1 " - -SRC_URI += "file://squashfs3.0-2.6.15.patch;patch=1" - - # Disabled until I find the reason this gives issues with cdc_subset # ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \ |