[oe-commits] org.oe.dev merge of '83d9cf101f881f4f23bd0c33560c2179b08d8874'
florian commit
openembedded-commits at lists.openembedded.org
Fri Jul 13 10:52:49 UTC 2007
merge of '83d9cf101f881f4f23bd0c33560c2179b08d8874'
and 'beb1fc79f1a536fd48b5ecbd2bdfcb11369d5888'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 6f87624e00ae484c37c1f328aef25324697dc0b7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6f87624e00ae484c37c1f328aef25324697dc0b7
Files:
1
packages/gpephone/machined_svn.bb
packages/linux/linux-gta01_2.6.21.5.bb
packages/gpephone/gpe-session-scripts-phone/phonesession
packages/gpephone/gpe-session-scripts-phone_0.67.bb
packages/linux/linux-handhelds-2.6/aximx50/defconfig
packages/linux/linux-handhelds-2.6/eteng500/defconfig
packages/linux/linux-handhelds-2.6/h1910/defconfig
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/linux/linux-handhelds-2.6/h3600/defconfig
packages/linux/linux-handhelds-2.6/h3800/defconfig
packages/linux/linux-handhelds-2.6/h3900/defconfig
packages/linux/linux-handhelds-2.6/h4000/defconfig
packages/linux/linux-handhelds-2.6/h5000/defconfig
packages/linux/linux-handhelds-2.6/htcapache/defconfig
packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6/htcsable/defconfig
packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6/hx4700/defconfig
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/linux/linux-handhelds-2.6/rx1950/defconfig
packages/linux/linux-handhelds-2.6/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb
Diffs:
#
# mt diff -r83d9cf101f881f4f23bd0c33560c2179b08d8874 -r6f87624e00ae484c37c1f328aef25324697dc0b7
#
#
#
# add_file "packages/gpephone/machined_svn.bb"
# content [c192d49beecd4b546ada28a1e7cd67964213339b]
#
# add_file "packages/linux/linux-gta01_2.6.21.5.bb"
# content [b1936abf638c2ef95ea6ca878f69b3ccc447851d]
#
# patch "packages/gpephone/gpe-session-scripts-phone/phonesession"
# from [4eaaedce5e3bb2058cddbe9b64cd12f1149ec3f1]
# to [e0f4897cf03774795773888e2931554df0824118]
#
# patch "packages/gpephone/gpe-session-scripts-phone_0.67.bb"
# from [2f4b948c60bf6f34259951b866ad2c3ae4c3c28e]
# to [ea1d40745d9fe6c81ff23a05247b1fc791189eac]
#
============================================================
--- packages/gpephone/machined_svn.bb c192d49beecd4b546ada28a1e7cd67964213339b
+++ packages/gpephone/machined_svn.bb c192d49beecd4b546ada28a1e7cd67964213339b
@@ -0,0 +1,18 @@
+DESCRIPTION = "Device abstraction and support daemon"
+SECTION = "gpephone"
+PRIORITY = "required"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0"
+PV = "0.1+svn-${SRCDATE}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+#FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
+
============================================================
--- packages/linux/linux-gta01_2.6.21.5.bb b1936abf638c2ef95ea6ca878f69b3ccc447851d
+++ packages/linux/linux-gta01_2.6.21.5.bb b1936abf638c2ef95ea6ca878f69b3ccc447851d
@@ -0,0 +1,10 @@
+require linux-gta01.inc
+
+SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
+SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1"
+
+MOKOR = "moko10"
+PR = "${MOKOR}-r1"
+
+VANILLA_VERSION = "2.6.21.5"
+
============================================================
--- packages/gpephone/gpe-session-scripts-phone/phonesession 4eaaedce5e3bb2058cddbe9b64cd12f1149ec3f1
+++ packages/gpephone/gpe-session-scripts-phone/phonesession e0f4897cf03774795773888e2931554df0824118
@@ -31,7 +31,12 @@ export CAL_RES_PATH=$APP_PATH/share/res
export CAL_RES_PATH=$APP_PATH/share/res
# For GTK input engine
-export PTIM_PATH=/usr/lib/gtk-2.0/2.4.0/immodules/ptim
+if [ -d /usr/lib/gtk-2.0/2.10.0 ]; then
+ export PTIM_PATH=/usr/lib/gtk-2.0/2.10.0/immodules/ptim
+else
+ export PTIM_PATH=/usr/lib/gtk-2.0/2.4.0/immodules/ptim
+fi
+
export PTIM_PIXMAPS_PATH=$PTIM_PATH/pixmaps
export PTIM_CONFIG_FILE=$PTIM_PATH/imconfig
export PTIM_HELPER_PATH=$PTIM_PATH/helper
@@ -43,6 +48,9 @@ matchbox-window-manager -use_titlebar no
gpe-applauncher&
matchbox-window-manager -use_titlebar no&
+# start device support daemon
+machined
+
# Start E-Sound Server
esd -nobeeps -as 2&
esdplay /mnt/sd/sounds/startup.wav
============================================================
--- packages/gpephone/gpe-session-scripts-phone_0.67.bb 2f4b948c60bf6f34259951b866ad2c3ae4c3c28e
+++ packages/gpephone/gpe-session-scripts-phone_0.67.bb ea1d40745d9fe6c81ff23a05247b1fc791189eac
@@ -14,7 +14,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scr
file://disable-composite.xsettings \
file://standard-apps.patch;patch=1"
-PR = "r6"
+PR = "r7"
S = "${WORKDIR}/gpe-session-scripts-${PV}"
#
# mt diff -rbeb1fc79f1a536fd48b5ecbd2bdfcb11369d5888 -r6f87624e00ae484c37c1f328aef25324697dc0b7
#
#
#
# patch "packages/linux/linux-handhelds-2.6/aximx50/defconfig"
# from [b6b6f34f49d022dfb2406575f0d0c235cd9089cb]
# to [c58dac487789da938bd3704a2fbeb209bb7ffeb4]
#
# patch "packages/linux/linux-handhelds-2.6/eteng500/defconfig"
# from [905b27fed33071a00962254249c0295376963388]
# to [c629a726af9231ba0e0c4ae626f7822b344721a8]
#
# patch "packages/linux/linux-handhelds-2.6/h1910/defconfig"
# from [93ed15c6d83a96ed4aedb73fa55bb2118f89edc6]
# to [70d6f166f046f47b5002f563894f486741dc13d3]
#
# patch "packages/linux/linux-handhelds-2.6/h2200/defconfig"
# from [feef892cbfa0be5bab21370a34ccfb42c44145fa]
# to [99708dbf25bd3441c9082b1630f4af3135a40557]
#
# patch "packages/linux/linux-handhelds-2.6/h3600/defconfig"
# from [651535240b2413debc4fcc3aaa0ff3505b93f8e8]
# to [684feca04103818ccaa7bd51b5b40a733dac10a6]
#
# patch "packages/linux/linux-handhelds-2.6/h3800/defconfig"
# from [f25477f15940089e48eb23bdddc5d098a075bada]
# to [80357c930951185c0fc7a827fe95c9eba41b0a34]
#
# patch "packages/linux/linux-handhelds-2.6/h3900/defconfig"
# from [981d9f31bbdc72de018b643b47d120ea53fa1379]
# to [b65157983e413087ae6092b33005e8ba48ad99ea]
#
# patch "packages/linux/linux-handhelds-2.6/h4000/defconfig"
# from [4932372e78dce91d533ea1da62dc49734fd4764d]
# to [af0d759545fd4769dbb73dbfc63b63b5127fb5e3]
#
# patch "packages/linux/linux-handhelds-2.6/h5000/defconfig"
# from [126b6dc66ff3e7a82a9d6f98662d41efab760713]
# to [d13b145698e299ed856d81e5507de08384cf1a09]
#
# patch "packages/linux/linux-handhelds-2.6/htcapache/defconfig"
# from [7addd9dd4ac5d4edc0a0214f42a704e645017508]
# to [d58b51562b431ecee6e123bf977cfc217fc480ff]
#
# patch "packages/linux/linux-handhelds-2.6/htcblueangel/defconfig"
# from [9689f9d709f46c6177db50e5cc8f05826d2f13c5]
# to [e988adccc6557607a32ed6ac0c24eb135e0e72d2]
#
# patch "packages/linux/linux-handhelds-2.6/htcsable/defconfig"
# from [8859f0978e3ec80e423cf6fa402235335902f60a]
# to [34ab2a830eefdf668846ada757c25e897025192d]
#
# patch "packages/linux/linux-handhelds-2.6/htcuniversal/defconfig"
# from [e1d61ebd7e5edc1cf0efe0bb29d3d34289ccd99a]
# to [0a7f9696bfd6840a8a9b37f30a5352183e8b5c6d]
#
# patch "packages/linux/linux-handhelds-2.6/htcwallaby/defconfig"
# from [4ad37385c6a0ed248f68a9058d36f0bdc7bf1fcd]
# to [4855e0e90c415dc02c4302643a0c8ba32514a821]
#
# patch "packages/linux/linux-handhelds-2.6/hx4700/defconfig"
# from [5ef9bcade447b0e79d72a2b52b4c6a5a1e5c418d]
# to [f0e17953b3fa00afb91f4d11b0333f47e963a61f]
#
# patch "packages/linux/linux-handhelds-2.6/magician/defconfig"
# from [dedaba452a20412e75b91aae293feecef3f64858]
# to [bb8f612e815c3b2691b68fc3fa42bba4ac6d44ca]
#
# patch "packages/linux/linux-handhelds-2.6/rx1950/defconfig"
# from [1c03c2c1d8555228ed64cc68dbff92b6e0a3f723]
# to [8a6da32bf73cb551abd6781e25d3b0230f9e4c36]
#
# patch "packages/linux/linux-handhelds-2.6/rx3000/defconfig"
# from [a5dd63a56ddd84864d436851f0d4a23ac9947193]
# to [5ebac2417c26e9ed4598768348962b0246c9b45d]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb"
# from [252b9c26ddd2fda4271f4352999ce0facbfece99]
# to [07839c0797b5ba09b5aae7fcdbb3232965b3f8e3]
#
============================================================
--- packages/linux/linux-handhelds-2.6/aximx50/defconfig b6b6f34f49d022dfb2406575f0d0c235cd9089cb
+++ packages/linux/linux-handhelds-2.6/aximx50/defconfig c58dac487789da938bd3704a2fbeb209bb7ffeb4
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh9
-# Fri Jun 22 18:35:15 2007
+# Linux kernel version: 2.6.21-hh11
+# Wed Jul 11 07:04:11 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -183,6 +183,7 @@ CONFIG_DRAM_BASE=0xa8000000
# CONFIG_MACH_RECON is not set
# CONFIG_MACH_GHI270HG is not set
# CONFIG_MACH_GHI270 is not set
+# CONFIG_MACH_LOOXC550 is not set
# CONFIG_PXA_SHARPSL is not set
# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA27x=y
@@ -487,7 +488,7 @@ CONFIG_MTD_DEBUG_VERBOSE=0
CONFIG_MTD=y
CONFIG_MTD_DEBUG=y
CONFIG_MTD_DEBUG_VERBOSE=0
-# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
@@ -496,10 +497,9 @@ CONFIG_MTD_PARTITIONS=y
#
# User Modules And Translation Layers
#
-# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6/eteng500/defconfig 905b27fed33071a00962254249c0295376963388
+++ packages/linux/linux-handhelds-2.6/eteng500/defconfig c629a726af9231ba0e0c4ae626f7822b344721a8
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh10
-# Sat Jun 30 18:46:45 2007
+# Linux kernel version: 2.6.21-hh11
+# Wed Jul 11 07:04:11 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -480,7 +480,7 @@ CONFIG_MTD_DEBUG_VERBOSE=0
CONFIG_MTD=y
CONFIG_MTD_DEBUG=y
CONFIG_MTD_DEBUG_VERBOSE=0
-# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
@@ -489,10 +489,9 @@ CONFIG_MTD_PARTITIONS=y
#
# User Modules And Translation Layers
#
-# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h1910/defconfig 93ed15c6d83a96ed4aedb73fa55bb2118f89edc6
+++ packages/linux/linux-handhelds-2.6/h1910/defconfig 70d6f166f046f47b5002f563894f486741dc13d3
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh10
-# Sat Jun 30 19:40:48 2007
+# Linux kernel version: 2.6.21-hh11
+# Wed Jul 11 07:04:12 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -182,6 +182,7 @@ CONFIG_IPAQ_H1900_BUTTONS=y
# CONFIG_MACH_RECON is not set
# CONFIG_MACH_GHI270HG is not set
# CONFIG_MACH_GHI270 is not set
+# CONFIG_MACH_LOOXC550 is not set
# CONFIG_PXA_SHARPSL is not set
# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA25x=y
@@ -485,7 +486,7 @@ CONFIG_MTD_DEBUG_VERBOSE=0
CONFIG_MTD=y
CONFIG_MTD_DEBUG=y
CONFIG_MTD_DEBUG_VERBOSE=0
-# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
@@ -494,10 +495,9 @@ CONFIG_MTD_PARTITIONS=y
#
# User Modules And Translation Layers
#
-# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h2200/defconfig feef892cbfa0be5bab21370a34ccfb42c44145fa
+++ packages/linux/linux-handhelds-2.6/h2200/defconfig 99708dbf25bd3441c9082b1630f4af3135a40557
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh9
-# Fri Jun 22 18:35:16 2007
+# Linux kernel version: 2.6.21-hh11
+# Wed Jul 11 07:04:12 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -180,6 +180,7 @@ CONFIG_ARCH_H2200=y
# CONFIG_MACH_RECON is not set
# CONFIG_MACH_GHI270HG is not set
# CONFIG_MACH_GHI270 is not set
+# CONFIG_MACH_LOOXC550 is not set
# CONFIG_PXA_SHARPSL is not set
# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA25x=y
@@ -506,7 +507,7 @@ CONFIG_MTD_DEBUG_VERBOSE=0
CONFIG_MTD=y
CONFIG_MTD_DEBUG=y
CONFIG_MTD_DEBUG_VERBOSE=0
-# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
@@ -515,10 +516,9 @@ CONFIG_MTD_PARTITIONS=y
#
# User Modules And Translation Layers
#
-# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
@@ -967,7 +967,6 @@ CONFIG_LEDS_CLASS=y
#
# LED drivers
#
-# CONFIG_LEDS_H2200 is not set
CONFIG_LEDS_HAMCOP=y
#
@@ -1365,7 +1364,18 @@ CONFIG_RAMFS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h3600/defconfig 651535240b2413debc4fcc3aaa0ff3505b93f8e8
+++ packages/linux/linux-handhelds-2.6/h3600/defconfig 684feca04103818ccaa7bd51b5b40a733dac10a6
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh9
-# Fri Jun 22 18:35:18 2007
+# Linux kernel version: 2.6.21-hh11
+# Wed Jul 11 07:04:13 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -154,6 +154,7 @@ CONFIG_SA1100_H3XXX=y
# CONFIG_SA1100_BADGE4 is not set
# CONFIG_SA1100_JORNADA56X is not set
# CONFIG_SA1100_JORNADA720 is not set
+# CONFIG_SA1100_JORNADA820 is not set
# CONFIG_SA1100_XDA is not set
# CONFIG_SA1100_HACKKIT is not set
# CONFIG_SA1100_LART is not set
@@ -468,7 +469,7 @@ CONFIG_MTD_DEBUG_VERBOSE=0
CONFIG_MTD=y
CONFIG_MTD_DEBUG=y
CONFIG_MTD_DEBUG_VERBOSE=0
-# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
@@ -477,10 +478,9 @@ CONFIG_MTD_PARTITIONS=y
#
# User Modules And Translation Layers
#
-# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h3800/defconfig f25477f15940089e48eb23bdddc5d098a075bada
+++ packages/linux/linux-handhelds-2.6/h3800/defconfig 80357c930951185c0fc7a827fe95c9eba41b0a34
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh10
-# Sat Jun 30 18:46:46 2007
+# Linux kernel version: 2.6.21-hh11
+# Wed Jul 11 07:04:13 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -467,7 +467,7 @@ CONFIG_MTD_DEBUG_VERBOSE=0
CONFIG_MTD=y
CONFIG_MTD_DEBUG=y
CONFIG_MTD_DEBUG_VERBOSE=0
-# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
@@ -476,10 +476,9 @@ CONFIG_MTD_PARTITIONS=y
#
# User Modules And Translation Layers
#
-# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h3900/defconfig 981d9f31bbdc72de018b643b47d120ea53fa1379
+++ packages/linux/linux-handhelds-2.6/h3900/defconfig b65157983e413087ae6092b33005e8ba48ad99ea
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh9
-# Fri Jun 22 18:35:22 2007
+# Linux kernel version: 2.6.21-hh11
+# Wed Jul 11 07:04:14 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -183,6 +183,7 @@ CONFIG_IPAQ_H3900_BATTERY=y
# CONFIG_MACH_RECON is not set
# CONFIG_MACH_GHI270HG is not set
# CONFIG_MACH_GHI270 is not set
+# CONFIG_MACH_LOOXC550 is not set
# CONFIG_PXA_SHARPSL is not set
# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA25x=y
@@ -486,7 +487,7 @@ CONFIG_MTD_DEBUG_VERBOSE=0
CONFIG_MTD=y
CONFIG_MTD_DEBUG=y
CONFIG_MTD_DEBUG_VERBOSE=0
-# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
@@ -495,10 +496,9 @@ CONFIG_MTD_PARTITIONS=y
#
# User Modules And Translation Layers
#
-# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
============================================================
--- packages/linux/linux-handhelds-2.6/h4000/defconfig 4932372e78dce91d533ea1da62dc49734fd4764d
+++ packages/linux/linux-handhelds-2.6/h4000/defconfig af0d759545fd4769dbb73dbfc63b63b5127fb5e3
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh9
-# Fri Jun 22 18:35:24 2007
+# Linux kernel version: 2.6.21-hh11
+# Wed Jul 11 07:31:39 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -161,6 +161,7 @@ CONFIG_IPAQ_H4000_BACKLIGHT=y
CONFIG_IPAQ_H4000_IRDA=y
CONFIG_IPAQ_H4000_LCD=y
CONFIG_IPAQ_H4000_BACKLIGHT=y
+CONFIG_IPAQ_H4000_PCMCIA=y
CONFIG_IPAQ_H4000_BUTTONS=y
CONFIG_IPAQ_H4000_LEDS=y
CONFIG_IPAQ_H4000_BT=m
@@ -188,6 +189,7 @@ CONFIG_IPAQ_H4300_KBD=y
# CONFIG_MACH_RECON is not set
# CONFIG_MACH_GHI270HG is not set
# CONFIG_MACH_GHI270 is not set
+# CONFIG_MACH_LOOXC550 is not set
# CONFIG_PXA_SHARPSL is not set
# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA25x=y
@@ -226,9 +228,18 @@ CONFIG_XSCALE_PMU=y
#
# PCCARD (PCMCIA/CardBus) support
#
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=y
+CONFIG_PCMCIA_DEBUG=y
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
#
+# PC-card bridges
+#
+CONFIG_PCMCIA_PXA2XX=y
+
+#
# Kernel Features
#
CONFIG_PREEMPT=y
@@ -466,6 +477,10 @@ CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
# CONFIG_BT_HCIVHCI is not set
# CONFIG_IEEE80211 is not set
CONFIG_WIRELESS_EXT=y
@@ -495,7 +510,7 @@ CONFIG_MTD_DEBUG_VERBOSE=0
CONFIG_MTD=y
CONFIG_MTD_DEBUG=y
CONFIG_MTD_DEBUG_VERBOSE=0
-# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
@@ -504,10 +519,9 @@ CONFIG_MTD_PARTITIONS=y
#
# User Modules And Translation Layers
#
-# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLKDEVS is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
@@ -673,12 +687,37 @@ CONFIG_NET_RADIO=y
# Obsolete Wireless cards support (pre-802.11)
#
# CONFIG_STRIP is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+
+#
+# Wireless 802.11 Frequency Hopping cards support
+#
+# CONFIG_PCMCIA_RAYCS is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Wireless 802.11b Pcmcia/Cardbus cards support
+#
+# CONFIG_AIRO_CS is not set
+# CONFIG_PCMCIA_WL3501 is not set
# CONFIG_HOSTAP is not set
CONFIG_ACX=m
-CONFIG_ACX_MEM=y
-CONFIG_ACX_H4000=m
+# CONFIG_ACX_MEM is not set
+CONFIG_ACX_CS=y
+CONFIG_NET_WIRELESS=y
#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
# Wan interfaces
#
# CONFIG_WAN is not set
@@ -802,6 +841,13 @@ CONFIG_LEGACY_PTY_COUNT=32
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_TIHTC is not set
+
+#
%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list