From 5d5ae855a1773a3bd76f6126d4ce01daf4084709 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Sep 2006 08:56:20 +0000 Subject: linux-oz-2.6.18: Fix locomo patch on collie, update collie defconfig so it builds and fits the device, update pxafb_changeres patch --- packages/linux/linux-openzaurus.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/linux/linux-openzaurus.inc') diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index c205056eaf..809e065bcd 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -112,7 +112,7 @@ do_configure() { echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config fi - if [ "${DISTRO}" == "openzaurus" ]; then + if [ "${DISTRO}" == "openzaurus" -a "${MACHINE}" != "collie" ]; then case ${MACHINE} in c7x0 | akita | spitz ) echo "CONFIG_LOGO_OZ640_CLUT224=y" >> ${S}/.config @@ -133,7 +133,7 @@ do_configure() { 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 + elif [ "${DISTRO}" == "poky" -a "${MACHINE}" != "collie" ]; 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 -- cgit v1.2.3