merge of '3c71db502f1f99ac9b5d9e0ab928273904283f4f'

     and 'c2ccffcf8a360685e566eab3f870529066019228'

36 files changed, 938 insertions, 421 deletions

diff --git a/classes/e.bbclass b/classes/e.bbclass
index 14199aaf0d..7166e729b5 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -1,5 +1,7 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SECTION = "e/apps"
+SRCNAME ?= "${PN}"
+
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http"
 S = "${WORKDIR}/${SRCNAME}"
 
@@ -10,6 +12,10 @@ do_prepsources () {
 }
 addtask prepsources after do_fetch before do_unpack
 
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+}
+
 export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
 export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 75a6aeca91..e21ed7fef5 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -43,6 +43,7 @@ SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-frameworkd ?= "248637c1264624aa08de40c2bbea96c418e0702e"
+SRCREV_pn-fso-gpsd ?= "a79873ad595d7b524727daf06810a130fe002277"
 SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
@@ -156,7 +157,6 @@ SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
 SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4214"
-SRCREV_pn-python-etk ?= "8b51535150cbc88467e3d8b578e54df27eac643"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
@@ -191,7 +191,7 @@ SRCREV_pn-zhone ?= "be3d72c6e5f5c0733df7064a616f8e39c1c12f2b"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "35727"
+EFL_SRCREV ?= "35984"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
@@ -249,7 +249,3 @@ SRCREV_pn-e-wm ?= "${EFL_SRCREV}"
 SRCREV_pn-enna ?= "${EFL_SRCREV}"
 SRCREV_pn-exquisite ?= "${EFL_SRCREV}"
 SRCREV_pn-rage ?= "${EFL_SRCREV}"
