12 files changed, 15 insertions, 11 deletions
diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c
index 53a93e1ed3..c8788f8128 100644
--- a/arch/arm/boards/beagle/board.c
+++ b/arch/arm/boards/beagle/board.c
@@ -18,7 +18,7 @@
 #include <mach/omap/omap3-devices.h>
 #include <i2c/i2c.h>
 #include <linux/err.h>
-#include <usb/ehci.h>
+#include <linux/usb/ehci.h>
 #include <asm/barebox-arm.h>
 
 #ifdef CONFIG_DRIVER_SERIAL_NS16550
diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c
index 9f51d2253b..840fd22ac1 100644
--- a/arch/arm/boards/chumby_falconwing/falconwing.c
+++ b/arch/arm/boards/chumby_falconwing/falconwing.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <mci.h>
 #include <linux/sizes.h>
-#include <usb/ehci.h>
+#include <linux/usb/ehci.h>
 #include <asm/armlinux.h>
 #include <asm/barebox-arm.h>
 #include <io.h>
diff --git a/arch/arm/boards/duckbill/board.c b/arch/arm/boards/duckbill/board.c
index 4e8f564967..edb9320f0e 100644
--- a/arch/arm/boards/duckbill/board.c
+++ b/arch/arm/boards/duckbill/board.c
@@ -17,7 +17,7 @@
 #include <mach/mxs/ocotp.h>
 #include <mach/mxs/devices.h>
 #include <mach/mxs/usb.h>
-#include <usb/fsl_usb2.h>
+#include <linux/usb/fsl_usb2.h>
 
 #include <asm/armlinux.h>
 #include <asm/mmu.h>
diff --git a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c
index b5dbe5f41a..d831bffbd9 100644
--- a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c
+++ b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c
@@ -13,7 +13,7 @@
 #include <asm/barebox-arm.h>
 #include <mach/mxs/imx-regs.h>
 #include <mach/mxs/mci.h>
-#include <usb/fsl_usb2.h>
+#include <linux/usb/fsl_usb2.h>
 #include <mach/mxs/usb.h>
 #include <mach/mxs/iomux.h>
 
diff --git a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
index b164364560..3a7e5354fc 100644
--- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
+++ b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
@@ -18,7 +18,7 @@
 #include <mci.h>
 #include <asm/armlinux.h>
 #include <asm/barebox-arm.h>
-#include <usb/ehci.h>
+#include <linux/usb/ehci.h>
 #include <mach/mxs/usb.h>
 #include <generated/mach-types.h>
 #include <mach/mxs/imx-regs.h>
diff --git a/arch/arm/boards/kindle-mx50/board.c b/arch/arm/boards/kindle-mx50/board.c
index b7b51d6209..4abd77727c 100644
--- a/arch/arm/boards/kindle-mx50/board.c
+++ b/arch/arm/boards/kindle-mx50/board.c
@@ -15,7 +15,7 @@
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
 #include <linux/sizes.h>
-#include <usb/fsl_usb2.h>
+#include <linux/usb/fsl_usb2.h>
 #include <mach/imx/generic.h>
 #include <mach/imx/imx50-regs.h>
 #include <mach/imx/imx5.h>
diff --git a/arch/arm/boards/module-mb7707/board.c b/arch/arm/boards/module-mb7707/board.c
index 122348210d..366baddf81 100644
--- a/arch/arm/boards/module-mb7707/board.c
+++ b/arch/arm/boards/module-mb7707/board.c
@@ -6,7 +6,7 @@
 #include <common.h>
 #include <init.h>
 #include <driver.h>
-#include <usb/ehci.h>
+#include <linux/usb/ehci.h>
 #include <mach/uemd/hardware.h>
 
 static int hostname_init(void)
diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c
index 276aeb287d..f182b14987 100644
--- a/arch/arm/boards/panda/board.c
+++ b/arch/arm/boards/panda/board.c
@@ -14,7 +14,7 @@
 #include <mach/omap/sys_info.h>
 #include <mach/omap/syslib.h>
 #include <mach/omap/control.h>
-#include <usb/ehci.h>
+#include <linux/usb/ehci.h>
 #include <linux/err.h>
 #include <linux/sizes.h>
 #include <asm/mmu.h>
diff --git a/arch/arm/boards/phytec-phycard-imx27/pca100.c b/arch/arm/boards/phytec-phycard-imx27/pca100.c
index e64ef72026..924598d9c7 100644
--- a/arch/arm/boards/phytec-phycard-imx27/pca100.c
+++ b/arch/arm/boards/phytec-phycard-imx27/pca100.c
@@ -20,7 +20,7 @@
 #include <mach/imx/imx-pll.h>
 #include <platform_data/imxfb.h>
 #include <asm/mmu.h>
-#include <usb/ulpi.h>
+#include <linux/usb/ulpi.h>
 #include <mach/imx/bbu.h>
 #include <mach/imx/iomux-mx27.h>
 #include <mach/imx/devices-imx27.h>
diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c
index e7958dd76b..2e101adc28 100644
--- a/arch/arm/boards/protonic-imx6/board.c
+++ b/arch/arm/boards/protonic-imx6/board.c
@@ -24,7 +24,7 @@
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <usb/usb.h>
+#include <linux/usb/usb.h>
 
 #define GPIO_HW_REV_ID  {\
 	{IMX_GPIO_NR(2, 8), GPIOF_DIR_IN | GPIOF_ACTIVE_LOW, "rev_id0"}, \
diff --git a/arch/arm/boards/toshiba-ac100/board.c b/arch/arm/boards/toshiba-ac100/board.c
index 0248bf1cc5..7fb70ca6c9 100644
--- a/arch/arm/boards/toshiba-ac100/board.c
+++ b/arch/arm/boards/toshiba-ac100/board.c
@@ -5,7 +5,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <usb/ehci.h>
+#include <linux/usb/ehci.h>
 #include <mach/tegra/iomap.h>
 
 static struct ehci_platform_data ehci_pdata = {
diff --git a/arch/arm/configs/rockchip_v8_defconfig b/arch/arm/configs/rockchip_v8_defconfig
index f23c192870..3e93b8d271 100644
--- a/arch/arm/configs/rockchip_v8_defconfig
+++ b/arch/arm/configs/rockchip_v8_defconfig
@@ -73,7 +73,10 @@ CONFIG_CMD_CLK=y
 CONFIG_CMD_DETECT=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_LED=y
 CONFIG_CMD_SMC=y
+CONFIG_CMD_USBGADGET=y
+CONFIG_CMD_WD=y
 CONFIG_CMD_BAREBOX_UPDATE=y
 CONFIG_CMD_OF_DIFF=y
 CONFIG_CMD_OF_NODE=y
@@ -104,6 +107,7 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_EHCI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DFU=y
 CONFIG_USB_GADGET_SERIAL=y
 CONFIG_USB_GADGET_FASTBOOT=y
 CONFIG_USB_GADGET_MASS_STORAGE=y