[oe-commits] org.oe.dev merge of 'c1ea3a8ae4f9e7d4be16a51f112cef674a5306d2'

[koen commit]

merge of 'c1ea3a8ae4f9e7d4be16a51f112cef674a5306d2'
     and 'd8fef75e4f14930650c56b6cce60305fe236f93e'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: f36cf9cfb208fb187f77129e2a4f8ef990ba1c82
ViewMTN: http://monotone.openembedded.org/revision/info/f36cf9cfb208fb187f77129e2a4f8ef990ba1c82
Files:
1
packages/linux/linux-2.6.21/gumstix-verdex/defconfig
packages/linux/linux_2.6.21.bb
packages/openmoko2/libmokojournal2_svn.bb
conf/machine/cm-x270.conf
Diffs:

#
# mt diff -rc1ea3a8ae4f9e7d4be16a51f112cef674a5306d2 -rf36cf9cfb208fb187f77129e2a4f8ef990ba1c82
#
# 
# 
# patch "packages/linux/linux-2.6.21/gumstix-verdex/defconfig"
#  from [3c348910dbfa861d1ba26d1ab8fb948547758c3d]
#    to [45142279000d3236f9ef9f751c7b2f9378335a73]
# 
# patch "packages/linux/linux_2.6.21.bb"
#  from [7c17cb4df270798a771c151cfe56f55916a73fae]
#    to [ea3e4abd8395bae51a2fa300c1079ee0a5041860]
# 
# patch "packages/openmoko2/libmokojournal2_svn.bb"
#  from [b541bf1dc97e0d821a14b471c2dda846d8f49d77]
#    to [2771924ff02a687386dd05a09a18eee904337bcb]
# 
============================================================
--- packages/linux/linux-2.6.21/gumstix-verdex/defconfig	3c348910dbfa861d1ba26d1ab8fb948547758c3d
+++ packages/linux/linux-2.6.21/gumstix-verdex/defconfig	45142279000d3236f9ef9f751c7b2f9378335a73
@@ -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_ZBOOT_ROM_BSS=0x0
 #
 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_SAMSUNG_LTE430WQ_F0C=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
============================================================
--- packages/linux/linux_2.6.21.bb	7c17cb4df270798a771c151cfe56f55916a73fae
+++ packages/linux/linux_2.6.21.bb	ea3e4abd8395bae51a2fa300c1079ee0a5041860
@@ -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 \
        "
 
============================================================
--- packages/openmoko2/libmokojournal2_svn.bb	b541bf1dc97e0d821a14b471c2dda846d8f49d77
+++ packages/openmoko2/libmokojournal2_svn.bb	2771924ff02a687386dd05a09a18eee904337bcb
@@ -5,6 +5,10 @@ inherit openmoko2 lib_package
 
 inherit openmoko2 lib_package
 
+do_configure_prepend() {
+        touch gtk-doc.make
+}
+
 do_stage() {
         autotools_stage_all
 }


#
# mt diff -rd8fef75e4f14930650c56b6cce60305fe236f93e -rf36cf9cfb208fb187f77129e2a4f8ef990ba1c82
#
# 
# 
# patch "conf/machine/cm-x270.conf"
#  from [01698d66d048f367f36e135294ce9ba30856378a]
#    to [f9429eb200a306ada78b0ff137d01a378b020fbb]
# 
============================================================
--- conf/machine/cm-x270.conf	01698d66d048f367f36e135294ce9ba30856378a
+++ conf/machine/cm-x270.conf	f9429eb200a306ada78b0ff137d01a378b020fbb
@@ -8,7 +8,7 @@ PREFERRED_VERSION_linux = "2.6.22"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.22"
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
 require conf/machine/include/tune-xscale.inc
 
@@ -41,7 +41,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian 
 	ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
 	"
 
-MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa iwmmxt"
 
 # to program the compulab NAND flash, the following scheme is suggested.  Create
 # a small rootfs that can fit in NOR flash using the following config: