summaryrefslogtreecommitdiff
path: root/packages/linux/linux-openzaurus.inc
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-09-21 08:56:20 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-09-21 08:56:20 +0000
commit5d5ae855a1773a3bd76f6126d4ce01daf4084709 (patch)
treea189c5b2b73ac8f0161075ff01d10cc38d261471 /packages/linux/linux-openzaurus.inc
parent9e895b8330f2b9ddbdabd20e45cb5bf830cb95ce (diff)
linux-oz-2.6.18: Fix locomo patch on collie, update collie defconfig so it builds and fits the device, update pxafb_changeres patch
Diffstat (limited to 'packages/linux/linux-openzaurus.inc')
-rw-r--r--packages/linux/linux-openzaurus.inc4
1 files changed, 2 insertions, 2 deletions
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