Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev

54 files changed, 14189 insertions, 773 deletions

diff --git a/classes/java.bbclass b/classes/java.bbclass
index cacd2ce525..b68035c13e 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -68,11 +68,11 @@ oe_jarinstall() {
 
   # Creates symlinks out of the remaining arguments.
   while [ "$#" -gt 0 ]; do
-    if [ -e $dir/$1 ]; then
+    if [ -e $dir/$1 -o -h $dir/$1 ]; then
       oewarn "file was in the way. removing:" $dir/$1
       rm $dir/$1
     fi
-    ln -sf $destname $dir/$1
+    ln -s $destname $dir/$1
     shift
   done
 }
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index ad9c0b96f1..96e7799d2a 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -351,6 +351,7 @@ IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_
 IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
 IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) ${EXTRA_IMAGECMD}"
 IMAGE_CMD_cpio.gz = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}"
+IMAGE_CMD_cpio.lzma = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | lzma -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}"
 IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg"
 IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}"
 
@@ -361,6 +362,7 @@ EXTRA_IMAGECMD_squashfs = ""
 EXTRA_IMAGECMD_squashfs-lzma = ""
 EXTRA_IMAGECMD_cpio = ""
 EXTRA_IMAGECMD_cpio.gz = ""
+EXTRA_IMAGECMD_cpio.lzma = ""
 EXTRA_IMAGECMD_ubi = ""
 EXTRA_IMAGECMD_ubifs = ""
 
@@ -372,6 +374,7 @@ IMAGE_DEPENDS_ext2 = "genext2fs-native"
 IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
 IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native"
 IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_cpio.lzma = "lzma-native"
 IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
 IMAGE_DEPENDS_squashfs-lzma = "squashfs-tools-native"
 IMAGE_DEPENDS_ubi = "mtd-utils-native"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index c07d11116d..ae4896cdf2 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1966,6 +1966,10 @@ sha256=68da29f515a26ca1b5722c940615ddc4b0550b2b1ad5d11129b1da636c353160
 md5=88fa901c9a85633ab62365b0ee9df3b1
 sha256=6651eb15c9f6dabf21af4067b723cb29a87827f66570bfab74fdc00d80cab129
 