-
-# Illume module
-# Use EFL_SRCREV again when E does not segfault
-SRCREV_pn-illume ?= "35866"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index bf358e9e11..b5cd75f944 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -20,7 +20,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-omap2"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-omap"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/packages/binutils/binutils-cross-sdk.inc b/packages/binutils/binutils-cross-sdk.inc
index b545083d94..5da1d4fa8f 100644
--- a/packages/binutils/binutils-cross-sdk.inc
+++ b/packages/binutils/binutils-cross-sdk.inc
@@ -2,7 +2,9 @@ inherit sdk
 DEPENDS += "flex-native bison-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \
-		--program-prefix=${TARGET_PREFIX}"
+				--program-prefix=${TARGET_PREFIX} \
+	       		--enable-install-libbfd \
+                --disable-werror"
 
 do_stage() {
 	:
diff --git a/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb b/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb
index 76dff5449f..f84a61d1f5 100644
--- a/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb
+++ b/packages/binutils/binutils-cross-sdk_2.15.94.0.1.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r0"
+PR = "r1"
diff --git a/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb b/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
index 4695c61cd5..574265cf57 100644
--- a/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
+++ b/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r3"
+PR = "r4"
diff --git a/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb b/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb
index 4695c61cd5..574265cf57 100644
--- a/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb
+++ b/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r3"
+PR = "r4"
diff --git a/packages/binutils/binutils-cross-sdk_2.18.50.0.7.bb b/packages/binutils/binutils-cross-sdk_2.18.50.0.7.bb
index 4695c61cd5..574265cf57 100644
--- a/packages/binutils/binutils-cross-sdk_2.18.50.0.7.bb
+++ b/packages/binutils/binutils-cross-sdk_2.18.50.0.7.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r3"
+PR = "r4"
diff --git a/packages/binutils/binutils-cross-sdk_2.18.bb b/packages/binutils/binutils-cross-sdk_2.18.bb
index 4695c61cd5..574265cf57 100644
--- a/packages/binutils/binutils-cross-sdk_2.18.bb
+++ b/packages/binutils/binutils-cross-sdk_2.18.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r3"
+PR = "r4"
diff --git a/packages/binutils/binutils-cross-sdk_cvs.bb b/packages/binutils/binutils-cross-sdk_cvs.bb
index ae5691cf93..6886255c7f 100644
--- a/packages/binutils/binutils-cross-sdk_cvs.bb
+++ b/packages/binutils/binutils-cross-sdk_cvs.bb
@@ -1,3 +1,4 @@
 require binutils_cvs.bb
 require binutils-cross-sdk.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
\ No newline at end of file
+PR = "r4"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
diff --git a/packages/e17/e-utils_svn.bb b/packages/e17/e-utils_svn.bb
deleted file mode 100644
index f90a118cdf..0000000000
--- a/packages/e17/e-utils_svn.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Enlightenment Window Manager Utilities"
-DEPENDS = "eet evas ecore edje esmart ewl engrave"
-LICENSE = "MIT BSD"
-PV = "0.0.0+svnr${SRCREV}"
-PR = "r1"
-
-inherit e
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD;module=e_utils;proto=http"
-S = "${WORKDIR}/e_utils"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
diff --git a/packages/e17/edje-editor_svn.bb b/packages/e17/edje-editor_svn.bb
index 4cbbf19e9e..44e0158d6b 100644
--- a/packages/e17/edje-editor_svn.bb
+++ b/packages/e17/edje-editor_svn.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "Edje-Editor is just that."
+SECTION = "x11/devel"
 LICENSE = "MIT BSD"
 DEPENDS = "etk"
+SRCNAME = "edje_editor"
+
 PV = "0.0.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit e
 
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=edje_editor;proto=http"
-S = "${WORKDIR}/edje_editor"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
+FILES_${PN} += "${datadir}"
diff --git a/packages/e17/enna_svn.bb b/packages/e17/enna_svn.bb
index 6bfabbdee5..d365d63435 100644
--- a/packages/e17/enna_svn.bb
+++ b/packages/e17/enna_svn.bb
@@ -11,6 +11,4 @@ inherit e
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/MISC;module=enna;proto=http"
 S = "${WORKDIR}/enna"
 
-do_configure_prepend() {
-    autopoint
-}
+FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug"
diff --git a/packages/e17/examine_svn.bb b/packages/e17/examine_svn.bb
deleted file mode 100644
index 223d29ca25..0000000000
--- a/packages/e17/examine_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Examine, the program configurator"
-LICENSE = "MIT BSD"
-DEPENDS = "ewl"
-PV = "0.0.1+svnr${SRCREV}"
-PR = "r1"
-
-SRCNAME = "examine"
-
-inherit e
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/e17/exhibit_svn.bb b/packages/e17/exhibit_svn.bb
index 6ec34d6ff9..2035bc193e 100644
--- a/packages/e17/exhibit_svn.bb
+++ b/packages/e17/exhibit_svn.bb
@@ -4,6 +4,4 @@ DEPENDS = "evas ecore epsilon edje eet etk efreet"
 PV = "0.1.1+svnr${SRCREV}"
 PR = "r1"
 
-SRCNAME = "exhibit"
-
 inherit e
diff --git a/packages/e17/expedite_svn.bb b/packages/e17/expedite_svn.bb
index 2f3ef20e16..1337487623 100644
--- a/packages/e17/expedite_svn.bb
+++ b/packages/e17/expedite_svn.bb
@@ -3,9 +3,9 @@ DEPENDS = "eet evas"
 RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
 LICENSE = "MIT BSD"
 PV = "0.6.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r0"
 
-inherit autotools
+inherit e
 
 EXTRA_OECONF = "\
   --x-includes=${STAGING_INCDIR}/X11 \
@@ -24,8 +24,4 @@ EXTRA_OECONF = "\
   --disable-software-sdl \
 "
 
-do_configure_append() {
-        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-}
-
 FILES_${PN} += "${datadir}"
diff --git a/packages/e17/exquisite_svn.bb b/packages/e17/exquisite_svn.bb
index 4c0a5678c8..4777226df5 100644
--- a/packages/e17/exquisite_svn.bb
+++ b/packages/e17/exquisite_svn.bb
@@ -4,8 +4,6 @@ DEPENDS = "eet evas ecore embryo edje"
 PV = "0.0.1+svnr${SRCREV}"
 PR = "r1"
 
-SRCNAME = "exquisite"
-
 inherit e
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
diff --git a/packages/e17/rage_svn.bb b/packages/e17/rage_svn.bb
index d351ffd2a4..526744e681 100644
--- a/packages/e17/rage_svn.bb
+++ b/packages/e17/rage_svn.bb
@@ -1,12 +1,9 @@
 DESCRIPTION = "Rage is a media center application based on EFL"
-AUTHOR = "Carsten 'The Rasterman' Heitzler"
+AUTHOR = "Carsten 'The Rasterman' Haitzler"
 HOMEPAGE = "http://www.rasterman.com"
 LICENSE = "MIT BSD"
 DEPENDS = "evas ecore edje"
 SECTION = "x11/multimedia"
 PV = "0.3.0.042+svnr${SRCREV}"
 
-inherit autotools
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=rage;proto=http"
-S = "${WORKDIR}/rage"
+inherit e
diff --git a/packages/freesmartphone/fso-gpsd_git.bb b/packages/freesmartphone/fso-gpsd_git.bb
new file mode 100644
index 0000000000..2f99ea9760
--- /dev/null
+++ b/packages/freesmartphone/fso-gpsd_git.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "gspd compatibility layer for frameworkd"
+LICENSE = "GPL"
+SECTION = "network"
+DEPENDS = "dbus-glib"
+PV = "0.5+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/fso-gpsd.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+inherit autotools
diff --git a/packages/id3lib/id3lib_3.8.3.bb b/packages/id3lib/id3lib_3.8.3.bb
index 76134bc6fd..fa6fc3c5bc 100644
--- a/packages/id3lib/id3lib_3.8.3.bb
+++ b/packages/id3lib/id3lib_3.8.3.bb
@@ -3,16 +3,14 @@ SECTION = "libs/multimedia"
 PRIORITY = "optional"
 DEPENDS = "zlib"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 inherit autotools
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz"
-S = "${WORKDIR}/id3lib-${PV}"
+SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz \
+           http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz;patch=1 \
+          "
 
 do_stage() {
-	oe_libinstall -a -so -C src libid3 ${STAGING_LIBDIR}
-	install -m 0644 include/id3.h ${STAGING_INCDIR}
-	install -d ${STAGING_INCDIR}/id3/
-	install -m 0644 include/id3/*.h ${STAGING_INCDIR}/id3/
+	autotools_stage_all
 }
diff --git a/packages/linux/linux-omap/omap3evm/defconfig b/packages/linux/linux-omap/omap3evm/defconfig
index e61fad48d9..102f6ecd63 100644
--- a/packages/linux/linux-omap/omap3evm/defconfig
+++ b/packages/linux/linux-omap/omap3evm/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.26-rc5-omap1
-# Sun Jun 15 21:58:01 2008
+# Linux kernel version: 2.6.27-rc6-omap1
+# Sun Sep 14 21:25:30 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -12,6 +12,7 @@ CONFIG_MMU=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
@@ -23,6 +24,8 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_SUPPORTS_AOUT=y
 CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_OPROFILE_ARMV7=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
@@ -64,12 +67,12 @@ CONFIG_UID16=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_EXTRA_PASS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_COMPAT_BRK=y
+# CONFIG_ELF_CORE is not set
+# CONFIG_COMPAT_BRK is not set
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_ANON_INODES=y
@@ -79,17 +82,25 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
-# CONFIG_PROFILING is not set
+CONFIG_PROFILING=y
 # CONFIG_MARKERS is not set
+CONFIG_OPROFILE=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
+# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
+# CONFIG_HAVE_IOREMAP_PROT is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_ARCH_TRACEHOOK is not set
 # CONFIG_HAVE_DMA_ATTRS is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+CONFIG_HAVE_CLK=y
 CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -97,7 +108,7 @@ CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
@@ -106,6 +117,7 @@ CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 CONFIG_LSF=y
 # CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
 
 #
 # IO Schedulers
@@ -113,12 +125,12 @@ CONFIG_LSF=y
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_AS=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_CLASSIC_RCU=y
 
 #
@@ -131,7 +143,6 @@ CONFIG_CLASSIC_RCU=y
 # CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
@@ -145,8 +156,11 @@ CONFIG_CLASSIC_RCU=y
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KIRKWOOD is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_MV78XX0 is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_PNX4008 is not set
@@ -173,8 +187,9 @@ CONFIG_ARCH_OMAP3=y
 #
 # CONFIG_OMAP_DEBUG_POWERDOMAIN is not set
 # CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set
-# CONFIG_OMAP_SMARTREFLEX is not set
-# CONFIG_OMAP_RESET_CLOCKS is not set
+CONFIG_OMAP_SMARTREFLEX=y
+# CONFIG_OMAP_SMARTREFLEX_TESTING is not set
+CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_BOOT_TAG=y
 CONFIG_OMAP_BOOT_REASON=y
 # CONFIG_OMAP_COMPONENT_VERSION is not set
@@ -187,9 +202,9 @@ CONFIG_OMAP_MCBSP=y
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
 CONFIG_OMAP_DM_TIMER=y
-CONFIG_OMAP_LL_DEBUG_UART1=y
+# CONFIG_OMAP_LL_DEBUG_UART1 is not set
 # CONFIG_OMAP_LL_DEBUG_UART2 is not set
-# CONFIG_OMAP_LL_DEBUG_UART3 is not set
+CONFIG_OMAP_LL_DEBUG_UART3=y
 CONFIG_ARCH_OMAP34XX=y
 CONFIG_ARCH_OMAP3430=y
 
@@ -198,8 +213,10 @@ CONFIG_ARCH_OMAP3430=y
 #
 # CONFIG_MACH_OMAP_LDP is not set
 # CONFIG_MACH_OMAP_3430SDP is not set
-CONFIG_MACH_OMAP3EVM=y
-# CONFIG_MACH_OMAP3_BEAGLE is not set
+# CONFIG_MACH_OMAP3EVM is not set
+CONFIG_MACH_OMAP3_BEAGLE=y
+# CONFIG_MACH_OVERO is not set
+CONFIG_OMAP_TICK_GPTIMER=12
 
 #
 # Boot options
@@ -230,7 +247,7 @@ CONFIG_CPU_CP15_MMU=y
 # Processor Features
 #
 CONFIG_ARM_THUMB=y
-# CONFIG_ARM_THUMBEE is not set
+CONFIG_ARM_THUMBEE=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -247,14 +264,15 @@ CONFIG_HAS_TLS_REG=y
 #
 # Kernel Features
 #
-# CONFIG_TICK_ONESHOT is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_PREEMPT is not set
 CONFIG_HZ=128
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
+CONFIG_ARCH_FLATMEM_HAS_HOLES=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -270,7 +288,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-# CONFIG_LEDS is not set
+CONFIG_LEDS=y
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -278,23 +296,29 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=" quiet "
+CONFIG_CMDLINE=" debug "
 # CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
-
-#
-# CPUIdle
-#
-
-#
-# CPU idle PM support
-#
-# CONFIG_CPU_IDLE is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
 
 #
 # CPU Frequency scaling
 #
-# CONFIG_CPU_FREQ is not set
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_DEBUG=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 
 #
 # Floating point emulation
@@ -305,13 +329,14 @@ CONFIG_CMDLINE=" quiet "
 #
 CONFIG_VFP=y
 CONFIG_VFPv3=y
-# CONFIG_NEON is not set
+CONFIG_NEON=y
+CONFIG_NEON_CACHE_BUG=y
 
 #
 # Userspace binary formats
 #
 CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=y
 
 #
@@ -324,10 +349,6 @@ CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_APM_EMULATION is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-
-#
-# Networking
-#
 CONFIG_NET=y
 
 #
@@ -341,12 +362,16 @@ CONFIG_XFRM=y
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_STATISTICS is not set
-# CONFIG_NET_KEY is not set
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
 # CONFIG_ARPD is not set
@@ -391,10 +416,9 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
-CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
@@ -403,7 +427,6 @@ CONFIG_LLC=m
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 # CONFIG_NET_SCHED is not set
-CONFIG_NET_SCH_FIFO=y
 
 #
 # Network testing
@@ -412,25 +435,26 @@ CONFIG_NET_SCH_FIFO=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
+CONFIG_BT=y
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP=y
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
+CONFIG_BT_HIDP=y
 
 #
 # Bluetooth device drivers
 #
-# CONFIG_BT_HCIUSB is not set
+CONFIG_BT_HCIUSB=y
+CONFIG_BT_HCIUSB_SCO=y
 # CONFIG_BT_HCIBTUSB is not set
-CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIBTSDIO=y
 # CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBPA10X is not set
+CONFIG_BT_HCIBCM203X=y
+CONFIG_BT_HCIBPA10X=y
 # CONFIG_BT_HCIBFUSB is not set
 # CONFIG_BT_HCIBRF6150 is not set
 # CONFIG_BT_HCIH4P is not set
@@ -440,35 +464,26 @@ CONFIG_BT_HCIBTSDIO=m
 #
 # Wireless
 #
-CONFIG_CFG80211=m
+CONFIG_CFG80211=y
 CONFIG_NL80211=y
 CONFIG_WIRELESS_EXT=y
-CONFIG_MAC80211=m
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_MAC80211=y
 
 #
 # Rate control algorithm selection
 #
+CONFIG_MAC80211_RC_PID=y
 CONFIG_MAC80211_RC_DEFAULT_PID=y
-# CONFIG_MAC80211_RC_DEFAULT_NONE is not set
-
-#
-# Selecting 'y' for an algorithm will
-#
-
-#
-# build the algorithm into mac80211.
-#
 CONFIG_MAC80211_RC_DEFAULT="pid"
-CONFIG_MAC80211_RC_PID=y
 # CONFIG_MAC80211_MESH is not set
-# CONFIG_MAC80211_LEDS is not set
-# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
-# CONFIG_MAC80211_DEBUG is not set
-CONFIG_IEEE80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_IEEE80211=y
 # CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_WEP=y
+CONFIG_IEEE80211_CRYPT_CCMP=y
+CONFIG_IEEE80211_CRYPT_TKIP=y
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
@@ -483,6 +498,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -492,7 +509,7 @@ CONFIG_MTD=y
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
 
@@ -512,10 +529,8 @@ CONFIG_MTD_BLOCK=y
 #
 # RAM/ROM/Flash chip drivers
 #
-CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI is not set
 # CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -526,10 +541,6 @@ CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD