[oe-commits] org.oe.dev merge of '79480b22471a1e33c199dca94abfa313f4bd0127'
koen commit
openembedded-commits at lists.openembedded.org
Thu Aug 23 12:10:52 UTC 2007
merge of '79480b22471a1e33c199dca94abfa313f4bd0127'
and 'ad30a8ff6fed36a655dd5ba0014a93623be4937d'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 60886f11068b84382ae4769a9fb5f1b85f9a6aa5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=60886f11068b84382ae4769a9fb5f1b85f9a6aa5
Files:
1
packages/ltp/ltp-20070228/runltp-path.patch
packages/linux/linux-2.6.21/gumstix-verdex/defconfig
packages/linux/linux_2.6.21.bb
Diffs:
#
# mt diff -r79480b22471a1e33c199dca94abfa313f4bd0127 -r60886f11068b84382ae4769a9fb5f1b85f9a6aa5
#
#
#
# patch "packages/ltp/ltp-20070228/runltp-path.patch"
# from [05229a3d38d01cb102e5d9c2479b7e3c3c6e244c]
# to [60b2f63bed93e45d756fb82a7caa59d7180f79e3]
#
============================================================
--- packages/ltp/ltp-20070228/runltp-path.patch 05229a3d38d01cb102e5d9c2479b7e3c3c6e244c
+++ packages/ltp/ltp-20070228/runltp-path.patch 60b2f63bed93e45d756fb82a7caa59d7180f79e3
@@ -11,3 +11,14 @@ Index: runltp
export TMPBASE="/tmp"
export TMP="${TMPBASE}/ltp-$$"
export PATH="${PATH}:${LTPROOT}/testcases/bin"
+--- ltp-full-20060412.orig/runltp 2007-02-28 20:40:17.000000000 -0800
++++ ltp-full-20060412/runltp 2007-04-01 11:38:38.000000000 -0700
+@@ -285,7 +285,7 @@
+ ${LTPROOT}/runtest/sched ${LTPROOT}/runtest/math \
+ ${LTPROOT}/runtest/nptl ${LTPROOT}/runtest/pty
+ do
+- [ -a "$SCENFILES" ] || \
++ [ -e "$SCENFILES" ] || \
+ {
+ echo "FATAL: missing scenario file $SCENFILES"
+ exit 1
#
# mt diff -rad30a8ff6fed36a655dd5ba0014a93623be4937d -r60886f11068b84382ae4769a9fb5f1b85f9a6aa5
#
#
#
# patch "packages/linux/linux-2.6.21/gumstix-verdex/defconfig"
# from [7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7]
# to [62c342f45eeb5b3ed2ad8b3df1ba17710c322b17]
#
# patch "packages/linux/linux_2.6.21.bb"
# from [ba51fa252ec8e5f423145d8b34259d0a8a42c124]
# to [334365c6be19ebecd953842a2dbbabc7b9c4dc98]
#
============================================================
--- packages/linux/linux-2.6.21/gumstix-verdex/defconfig 7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7
+++ packages/linux/linux-2.6.21/gumstix-verdex/defconfig 62c342f45eeb5b3ed2ad8b3df1ba17710c322b17
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21
-# Mon Jul 2 16:48:14 2007
+# Thu Aug 23 14:02:59 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -36,19 +36,22 @@ CONFIG_LOCALVERSION_AUTO=y
#
CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set
CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
# CONFIG_TASKSTATS is not set
# CONFIG_UTS_NS is not set
# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_EMBEDDED=y
@@ -77,8 +80,8 @@ CONFIG_MODULE_UNLOAD=y
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
@@ -148,9 +151,9 @@ CONFIG_ARCH_GUMSTIX=y
# CONFIG_PXA_SHARPSL is not set
# CONFIG_MACH_TRIZEPS4 is not set
# CONFIG_ARCH_GUMSTIX_ORIG is not set
-CONFIG_ARCH_GUMSTIX_F=y
-# CONFIG_ARCH_GUMSTIX_VERDEX is not set
-CONFIG_PXA25x=y
+# CONFIG_ARCH_GUMSTIX_F is not set
+CONFIG_ARCH_GUMSTIX_VERDEX=y
+CONFIG_PXA27x=y
#
# Processor Type
@@ -170,14 +173,13 @@ CONFIG_ARM_THUMB=y
CONFIG_ARM_THUMB=y
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_OUTER_CACHE is not set
-# CONFIG_IWMMXT is not set
+CONFIG_IWMMXT=y
CONFIG_XSCALE_PMU=y
#
# Bus support
#
-CONFIG_PROC_GPIO=m
-# CONFIG_PROC_GPIO_DEBUG is not set
+# CONFIG_PROC_GPIO is not set
#
# PCCARD (PCMCIA/CardBus) support
@@ -200,7 +202,7 @@ CONFIG_AEABI=y
CONFIG_NO_IDLE_HZ=y
CONFIG_HZ=100
CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
+CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
@@ -213,7 +215,7 @@ CONFIG_ALIGNMENT_TRAP=y
# CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_ALIGNMENT_TRAP=y
-CONFIG_ALIGNMENT_HANDLING=0x02
+CONFIG_ALIGNMENT_HANDLING=0x3
#
# Boot options
@@ -236,13 +238,16 @@ CONFIG_KEXEC=y
#
# At least one emulation must be selected
#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
#
# Userspace binary formats
#
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_MISC=m
#
# Power management options
@@ -262,9 +267,9 @@ CONFIG_NET=y
# Networking options
#
# CONFIG_NETDEBUG is not set
-CONFIG_PACKET=m
+CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=m
+CONFIG_UNIX=y
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_XFRM_SUB_POLICY is not set
@@ -642,7 +647,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
#
CONFIG_MTD_COMPLEX_MAPPINGS=y
# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_GUMSTIX=y
+# CONFIG_MTD_GUMSTIX is not set
# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_SHARP_SL is not set
# CONFIG_MTD_PLATRAM is not set
@@ -817,9 +822,9 @@ CONFIG_NET_ETHERNET=y
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_SMC91X=m
-CONFIG_SMC91X_GUMSTIX=m
+CONFIG_MII=y
+CONFIG_SMC91X=y
+CONFIG_SMC91X_GUMSTIX=y
# CONFIG_DM9000 is not set
# CONFIG_SMC911X is not set
@@ -1062,7 +1067,8 @@ CONFIG_I2C_PXA_SLAVE=y
#
# LED devices
#
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
#
# LED drivers
@@ -1071,6 +1077,10 @@ CONFIG_I2C_PXA_SLAVE=y
#
# LED Triggers
#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
#
# Multimedia devices
@@ -1085,7 +1095,9 @@ CONFIG_I2C_PXA_SLAVE=y
#
# Graphics support
#
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_LCD_CLASS_DEVICE=m
CONFIG_FB=m
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB_DDC is not set
@@ -1105,6 +1117,7 @@ CONFIG_FB_PXA_SHARP_LQ043_PSP=y
CONFIG_FB_PXA=m
# CONFIG_FB_PXA_ALPS_CDOLLAR is not set
CONFIG_FB_PXA_SHARP_LQ043_PSP=y
+# CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C is not set
CONFIG_FB_PXA_PARAMETERS=y
# CONFIG_FB_MBX is not set
# CONFIG_FB_VIRTUAL is not set
@@ -1135,7 +1148,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_PCM_OSS_PLUGINS=y
# CONFIG_SND_DYNAMIC_MINORS is not set
# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
+CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set
@@ -1198,7 +1211,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
+CONFIG_USB_ARCH_HAS_OHCI=y
# CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB is not set
@@ -1214,10 +1227,10 @@ CONFIG_USB_GADGET_GUMSTIX=m
CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_GUMSTIX=m
# CONFIG_USB_GADGET_NET2280 is not set
-CONFIG_USB_GADGET_PXA2XX=y
-CONFIG_USB_PXA2XX=m
-# CONFIG_USB_PXA2XX_SMALL is not set
-# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+CONFIG_USB_GADGET_PXA27X=y
+CONFIG_USB_PXA27X=m
+# CONFIG_USB_PXA27X_DMA is not set
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_LH7A40X is not set
# CONFIG_USB_GADGET_OMAP is not set
============================================================
--- packages/linux/linux_2.6.21.bb ba51fa252ec8e5f423145d8b34259d0a8a42c124
+++ packages/linux/linux_2.6.21.bb 334365c6be19ebecd953842a2dbbabc7b9c4dc98
@@ -28,7 +28,7 @@ SRC_URI_append_sarge-at91 = " http://max
file://2.6.21-sarge-phy.patch;patch=1 \
file://2.6.21-sarge-mmc.patch;patch=1"
-SRC_URI_append_gumstix = "\
+GUMSTIX_PATCHES = "\
file://pxa-regs-additions.patch;patch=1 \
file://header.patch;patch=1 \
file://arch-config.patch;patch=1 \
@@ -72,3 +72,6 @@ SRC_URI_append_gumstix = "\
file://gumstix-fb-logo.patch;patch=1 \
file://pxafb-18bpp-mode.patch;patch=1 \
"
+
+SRC_URI_append_gumstix-verdex = "${GUMSTIX_PATCHES}"
+SRC_URI_append_gumstix-connex = "${GUMSTIX_PATCHES}"
More information about the Openembedded-commits
mailing list