+[http://arora.googlecode.com/files/arora-0.10.1.tar.gz]
+md5=ac38282a2d9134687d9c30dbb73c0fbc
+sha256=1828cbd348d1418287b29337e1047cfc3d6c092e18691cd9c6dfc2d6535bcebd
+
 [ftp://ftp.ee.lbl.gov/arpwatch-2.1a15.tar.gz]
 md5=cebfeb99c4a7c2a6cee2564770415fe7
 sha256=c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
@@ -15662,6 +15666,10 @@ sha256=7a61e8b686ae7d659835175018da3a1baa959329b77c18e6e9381a197937296f
 md5=7075f580606a84e63b7d6d9fa3124c31
 sha256=7ff5f355bb254a3d4ed4541377e6304432ee8678e7c9ec29e7d43488903004c9
 
+[http://downloads.sourceforge.net/parchive/libpar2/libpar2-0.2.tar.gz]
+md5=94c6df4e38efe08056ecde2a04e0be91
+sha256=074fbf840f73b1e13e0405fce261078c81c8c0a4859e30a7bba10510f9199908
+
 [http://www.netsurf-browser.org/projects/releases/libparserutils-0.0.1-src.tar.gz]
 md5=5999c2d52f8c07eeef2a8808fee4f858
 sha256=5aed4edfd2023ed3ccd566fe76131d10faf43c8c3efa2e90978eed37c5503165
@@ -18906,6 +18914,10 @@ sha256=7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd
 md5=37b4479951fa0cf052269d27c41ca200
 sha256=6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9
 
+[http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.40.tar.gz]
+md5=32e7373c16271606007374396e6742ad
+sha256=2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432
+
 [ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc1.tar.bz2]
 md5=1c03d3f4ccedcd9de1c0ac2226e0031c
 sha256=f62969cd61dc9718973708b79f5e86f653f630097f5ad14f90d78fcff677c0da
@@ -19486,6 +19498,14 @@ sha256=797dab52e18592d340c36ef6e126368bc1c9c98bbb873bef9ba9fc70911616b9
 md5=103c5c821474ae6df7a3055ee72f4d00
 sha256=c80d9ea7ebca32b63ea23d2a52ac799cff32f8f30c66b491d2b8f93da05585e4
 
+[http://downloads.sourceforge.net/nzbget/nzbget-stable/nzbget-0.6.0.tar.gz]
+md5=eb95b3930abffb570e37af8d284c1f9d
+sha256=b0bc8740db7ed9ea269b29e9a936cb2c4dd61a911b80b623fe18729b94de3030
+
+[http://downloads.sourceforge.net/nzbget/nzbget-stable/nzbget-0.7.0-testing-r342.tar.gz]
+md5=4250d8166969367b4feff4204b42ecb9
+sha256=37c595e78c4a5c86fa1c39d4dba39786d9546ae0a078b936832df9d17bafba10
+
 [http://releases.0x539.de/obby/obby-0.4.1.tar.gz]
 md5=b79146369fc76a61d6d4056a937c71c8
 sha256=b69a259795762881a5384072085bb501d77c6fb974e0b7a16ca573565ffe3629
@@ -24254,6 +24274,10 @@ sha256=2ca2591847df72224dd6f99c8fffe35bb63bf41a8519d8e15ad48141aa841bfa
 md5=46f92e42243bc51aaa3871645ce78bd5
 sha256=cb07a9801a128e2f42cf49b7e9d577b092ab54aa05242655af93491a73a91a1f
 
+[http://www.sqlite.org/sqlite-3.6.20.tar.gz]
+md5=0faf8fc8ccff5297513c6532b2b4ce23
+sha256=c172ce97dc7201f38acdff22df467e1514e7225b88c636145e72a66a4ca6d07d
+
 [http://www.sqlite.org/sqlite-3.6.5.tar.gz]
 md5=ed3151ecaeb3f0a484195da5f694c773
 sha256=99bcda2aaf7109a2859ee88aec1f370f61e461343c9bce6cc37f1bed5d933f67
diff --git a/conf/machine/htcdream.conf b/conf/machine/htcdream.conf
index 7f7680a732..d09782c40f 100644
--- a/conf/machine/htcdream.conf
+++ b/conf/machine/htcdream.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: HTC Dream
-#@DESCRIPTION: Machine configuration for HTC Dream smartphone
+#@DESCRIPTION: Machine configuration for HTC Dream phone (aka T-Mobile G1 and Google ADP-1)
 
 require conf/machine/include/htc-msm7.inc
 
@@ -10,4 +10,3 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usbgadget bluetooth keyboard ext2" 
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
-
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index e87b56c282..2c5c4f2387 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r48"
+MACHINE_KERNEL_PR = "r49"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf
index 2839b7ddf6..88cb9cc8e3 100644
--- a/conf/machine/omap3-touchbook.conf
+++ b/conf/machine/omap3-touchbook.conf
@@ -8,6 +8,7 @@ XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
            xf86-input-tslib \
+           xf86-video-fbdev \
            xf86-video-omapfb \
            xf86-input-keyboard"
 
diff --git a/recipes/chicken/chicken.inc b/recipes/chicken/chicken.inc
index f0126a9c16..9aebc4f5d5 100644
--- a/recipes/chicken/chicken.inc
+++ b/recipes/chicken/chicken.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.call-with-current-continuation.org/"
 SECTION = "interpreters"
 PRIORITY = "optional"
 LICENSE = "BSD"
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "http://chicken.wiki.br/releases/${PV}/chicken-${PV}.tar.gz"
 
@@ -13,14 +13,21 @@ PARALLEL_MAKE = ""
 # Required environment values
 export PLATFORM="linux"
 export PREFIX="${prefix}"
-export LIBRARIAN="${TARGET_PREFIX}"
+export HOSTSYSTEM="${HOST_SYS}"
 export TARGETSYSTEM="${TARGET_SYS}"
+export INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS="-m 755"
+export INSTALL_PROGRAM_STATIC_LIBRARY_OPTIONS="-m 644"
+export INSTALL_PROGRAM_EXECUTABLE_OPTIONS="-m 755"
+export INSTALL_PROGRAM_FILE_OPTIONS="-m 644"
 
 do_compile() {
 	case ${TARGET_ARCH} in
 	i*86)
 		ARCH=x86
 		;;
+	x86_64)
+		ARCH=x86-64
+		;;
 	*)
 		echo "Check ARCH value for ${TARGET_ARCH}"
 		exit 1
@@ -35,6 +42,9 @@ do_install() {
 	i*86)
 		ARCH=x86
 		;;
+	x86_64)
+		ARCH=x86-64
+		;;
 	*)
 		echo "Check ARCH value for ${TARGET_ARCH}"
 		exit 1
diff --git a/recipes/gdb/gdb_7.0.bb b/recipes/gdb/gdb_7.0.bb
index 9a4684409b..c3aa49d0e4 100644
--- a/recipes/gdb/gdb_7.0.bb
+++ b/recipes/gdb/gdb_7.0.bb
@@ -3,3 +3,6 @@ LICENSE = "GPLv3"
 
 SRC_URI += "\
             file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+
+# Work-around problems while creating libbfd.a
+EXTRA_OECONF += "--enable-static"
diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
index 33d0be4aa2..9dca7cb6b6 100644
--- a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
+++ b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "firefox gtk+ gconf dbus-glib"
 RDEPENDS = "firefox gnome-mplayer"
 
-PR = "r3"
+PR = "r4"
 
 inherit autotools
 
@@ -17,13 +17,14 @@ SRC_URI = "http://gecko-mediaplayer.googlecode.com/files/${P}.tar.gz \
 MOZILLA_HOME = "firefox-3.5.4"
 
 do_install_append() {
-	ln -sf ${libdir}/mozilla ${D}${libdir}/${MOZILLA_HOME}
+	install -d ${D}${libdir}/${MOZILLA_HOME}/extensions/
 	cp -dpR ${WORKDIR}/extens* ${D}${libdir}/mozilla/
+	ln -sf ${libdir}/mozilla/extensions/flash@alwaysinnovating.com ${D}${libdir}/${MOZILLA_HOME}/extensions/
 }
 
 PACKAGES =+ "${PN}-firefox-hack"
 RDEPENDS_${PN}-firefox-hack = "${PN}"
-FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions"
+FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions ${libdir}/${MOZILLA_HOME}"
 
 FILES_${PN} += "${sysconfdir}/* \
                 ${libdir}/mozilla/* ${libdir}/${MOZILLA_HOME}"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
index b8aa30d52e..95b46176af 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
@@ -4,4 +4,4 @@ SRC_URI += "file://gnome-mplayer-svn.diff;patch=1;pnum=0 \
             file://default.patch;patch=1 \
 "
 
-PR = "r8"
+PR = "r9"
diff --git a/recipes/gnome/gdm-2.28.0/gdm b/recipes/gnome/gdm-2.28.0/gdm
index fed9c06ad7..43eae95177 100755
--- a/recipes/gnome/gdm-2.28.0/gdm
+++ b/recipes/gnome/gdm-2.28.0/gdm
@@ -32,10 +32,21 @@ DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 case "$1" in
   start)
 	# make needed directories in volatile
+
+	if [ -e /var/log/gdm ] ; then 
+		rm -rf /var/log/gdm
+	fi
+
 	mkdir -m 01770 /var/log/gdm
 	chown gdm:gdm /var/log/gdm
+
+	if [ -e /tmp/.ICE-unix ] ; then 
+		rm -rf /tmp/.ICE-unix
+	fi
+
 	mkdir -m 01777 /tmp/.ICE-unix
 	chown root:root /tmp/.ICE-unix
+
         CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)")
         if grep -wqs text /proc/cmdline; then
             echo "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline."
diff --git a/recipes/gnome/gdm_2.28.0.bb b/recipes/gnome/gdm_2.28.0.bb
index 683773a3ab..1fc5e74f73 100644
--- a/recipes/gnome/gdm_2.28.0.bb
+++ b/recipes/gnome/gdm_2.28.0.bb
@@ -1,12 +1,14 @@
 DESCRIPTION = "Graphical login manager"
 LICENSE = "GPL"
 
-DEPENDS = "libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb"
+DEPENDS = "tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb"
 
-PR = "r1"
+PR = "r3"
 
 inherit gnome update-rc.d
 
+RDEPENDS_${PN} += "grep"
+
 SRC_URI += " \
             file://cross-xdetection.diff;patch=1 \
             file://%gconf-tree.xml \
diff --git a/recipes/gnome/gnome-icon-theme_2.28.0.bb b/recipes/gnome/gnome-icon-theme_2.28.0.bb
index 7e5c7b3af8..38f212927f 100644
--- a/recipes/gnome/gnome-icon-theme_2.28.0.bb
+++ b/recipes/gnome/gnome-icon-theme_2.28.0.bb
@@ -3,11 +3,11 @@ SECTION = "x11/gnome"
 DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native"
 RDEPENDS = "hicolor-icon-theme"
 RRECOMMENDS = "librsvg-gtk"
+PACKAGE_ARCH = "all"
+PR = "r1"
 
 FILES_${PN} += "${datadir}/*"
 
 EXTRA_OECONF = "--disable-hicolor-check"
 
 inherit gnome
-
-
diff --git a/recipes/libpar2/libpar2_0.2.bb b/recipes/libpar2/libpar2_0.2.bb
new file mode 100644
index 0000000000..c9a110f457
--- /dev/null
+++ b/recipes/libpar2/libpar2_0.2.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "A tool to apply the data-recovery capability concepts of RAID-like systems \
+to the posting & recovery of multi-part archives on Usenet."
+SECTION = "libs"
+LICENSE = "GPL"
+HOMEPAGE = "http://parchive.sourceforge.net/"
+DEPENDS = "libsigc++-2.0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/parchive/libpar2/libpar2-${PV}.tar.gz"
+
+inherit autotools_stage pkgconfig
diff --git a/recipes/linux/linux-omap-2.6.29/musb/0030-musb-fifo.patch b/recipes/linux/linux-omap-2.6.29/musb/0030-musb-fifo.patch
new file mode 100644
index 0000000000..8ac3707ad3
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.29/musb/0030-musb-fifo.patch
@@ -0,0 +1,26 @@
+diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
+index d3b8e0e..cee974e 100644
+--- a/drivers/usb/musb/musb_core.c
++++ b/drivers/usb/musb/musb_core.c
+@@ -1103,15 +1103,12 @@ static struct fifo_cfg __initdata mode_4_cfg[] = {
+ { .hw_ep_num =  8, .style = FIFO_RX,   .maxpacket = 512, },
+ { .hw_ep_num =  9, .style = FIFO_TX,   .maxpacket = 512, },
+ { .hw_ep_num =  9, .style = FIFO_RX,   .maxpacket = 512, },
+-{ .hw_ep_num = 10, .style = FIFO_TX,   .maxpacket = 256, },
+-{ .hw_ep_num = 10, .style = FIFO_RX,   .maxpacket = 64, },
+-{ .hw_ep_num = 11, .style = FIFO_TX,   .maxpacket = 256, },
+-{ .hw_ep_num = 11, .style = FIFO_RX,   .maxpacket = 64, },
+-{ .hw_ep_num = 12, .style = FIFO_TX,   .maxpacket = 256, },
+-{ .hw_ep_num = 12, .style = FIFO_RX,   .maxpacket = 64, },
+-{ .hw_ep_num = 13, .style = FIFO_RXTX, .maxpacket = 4096, },
+-{ .hw_ep_num = 14, .style = FIFO_RXTX, .maxpacket = 1024, },
+-{ .hw_ep_num = 15, .style = FIFO_RXTX, .maxpacket = 1024, },
++{ .hw_ep_num = 10, .style = FIFO_TX,   .maxpacket = 512, },
++{ .hw_ep_num = 10, .style = FIFO_RX,   .maxpacket = 512, },
++{ .hw_ep_num = 11, .style = FIFO_RXTX, .maxpacket = 512, },
++{ .hw_ep_num = 12, .style = FIFO_RXTX, .maxpacket = 4096,},
++{ .hw_ep_num = 13, .style = FIFO_RXTX, .maxpacket = 512, },
++{ .hw_ep_num = 14, .style = FIFO_RXTX, .maxpacket = 512, },
+ };
+ 
+ 
diff --git a/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c b/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c
deleted file mode 100644
index c7867bef2f..0000000000
--- a/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c
+++ /dev/null
@@ -1,744 +0,0 @@
-/*
- * linux/arch/arm/mach-omap2/board-omap3beagle.c
- *
- * Copyright (C) 2008 Texas Instruments
- *
- * Modified from mach-omap2/board-3430sdp.c
- *
- * Initial code: Syed Mohammed Khasim
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/leds.h>
-#include <linux/gpio.h>
-#include <linux/input.h>
-#include <linux/gpio_keys.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
-
-#include <mach/mcspi.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
-#include <linux/mma7455l.h>
-
-#include <mach/dmtimer.h>
-#include <linux/backlight.h>
-
-#include <linux/regulator/machine.h>
-#include <linux/i2c/twl4030.h>
-#include <linux/omapfb.h>
-
-#include <mach/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/flash.h>
-
-#include <mach/board.h>
-#include <mach/usb.h>
-#include <mach/common.h>
-#include <mach/gpmc.h>
-#include <mach/nand.h>
-#include <mach/mux.h>
-#include <mach/omap-pm.h>
-#include <mach/clock.h>
-#include <mach/display.h>
-
-#include "twl4030-generic-scripts.h"
-#include "mmc-twl4030.h"
-#include "pm.h"
-#include "omap3-opp.h"
-
-
-#define GPMC_CS0_BASE  0x60
-#define GPMC_CS_SIZE   0x30
-
-#define NAND_BLOCK_SIZE		SZ_128K
-
-#define OMAP3_AC_GPIO		136 //Int1 DRDY
-#define OMAP3_TS_GPIO		162
-#define TB_BL_PWM_TIMER		9
-#define TB_KILL_POWER_GPIO	168
-
-static struct mtd_partition omap3beagle_nand_partitions[] = {
-	/* All the partition sizes are listed in terms of NAND block size */
-	{
-		.name		= "X-Loader",
-		.offset		= 0,
-		.size		= 4 * NAND_BLOCK_SIZE,
-		.mask_flags	= MTD_WRITEABLE,	/* force read-only */
-	},
-	{
-		.name		= "U-Boot",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x80000 */
-		.size		= 15 * NAND_BLOCK_SIZE,
-		.mask_flags	= MTD_WRITEABLE,	/* force read-only */
-	},
-	{
-		.name		= "U-Boot Env",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x260000 */
-		.size		= 1 * NAND_BLOCK_SIZE,
-	},
-	{
-		.name		= "Kernel",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x280000 */
-		.size		= 32 * NAND_BLOCK_SIZE,
-	},
-	{
-		.name		= "File System",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x680000 */
-		.size		= MTDPART_SIZ_FULL,
-	},
-};
-
-static struct omap_nand_platform_data omap3beagle_nand_data = {
-	.options	= NAND_BUSWIDTH_16,
-	.parts		= omap3beagle_nand_partitions,
-	.nr_parts	= ARRAY_SIZE(omap3beagle_nand_partitions),
-	.dma_channel	= -1,		/* disable DMA in OMAP NAND driver */
-	.nand_setup	= NULL,
-	.dev_ready	= NULL,
-};
-
-static struct resource omap3beagle_nand_resource = {
-	.flags		= IORESOURCE_MEM,
-};
-
-static struct platform_device omap3beagle_nand_device = {
-	.name		= "omap2-nand",
-	.id		= -1,
-	.dev		= {
-		.platform_data	= &omap3beagle_nand_data,
-	},
-	.num_resources	= 1,
-	.resource	= &omap3beagle_nand_resource,
-};
-
-#include "sdram-micron-mt46h32m32lf-6.h"
-
-static struct omap_uart_config omap3_beagle_uart_config __initdata = {
-	.enabled_uarts	= ((1 << 0) | (1 << 1) | (1 << 2)),
-};
-
-static struct twl4030_usb_data beagle_usb_data = {
-	.usb_mode	= T2_USB_MODE_ULPI,
-};
-
-static struct twl4030_hsmmc_info mmc[] = {
-	{
-		.mmc		= 1,
-		.wires		= 8,
-		.gpio_wp	= 29,
-	},
-	{}	/* Terminator */
-};
-
-static struct regulator_consumer_supply beagle_vmmc1_supply = {
-	.supply			= "vmmc",
-};
-
-static struct regulator_consumer_supply beagle_vsim_supply = {
-	.supply			= "vmmc_aux",
-};
-
-static struct gpio_led gpio_leds[];
-
-static int beagle_twl_gpio_setup(struct device *dev,
-		unsigned gpio, unsigned ngpio)
-{
-	/* gpio + 0 is "mmc0_cd" (input/IRQ) */
-	omap_cfg_reg(AH8_34XX_GPIO29);
-	mmc[0].gpio_cd = gpio + 0;
-	twl4030_mmc_init(mmc);
-
-	/* link regulators to MMC adapters */
-	beagle_vmmc1_supply.dev = mmc[0].dev;
-	beagle_vsim_supply.dev = mmc[0].dev;
-
-	/* REVISIT: need ehci-omap hooks for external VBUS
-	 * power switch and overcurrent detect
-	 */
-
-#if 0 /* TODO: This needs to be modified to not rely on u-boot */
-	gpio_request(gpio + 1, "EHCI_nOC");
-	gpio_direction_input(gpio + 1);
-
-	/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
-	gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
-	gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
-
-	/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
-	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
-#endif
-	return 0;
-}
-
-static struct twl4030_gpio_platform_data beagle_gpio_data = {
-	.gpio_base	= OMAP_MAX_GPIO_LINES,
-	.irq_base	= TWL4030_GPIO_IRQ_BASE,
-	.irq_end	= TWL4030_GPIO_IRQ_END,
-	.use_leds	= true,
-	.pullups	= BIT(1),
-	.pulldowns