diff options
| author | Samuel Ortiz <sameo@openedhand.com> | 2007-09-28 17:43:53 +0000 |
|---|---|---|
| committer | Samuel Ortiz <sameo@openedhand.com> | 2007-09-28 17:43:53 +0000 |
| commit | cfa5b19e235a7c563a4ffbbde1ae42d04ab42098 (patch) | |
| tree | c8f6b7cb00906a52f222704fe916ed4473d6a328 | |
| parent | cdafd8b8c839d010fc8e99a11292a17932ab428e (diff) | |
| download | openembedded-core-cfa5b19e235a7c563a4ffbbde1ae42d04ab42098.tar.gz openembedded-core-cfa5b19e235a7c563a4ffbbde1ae42d04ab42098.tar.bz2 openembedded-core-cfa5b19e235a7c563a4ffbbde1ae42d04ab42098.zip | |
linux-rp_2.6.22+2.6.23-rc4: Fix FB overlay.
With rmk's latest pxa patchset, pxa fb overlay is broken.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2819 311d38ba-8fff-0310-9ca6-ca027cbcb966
3 files changed, 32 insertions, 5 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-zylonite b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-zylonite index f10c01a3b6..0321704a1f 100644 --- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-zylonite +++ b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-zylonite @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.23-rc4 -# Tue Sep 25 12:39:31 2007 +# Tue Sep 25 15:57:10 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -230,7 +230,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,38400 root=/dev/mtdblock2 rootfstype=jffs2 mem=64M" +CONFIG_CMDLINE="console=ttyS0,38400 root=/dev/mtdblock2 rootfstype=jffs2 mem=64M dyntick=enable debug" # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set @@ -874,7 +874,7 @@ CONFIG_FB_MODE_HELPERS=y CONFIG_FB_PXA=y # CONFIG_FB_PXA_LCD_QVGA is not set CONFIG_FB_PXA_LCD_VGA=y -# CONFIG_FB_PXA_OVERLAY is not set +CONFIG_FB_PXA_OVERLAY=y # CONFIG_FB_PXA_PARAMETERS is not set # CONFIG_FB_MBX is not set # CONFIG_FB_VIRTUAL is not set @@ -902,7 +902,7 @@ CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_LOGO_OHAND_CLUT224=y +# CONFIG_LOGO_OHAND_CLUT224 is not set # CONFIG_LOGO_OZ240_CLUT224 is not set # CONFIG_LOGO_OZ480_CLUT224 is not set # CONFIG_LOGO_OZ640_CLUT224 is not set diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/pxa_fb_overlay.patch b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/pxa_fb_overlay.patch new file mode 100644 index 0000000000..49c59b3275 --- /dev/null +++ b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/pxa_fb_overlay.patch @@ -0,0 +1,26 @@ +--- + drivers/video/pxafb.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: linux-2.6.22/drivers/video/pxafb.h +=================================================================== +--- linux-2.6.22.orig/drivers/video/pxafb.h 2007-09-25 15:44:42.000000000 +0200 ++++ linux-2.6.22/drivers/video/pxafb.h 2007-09-25 15:45:07.000000000 +0200 +@@ -36,7 +36,7 @@ + struct fb_bitfield transp; + }; + +-#ifdef CONFIG_PXA27x ++#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) + /* PXA Overlay Framebuffer Support */ + struct overlayfb_info + { +@@ -142,7 +142,7 @@ + wait_queue_head_t ctrlr_wait; + struct work_struct task; + +-#ifdef CONFIG_PXA27x ++#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) + /* PXA Overlay Framebuffer Support */ + struct overlayfb_info *overlay1fb; + struct overlayfb_info *overlay2fb; diff --git a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb b/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb index c1883800b5..8a981f4e72 100644 --- a/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb +++ b/meta/packages/linux/linux-rp_2.6.22+2.6.23-rc4.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r6" +PR = "r7" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_htcuniversal = "1" @@ -122,6 +122,7 @@ SRC_URI_append_htcuniversal ="\ SRC_URI_append_zylonite ="\ file://arm_pxa_20070923.patch;patch=1 \ + file://pxa_fb_overlay.patch;patch=1 \ file://irq-gpio-offby1.patch;patch=1 \ file://zylonite-boot.patch;patch=1 \ " |