Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

32 files changed, 27408 insertions, 57 deletions

diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc
index 0bbba2cd14..c4debd01b2 100644
--- a/packages/bluez/bluez-utils3.inc
+++ b/packages/bluez/bluez-utils3.inc
@@ -76,9 +76,14 @@ OE_LT_RPATH_ALLOW[export]="1"
 
 do_install_append() {
 	install -d ${D}${base_sbindir} ${D}${base_bindir}/  ${D}${sysconfdir}/apm/event.d/
-	mv ${D}${sbindir}/* ${D}${base_sbindir}/
-	mv ${D}${bindir}/* ${D}${base_bindir}/
-	rmdir ${D}${bindir} ${D}${sbindir}
+	if [ "${sbindir}" != "${base_sbindir}" ]; then
+		mv ${D}${sbindir}/* ${D}${base_sbindir}/
+		rmdir ${D}${sbindir}
+	fi
+	if [ "${bindir}" != "${base_bindir}" ]; then
+		mv ${D}${bindir}/* ${D}${base_bindir}/
+		rmdir ${D}${bindir}
+	fi
 	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
 	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
         install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/
diff --git a/packages/busybox/busybox-1.11.1/angstrom/defconfig b/packages/busybox/busybox-1.11.3/angstrom/defconfig
index f3130caca8..f3130caca8 100644
--- a/packages/busybox/busybox-1.11.1/angstrom/defconfig
+++ b/packages/busybox/busybox-1.11.3/angstrom/defconfig
diff --git a/packages/busybox/busybox-1.11.1/defconfig b/packages/busybox/busybox-1.11.3/defconfig
index a7b8ed53a0..a7b8ed53a0 100644
--- a/packages/busybox/busybox-1.11.1/defconfig
+++ b/packages/busybox/busybox-1.11.3/defconfig
diff --git a/packages/busybox/busybox-1.11.1/slugos/defconfig b/packages/busybox/busybox-1.11.3/slugos/defconfig
index d922529cc2..d922529cc2 100644
--- a/packages/busybox/busybox-1.11.1/slugos/defconfig
+++ b/packages/busybox/busybox-1.11.3/slugos/defconfig
diff --git a/packages/busybox/busybox-1.11.1/udhcpscript.patch b/packages/busybox/busybox-1.11.3/udhcpscript.patch
index fc21d440cd..fc21d440cd 100644
--- a/packages/busybox/busybox-1.11.1/udhcpscript.patch
+++ b/packages/busybox/busybox-1.11.3/udhcpscript.patch
diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc
index cc196ad767..63f839e246 100644
--- a/packages/busybox/busybox.inc
+++ b/packages/busybox/busybox.inc
@@ -58,6 +58,13 @@ do_compile() {
 }
 
 do_install () {
+	oe_runmake busybox.links
+	if [ "x${layout_prefix}" = "x" ]; then
+		sed 's:^/usr/:/:' < busybox.links >busybox.links.new
+		mv busybox.links.new busybox.links
+        elif [ "${layout_prefix}" != "/usr" ]; then
+		echo "warning, busybox.links will lose with this prefix"
+	fi
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
 	install -d ${D}${sysconfdir}/init.d
 	oe_runmake "PREFIX=${D}" install
@@ -67,7 +74,11 @@ do_install () {
 	install -d ${D}/busybox
 	ls ${D} -R
 
-	cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
+	for i in ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ; do
+		if [ -d $i ]; then
+			cp -dPr $i ${D}/busybox/
+		fi
+	done
 	# Move the busybox binary back to /bin
 	install -d ${D}${base_bindir}
 	mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
diff --git a/packages/busybox/busybox_1.11.1.bb b/packages/busybox/busybox_1.11.3.bb
index 60302fc55a..ce2b51a24b 100644
--- a/packages/busybox/busybox_1.11.1.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@ -1,10 +1,8 @@
 require busybox.inc
-FILE_PR = "r3"
+FILE_PR = "r0"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
-  http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-basename.patch;patch=1 \
-  http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-tar.patch;patch=1 \
   \
   file://udhcpscript.patch;patch=1 \
   file://busybox-cron \
diff --git a/packages/ccid/ccid_1.3.8.bb b/packages/ccid/ccid_1.3.8.bb
new file mode 100644
index 0000000000..033af6c3d5
--- /dev/null
+++ b/packages/ccid/ccid_1.3.8.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Generic USB CCID smart card reader driver"
+HOMEPAGE = "http://pcsclite.alioth.debian.org/ccid.html"
+LICENSE = "GPL"
+FILE_PR = "r0"
+
+DEPENDS = "libusb pcsc-lite"
+RDEPENDS = "pcsc-lite"
+
+SRC_URI = "http://alioth.debian.org/download.php/2482/ccid-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-udev"
+
+do_install_append () {
+	install -d "${D}/etc/udev/rules.d"
+	install -m 644 "${S}/src/pcscd_ccid.rules" "${D}/etc/udev/rules.d/85-pcscd_ccid.rules"
+}
+
+FILES_${PN} += "${libdir}/pcsc/"
+FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug"
diff --git a/packages/dmidecode/dmidecode_2.9.bb b/packages/dmidecode/dmidecode_2.9.bb
index cc46524799..bb13500eff 100644
--- a/packages/dmidecode/dmidecode_2.9.bb
+++ b/packages/dmidecode/dmidecode_2.9.bb
@@ -1,10 +1,12 @@
 DESCRIPTION = "DMI (Desktop Management Interface) table related utilities"
 HOMEPAGE = "http://www.nongnu.org/dmidecode/"
 LICENSE = "GPLv2"
-PR = "r0"
+FILE_PR = "r0"
 
 SRC_URI = "http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2"
 
+COMPATIBLE_HOST = "i.86.*-linux"
+
 do_unpack_extra() {
 	sed -i \
 	    -e '/^prefix/s:/usr/local:/usr:' \
diff --git a/packages/dsplink/dsplink_1.51.00.08.bb b/packages/dsplink/dsplink_1.51.00.08.bb
index 756ce3e760..8bbff51917 100644
--- a/packages/dsplink/dsplink_1.51.00.08.bb
+++ b/packages/dsplink/dsplink_1.51.00.08.bb
@@ -20,7 +20,7 @@ SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_51_00_08.tar.gz \
 "
 
 SRC_URI_append_beagleboard = " \
-           file://dsplink-128M.patch;patch=1;pnum=2 \
+#           file://dsplink-128M.patch;patch=1;pnum=2 \
 "
 
 S = "${WORKDIR}/dsplink_1_51_00_08/dsplink"
diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig
index 4434962a64..2e7c8130f6 100644
--- a/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig
+++ b/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.26
-# Thu Jul 24 23:13:04 2008
+# Sat Oct 18 23:52:11 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -34,7 +34,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -49,6 +49,8 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_NAMESPACES is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz"
+CONFIG_INITRAMFS_ROOT_UID=0
+CONFIG_INITRAMFS_ROOT_GID=0
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -251,7 +253,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable"
+CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
@@ -342,14 +344,12 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-CONFING_MTD_SHARP=y
+CONFIG_MTD_SHARP=y
 
 #
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
 CONFIG_MTD_SA1100=y
 # CONFIG_MTD_PLATRAM is not set
 
diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb
index 7d000ff2e1..26af506132 100644
--- a/packages/kexecboot/linux-kexecboot_2.6.26.bb
+++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb
@@ -1,6 +1,6 @@
 require linux-kexecboot.inc
 
-FILE_PR = "r5"
+FILE_PR = "r6"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "-1"
 DEFAULT_PREFERENCE_qemux86 = "-1"
diff --git a/packages/libffi/libffi_2.0+gcc4.3.2.bb b/packages/libffi/libffi_2.0+gcc4.3.2.bb
new file mode 100644
index 0000000000..300df81564
--- /dev/null
+++ b/packages/libffi/libffi_2.0+gcc4.3.2.bb
@@ -0,0 +1,64 @@
+SECTION = "libs"
+DESCRIPTION = "Foreign Function Interface library"
+LICENSE = "libffi"
+PRIORITY = "optional"
+
+inherit autotools gettext
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
+
+FILES_${PN} = "${libdir}/libffi.so.*"
+
+FILES_${PN}-dev = "${includedir}/ffi* \
+		   ${libdir}/libffi.a \
+		   ${libdir}/libffi.la \
+		   ${libdir}/libffi.so"
+
+GCC_VER = "${@bb.data.getVar('PV',d,1).split('gcc')[1]}"
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.bz2 \
+	   "
+
+MIRRORS_prepend () {
+${GNU_MIRROR}/gcc/	http://gcc.get-software.com/releases/
+${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/
+}
+
+S = "${WORKDIR}/gcc-${GCC_VER}/libffi"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--with-gnu-ld \
+                --enable-shared \
+                --enable-target-optspace \
+                --enable-languages=c,c++,f77 \
+                --enable-threads=posix \
+                --enable-multilib \
+                --enable-c99 \
+                --enable-long-long \
+                --enable-symvers=gnu \
+                --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_PATHS}"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
+                      --with-gxx-include-dir=${includedir}/c++/${PV}"
+
+do_configure () {
+	(cd ${S}/.. && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_install_append() {
+	# follow debian and move this to $includedir
+	mv ${D}${libdir}/gcc/${TARGET_SYS}/${GCC_VER}/include/libffi/ffitarget.h ${D}${includedir}/
+}
+
+ffi_include = "ffi.h ffitarget.h"
+
+do_stage () {
+	oe_libinstall -so -C .libs libffi ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/
+	for i in ${ffi_include}; do
+		install -m 0644 include/$i ${STAGING_INCDIR}/
+	done
+}
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-collie b/packages/linux/linux-rp-2.6.26/defconfig-collie
index e21cc21da2..e80885f332 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.26/defconfig-collie
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.26
-# Fri Oct 17 18:46:51 2008
+# Mon Oct 20 01:48:37 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -845,7 +845,13 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 CONFIG_INPUT_UINPUT=m
 
 #
@@ -954,11 +960,11 @@ CONFIG_SSB_POSSIBLE=y
 #
 # Multimedia Capabilities Port drivers
 #
-CONFIG_MCP=m
-CONFIG_MCP_SA11X0=m
-CONFIG_MCP_UCB1200=m
+CONFIG_MCP=y
+CONFIG_MCP_SA11X0=y
+CONFIG_MCP_UCB1200=y
 # CONFIG_MCP_UCB1200_TS is not set
-CONFIG_MCP_COLLIE_TS=m
+CONFIG_MCP_COLLIE_TS=y
 
 #
 # Multimedia devices
@@ -1044,7 +1050,47 @@ CONFIG_FONT_8x8=y
 # CONFIG_SOUND is not set
 # CONFIG_HID_SUPPORT is not set
 CONFIG_HID=m
-# CONFIG_USB_SUPPORT is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_AT91 is not set
+CONFIG_USB_GADGET_SA1100=y
+CONFIG_USB_SA1100=y
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=m
+# CONFIG_USB_ETH_RNDIS is not set
+# CONFIG_USB_ETH_NO_MDLM is not set
+# CONFIG_USB_GADGETFS is not set
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+CONFIG_USB_G_PRINTER=m
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y
diff --git a/packages/linux/linux-rp-2.6.26/usb-gadget27bp.patch b/packages/linux/linux-rp-2.6.26/usb-gadget27bp.patch
new file mode 100644
index 0000000000..3c86f1a474
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.26/usb-gadget27bp.patch
@@ -0,0 +1,26674 @@
+diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
+index 6e784d2..117d0c7 100644
+--- a/drivers/usb/gadget/Kconfig
++++ b/drivers/usb/gadget/Kconfig
+@@ -118,10 +118,10 @@ config USB_AMD5536UDC
+ config USB_GADGET_ATMEL_USBA
+ 	boolean "Atmel USBA"
+ 	select USB_GADGET_DUALSPEED
+-	depends on AVR32 || ARCH_AT91CAP9
++	depends on AVR32 || ARCH_AT91CAP9 || ARCH_AT91SAM9RL
+ 	help
+ 	  USBA is the integrated high-speed USB Device controller on
+-	  the AT32AP700x and AT91CAP9 processors from Atmel.
++	  the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
+ 
+ config USB_ATMEL_USBA
+ 	tristate
+@@ -172,7 +172,7 @@ config USB_NET2280
+ 	default USB_GADGET
+ 	select USB_GADGET_SELECTED
+ 
+-config USB_GADGET_PXA2XX
++config USB_GADGET_PXA25X
+ 	boolean "PXA 25x or IXP 4xx"
+ 	depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX
+ 	help
+@@ -184,19 +184,19 @@ config USB_GADGET_PXA2XX
+ 	   zero (for control transfers).
+ 
+ 	   Say "y" to link the driver statically, or "m" to build a
+-	   dynamically linked module called "pxa2xx_udc" and force all
++	   dynamically linked module called "pxa25x_udc" and force all
+ 	   gadget drivers to also be dynamically linked.
+ 
+-config USB_PXA2XX
++config USB_PXA25X
+ 	tristate
+-	depends on USB_GADGET_PXA2XX
++	depends on USB_GADGET_PXA25X
+ 	default USB_GADGET
+ 	select USB_GADGET_SELECTED
+ 
+ # if there's only one gadget driver, using only two bulk endpoints,
+ # don't waste memory for the other endpoints
+-config USB_PXA2XX_SMALL
+-	depends on USB_GADGET_PXA2XX
++config USB_PXA25X_SMALL
++	depends on USB_GADGET_PXA25X
+ 	bool
+ 	default n if USB_ETH_RNDIS
+ 	default y if USB_ZERO
+@@ -284,6 +284,16 @@ config USB_LH7A40X
+ 	default USB_GADGET
+ 	select USB_GADGET_SELECTED
+ 
++# built in ../musb along with host support
++config USB_GADGET_MUSB_HDRC
++	boolean "Inventra HDRC USB Peripheral (TI, ...)"
++	depends on USB_MUSB_HDRC && (USB_MUSB_PERIPHERAL || USB_MUSB_OTG)
++	select USB_GADGET_DUALSPEED
++	select USB_GADGET_SELECTED
++	help
++	  This OTG-capable silicon IP is used in dual designs including
++	  the TI DaVinci, OMAP 243x, OMAP 343x, and TUSB 6010.
++
+ config USB_GADGET_OMAP
+ 	boolean "OMAP USB Device Controller"
+ 	depends on ARCH_OMAP
+@@ -355,6 +365,20 @@ config USB_AT91
+ 	depends on USB_GADGET_AT91
+ 	default USB_GADGET
+ 
++config USB_GADGET_SA1100
++	boolean "SA1100 USB Device Port"
++	depends on ARCH_SA1100
++	help
++	   Say "y" to link the driver statically, or "m" to build a
++	   dynamically linked module called "sa1100_udc" and force all
++	   gadget drivers to also be dynamically linked.
++
++config USB_SA1100
++	tristate
++	depends on USB_GADGET_SA1100
++	default USB_GADGET
++	select USB_GADGET_SELECTED
++
+ config USB_GADGET_DUMMY_HCD
+ 	boolean "Dummy HCD (DEVELOPMENT)"
+ 	depends on USB=y || (USB=m && USB_GADGET=m)
+@@ -504,6 +528,20 @@ config USB_ETH_RNDIS
+ 	   XP, you'll need to download drivers from Microsoft's website; a URL
+ 	   is given in comments found in that info file.
+ 
++config USB_ETH_NO_MDLM
++	bool "Disable MDLM support for CDC_SUBSET"
++	depends on USB_ETH
++	default n
++	help
++	   A variation on CDC_SUBSET support is used in newer kernel 
++	   implementations for use with a proprietary Microsoft Windows driver
++	   used for example with the Zaurus linux distribution.
++	   However, the MDLM extensions break the older host side drivers making
++	   g_ether incompatible with older kernels.
++
++	   If you say "y" here, the Ethernet gadget driver will use the older
++	   pre-MDLM extensions.
++	   
+ config USB_GADGETFS
+ 	tristate "Gadget Filesystem (EXPERIMENTAL)"
+ 	depends on EXPERIMENTAL
+@@ -586,6 +624,20 @@ config USB_G_PRINTER
+ 	  For more information, see Documentation/usb/gadget_printer.txt
+ 	  which includes sample code for accessing the device file.
+ 
++config USB_CDC_COMPOSITE
++	tristate "CDC Composite Device (Ethernet and ACM)"
++	depends on NET
++	help
++	  This driver provides two functions in one configuration:
++	  a CDC Ethernet (ECM) link, and a CDC ACM (serial port) link.
++
++	  This driver requires four bulk and two interrupt endpoints,
++	  plus the ability to handle altsettings.  Not all peripheral
++	  controllers are that capable.
++
++	  Say "y" to link the driver statically, or "m" to build a
++	  dynamically linked module.
++
+ # put drivers that need isochronous transfer support (for audio
+ # or video class gadget drivers), or specific hardware, here.
+ 
+diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
+index 1235725..79a69ae 100644
+--- a/drivers/usb/gadget/Makefile
++++ b/drivers/usb/gadget/Makefile
+@@ -8,7 +8,7 @@ endif
+ obj-$(CONFIG_USB_DUMMY_HCD)	+= dummy_hcd.o
+ obj-$(CONFIG_USB_NET2280)	+= net2280.o
+ obj-$(CONFIG_USB_AMD5536UDC)	+= amd5536udc.o
+-obj-$(CONFIG_USB_PXA2XX)	+= pxa2xx_udc.o
++obj-$(CONFIG_USB_PXA25X)	+= pxa25x_udc.o
+ obj-$(CONFIG_USB_PXA27X)	+= pxa27x_udc.o
+ obj-$(CONFIG_USB_GOKU)		+= goku_udc.o
+ obj-$(CONFIG_USB_OMAP)		+= omap_udc.o
+@@ -18,22 +18,27 @@ obj-$(CONFIG_USB_AT91)		+= at91_udc.o
+ obj-$(CONFIG_USB_ATMEL_USBA)	+= atmel_usba_udc.o
+ obj-$(CONFIG_USB_FSL_USB2)	+= fsl_usb2_udc.o
+ obj-$(CONFIG_USB_M66592)	+= m66592-udc.o
++obj-$(CONFIG_USB_SA1100)	+= sa1100_udc.o
+ 
+ #
+ # USB gadget drivers
+ #
+-g_zero-objs			:= zero.o usbstring.o config.o epautoconf.o
+-g_ether-objs			:= ether.o usbstring.o config.o epautoconf.o
+-g_serial-objs			:= serial.o usbstring.o config.o epautoconf.o
++C_UTILS =	composite.o usbstring.o config.o epautoconf.o
++
++g_zero-objs			:= zero.o f_sourcesink.o f_loopback.o $(C_UTILS)
++g_ether-objs			:= ether.o u_ether.o f_subset.o f_ecm.o $(C_UTILS)
++g_serial-objs			:= serial.o u_serial.o f_acm.o f_serial.o $(C_UTILS)
+ g_midi-objs			:= gmidi.o usbstring.o config.o epautoconf.o
+ gadgetfs-objs			:= inode.o
+ g_file_storage-objs		:= file_storage.o usbstring.o config.o \
+ 					epautoconf.o
+ g_printer-objs			:= printer.o usbstring.o config.o \
+ 					epautoconf.o
++g_cdc-objs			:= cdc2.o u_ether.o f_ecm.o \
++					u_serial.o f_acm.o $(C_UTILS)
+ 
+ ifeq ($(CONFIG_USB_ETH_RNDIS),y)
+-	g_ether-objs		+= rndis.o
++	g_ether-objs		+= f_rndis.o rndis.o
+ endif
+  
+ obj-$(CONFIG_USB_ZERO)		+= g_zero.o
+@@ -43,4 +48,5 @@ obj-$(CONFIG_USB_FILE_STORAGE)	+= g_file_storage.o
+ obj-$(CONFIG_USB_G_SERIAL)	+= g_serial.o
+ obj-$(CONFIG_USB_G_PRINTER)	+= g_printer.o
+ obj-$(CONFIG_USB_MIDI_GADGET)	+= g_midi.o
++obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o
+ 
+diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
+index f261d2a..abf8192 100644
+--- a/drivers/usb/gadget/amd5536udc.c
++++ b/drivers/usb/gadget/amd5536udc.c
+@@ -44,7 +44,6 @@
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/kernel.h>
+-#include <linux/version.h>
+ #include <linux/delay.h>
+ #include <linux/ioport.h>
+ #include <linux/sched.h>
+@@ -3342,7 +3341,7 @@ static int udc_probe(struct udc *dev)
+ 	spin_lock_init(&dev->lock);
+ 	dev->gadget.ops = &udc_ops;
+ 
+-	strcpy(dev->gadget.dev.bus_id, "gadget");
++	dev_set_name(&dev->gadget.dev, "gadget");
+ 	dev->gadget.dev.release = gadget_release;
+ 	dev->gadget.name = name;
+ 	dev->gadget.name = name;
+diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
+index 274c60a..a8a1de4 100644
+--- a/drivers/usb/gadget/at91_udc.c
++++ b/drivers/usb/gadget/at91_udc.c
+@@ -40,16 +40,15 @@
+ #include <linux/usb/gadget.h>
+ 
+ #include <asm/byteorder.h>
+-#include <asm/hardware.h>
++#include <mach/hardware.h>
+ #include <asm/io.h>
+ #include <asm/irq.h>
+ #include <asm/system.h>
+-#include <asm/mach-types.h>
+ #include <asm/gpio.h>
+ 
+-#include <asm/arch/board.h>
+-#include <asm/arch/cpu.h>
+-#include <asm/arch/at91sam9261_matrix.h>
++#include <mach/board.h>
++#include <mach/cpu.h>
++#include <mach/at91sam9261_matrix.h>
+ 
+ #include "at91_udc.h"
+ 
+@@ -888,7 +887,7 @@ static void pullup(struct at91_udc *udc, int is_on)
+ 		at91_udp_write(udc, AT91_UDP_TXVC, 0);
+ 		if (cpu_is_at91rm9200())
+ 			gpio_set_value(udc->board.pullup_pin, active);
+-		else if (cpu_is_at91sam9260() || cpu_is_at91sam9263()) {
++		else if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) {
+ 			u32	txvc = at91_udp_read(udc, AT91_UDP_TXVC);
+ 
+ 			txvc |= AT91_UDP_TXVC_PUON;
+@@ -906,7 +905,7 @@ static void pullup(struct at91_udc *udc, int is_on)
+ 		at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
+ 		if (cpu_is_at91rm9200())
+ 			gpio_set_value(udc->board.pullup_pin, !active);
+-		else if (cpu_is_at91sam9260() || cpu_is_at91sam9263()) {
++		else if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) {
+ 			u32	txvc = at91_udp_read(udc, AT91_UDP_TXVC);
+ 
+ 			txvc &= ~AT91_UDP_TXVC_PUON;
+@@ -1687,6 +1686,19 @@ static int __init at91udc_probe(struct platform_device *pdev)
+ 				udc->board.pullup_active_low);
+ 	}
+ 
++	/* newer chips have more FIFO memory than rm9200 */
++	if (cpu_is_at91sam9260()) {
++		udc->ep[0].maxpacket = 64;
++		udc->ep[3].maxpacket = 64;
++		udc->ep[4].maxpacket = 512;
++		udc->ep[5].maxpacket = 512;
++	} else if (cpu_is_at91sam9261()) {
++		udc->ep[3].maxpacket = 64;
++	} else if (cpu_is_at91sam9263()) {
++		udc->ep[0].maxpacket = 64;
++		udc->ep[3].maxpacket = 64;
++	}
++
+ 	udc->udp_baseaddr = ioremap(res->start, res->end - res->start + 1);
+ 	if (!udc->udp_baseaddr) {
+ 		retval = -ENOMEM;
+diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
+index a973f2a..c65d622 100644
+--- a/drivers/usb/gadget/at91_udc.h
++++ b/drivers/usb/gadget/at91_udc.h
+@@ -171,7 +171,7 @@ struct at91_request {
+ #endif
+ 
+ #define ERR(stuff...)		pr_err("udc: " stuff)
+-#define WARN(stuff...)		pr_warning("udc: " stuff)
++#define WARNING(stuff...)	pr_warning("udc: " stuff)
+ #define INFO(stuff...)		pr_info("udc: " stuff)
+ #define DBG(stuff...)		pr_debug("udc: " stuff)
+ 
+diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
+index 07e5a0b..ae30ab1 100644
+--- a/drivers/usb/gadget/atmel_usba_udc.c
++++ b/drivers/usb/gadget/atmel_usba_udc.c
+@@ -22,7 +22,7 @@
+ #include <linux/delay.h>
+ 
+ #include <asm/gpio.h>
+-#include <asm/arch/board.h>
++#include <mach/board.h>
+ 
+ #include "atmel_usba_udc.h"
+ 
+@@ -334,7 +334,7 @@ static void toggle_bias(int is_on)
+ 
+ #elif defined(CONFIG_ARCH_AT91)
+ 
+-#include <asm/arch/at91_pmc.h>
++#include <mach/at91_pmc.h>
+ 
+ static void toggle_bias(int is_on)
+ {
+diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c
+new file mode 100644
+index 0000000..a39a4b9
+--- /dev/null
++++ b/drivers/usb/gadget/cdc2.c
+@@ -0,0 +1,246 @@
++/*
++ * cdc2.c -- CDC Composite driver, with ECM and ACM support
++ *
++ * Copyright (C) 2008 David Brownell
++ * Copyright (C) 2008 Nokia Corporation
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#include <linux/kernel.h>
++#include <linux/utsname.h>
++
++#include "u_ether.h"
++#include "u_serial.h"
++
++
++#define DRIVER_DESC		"CDC Composite Gadget"
++#define DRIVER_VERSION		"King Kamehameha Day 2008"
++
++/*-------------------------------------------------------------------------*/
++
++/* DO NOT REUSE THESE IDs with a protocol-incompatible driver!!  Ever!!
++ * Instead:  allocate your own, using normal USB-IF procedures.
++ */
++
++/* Thanks to NetChip Technologies for donating this product ID.
++ * It's for devices with only this composite CDC configuration.
++ */
++#define CDC_VENDOR_NUM		0x0525	/* NetChip */
++#define CDC_PRODUCT_NUM		0xa4aa	/* CDC Composite: ECM + ACM */
++