diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-10-08 09:36:48 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-08 09:36:48 +0000 |
| commit | 438e5f64402239782ab636d0bbafcbea98ec2e50 (patch) | |
| tree | ef2c4c0260d0086b5833024426b68cd10b69c0d7 | |
| parent | 13cab71c3d93636ac0775fb38af1c2bdda2ae08c (diff) | |
| parent | 96b23ad47d6d5f7e4ac962b8a7713f40c69da045 (diff) | |
merge of '556711700dc782e2a3dae33b581a0f4b9d3bca2d'
and '9cb28749b896afea4fb911d08a7bb6f26df50332'
| -rw-r--r-- | packages/linux/linux-2.6.21/gumstix-verdex/defconfig | 7 | ||||
| -rw-r--r-- | packages/linux/linux_2.6.21.bb | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/packages/linux/linux-2.6.21/gumstix-verdex/defconfig b/packages/linux/linux-2.6.21/gumstix-verdex/defconfig index d19cbf34ec..3057d62d5e 100644 --- a/packages/linux/linux-2.6.21/gumstix-verdex/defconfig +++ b/packages/linux/linux-2.6.21/gumstix-verdex/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21 -# Sun Oct 7 14:19:04 2007 +# Mon Oct 8 11:22:41 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -219,7 +219,7 @@ CONFIG_ALIGNMENT_HANDLING=0x2 # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 root=1f01 rootfstype=jffs2" +CONFIG_CMDLINE="" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y @@ -1140,6 +1140,9 @@ CONFIG_FB_PXA=y # CONFIG_FB_PXA_SHARP_LQ043_PSP is not set CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C=y # CONFIG_FB_PXA_NONEOFTHEABOVE is not set +# CONFIG_FB_PXA_LCD_QVGA is not set +CONFIG_FB_PXA_LCD_VGA=y +CONFIG_FB_PXA_OVERLAY=y CONFIG_FB_PXA_PARAMETERS=y # CONFIG_FB_MBX is not set # CONFIG_FB_VIRTUAL is not set diff --git a/packages/linux/linux_2.6.21.bb b/packages/linux/linux_2.6.21.bb index 59a4f3d68b..f2ab2116be 100644 --- a/packages/linux/linux_2.6.21.bb +++ b/packages/linux/linux_2.6.21.bb @@ -72,7 +72,7 @@ GUMSTIX_PATCHES = "\ file://pxa-regs-fixup.patch;patch=1 \ file://gumstix-fb-logo.patch;patch=1 \ file://gumstix-pxa270-mmc.patch;patch=1 \ - file://pxafb-18bpp-mode.patch;patch=1 \ + ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \ file://smc911x-fixup.patch;patch=1 \ " |