diff --git a/u-boot/board/ar7240/carambola2/Makefile b/u-boot/board/ar7240/carambola2/Makefile
index 13b915290a..538f836bd7 100644
--- a/u-boot/board/ar7240/carambola2/Makefile
+++ b/u-boot/board/ar7240/carambola2/Makefile
@@ -4,7 +4,6 @@ LIB	= lib$(BOARD).a
 
 OBJS	= $(BOARD).o flash.o ../common/ar7240_flash.o ../common/ar7240_s26_phy.o
 OBJS	+= carambola_factory.o
-OBJS	+= ../common/usb_boot.o
 OBJS	+= ../common/watchdog.o
 SOBJS	= ../common/lowlevel_init.o
 SOBJS	+= hornet_pll_init.o
diff --git a/u-boot/common/Makefile b/u-boot/common/Makefile
index 22ee637c0e..561104d614 100644
--- a/u-boot/common/Makefile
+++ b/u-boot/common/Makefile
@@ -60,7 +60,7 @@ COBJS	= main.o circbuf.o \
 	  cmd_nand.o cmd_net.o cmd_nvedit.o \
 	  cmd_pci.o cmd_pcmcia.o cmd_portio.o \
 	  cmd_reginfo.o cmd_reiser.o cmd_scsi.o cmd_spi.o cmd_universe.o \
-	  cmd_usb.o cmd_vfd.o cmd_ethreg.o cmd_recovery.o cmd_bootcycle.o \
+	  cmd_vfd.o cmd_ethreg.o cmd_recovery.o cmd_bootcycle.o \
 	  command.o console.o devices.o dlmalloc.o \
 	  environment.o env_common.o \
 	  env_nand.o env_dataflash.o env_flash.o env_eeprom.o \
@@ -69,7 +69,6 @@ COBJS	= main.o circbuf.o \
 	  hush.o kgdb.o lcd.o lists.o lynxkdi.o \
 	  memsize.o miiphybb.o miiphyutil.o \
 	  s_record.o serial.o soft_i2c.o soft_spi.o \
-	  usb.o usb_hub.o usb_kbd.o usb_storage.o \
 	  crc16.o xyzModem.o
 endif
 
diff --git a/u-boot/drivers/Makefile b/u-boot/drivers/Makefile
index 79381ab9a9..04d92c18f3 100644
--- a/u-boot/drivers/Makefile
+++ b/u-boot/drivers/Makefile
@@ -28,7 +28,6 @@ include $(TOPDIR)/config.mk
 LIB	= libdrivers.a
 
 OBJS   =  pci.o netconsole.o
-OBJS   =  usb/host/ehci-hcd.o usb/host/ehci-ar9331.o
 
 
 all:	$(LIB)
diff --git a/u-boot/include/configs/carambola2.h b/u-boot/include/configs/carambola2.h
index 5441d7c565..2b0935d32c 100644
--- a/u-boot/include/configs/carambola2.h
+++ b/u-boot/include/configs/carambola2.h
@@ -208,7 +208,7 @@
  */
 #ifndef COMPRESSED_UBOOT
 #define CONFIG_COMMANDS	(( CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_ELF | CFG_CMD_PCI |	\
-	CFG_CMD_MII | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_ENV | CFG_CMD_USB |	\
+	CFG_CMD_MII | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_ENV | \
 	CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | CFG_CMD_ELF | CFG_CMD_ETHREG | CFG_CMD_FAT ))
 #elif defined(VXWORKS_UBOOT)
 #define CONFIG_COMMANDS	(( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII | CFG_CMD_ELF))
@@ -243,8 +243,6 @@
 #define CFG_C2_IMG_LOAD_ADDR		"0x80F00000"
 #define CFG_C2_IMG_FILENAME		"carambola2.bin"
 
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_STORAGE 
 #define ARCH_DMA_MINALIGN 		4*1024 // 4kb in datasheet
 #define CONFIG_SYS_HZ      		1000 
 #define CONFIG_SYS_MAXARGS 		16
@@ -257,18 +255,7 @@
 #define CONFIG_FS_FAT
 #define CONFIG_SUPPORT_VFAT
 #define CONFIG_SYS_LOAD_ADDR 		0x82000000
-#define CONFIG_CMD_USB
 #define CONFIG_NEEDS_MANUAL_RELOC
-#define CONFIG_USB_BOOT
-
-#define CFG_USB_BOOT_MAX_PARTITIONS_SCAN 	16
-#define CFG_USB_BOOT_LOAD_ADDR 			0x82000000   /* starts at upper half of RAM */
-#define CFG_MAX_USB_BOOT_FILE_SIZE 		30*1024*1024 /* 30MB */
-#define CFG_MAX_USB_RECOVERY_FILE_SIZE 		0xFA0000 /* 15.625MB */
-#define CFG_USB_BOOT_FILENAME 			"8dev_uimage.bin"
-#define CFG_USB_RECOVERY_FILENAME 		"8dev_recovery.bin"
-#define CFG_USB_RECOVERY_FW_START_IN_FLASH 	"0x9f050000"
-#define CFG_USB_BOOT_BUTTON_ID			0
 
 #define CONFIG_AUTOBOOT_KEYED
 #define CONFIG_AUTOBOOT_PROMPT 			"Hit '%s' key(s) to stop autoboot: %2d "
diff --git a/u-boot/include/configs/skylab.h b/u-boot/include/configs/skylab.h
index a441776767..5741dc9ae4 100644
--- a/u-boot/include/configs/skylab.h
+++ b/u-boot/include/configs/skylab.h
@@ -208,7 +208,7 @@
  */
 #ifndef COMPRESSED_UBOOT
 #define CONFIG_COMMANDS	(( CONFIG_CMD_DFL | CFG_CMD_DHCP | CFG_CMD_ELF | CFG_CMD_PCI |	\
-	CFG_CMD_MII | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_ENV | CFG_CMD_USB |	\
+	CFG_CMD_MII | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_ENV | \
 	CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_RUN | CFG_CMD_LOADB | CFG_CMD_ELF | CFG_CMD_ETHREG | CFG_CMD_FAT ))
 #elif defined(VXWORKS_UBOOT)
 #define CONFIG_COMMANDS	(( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII | CFG_CMD_ELF))
@@ -243,8 +243,6 @@
 #define CFG_C2_IMG_LOAD_ADDR		"0x80F00000"
 #define CFG_C2_IMG_FILENAME		"carambola2.bin"
 
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_STORAGE 
 #define ARCH_DMA_MINALIGN 		4*1024 // 4kb in datasheet
 #define CONFIG_SYS_HZ      		1000 
 #define CONFIG_SYS_MAXARGS 		16
@@ -257,18 +255,8 @@
 #define CONFIG_FS_FAT
 #define CONFIG_SUPPORT_VFAT
 #define CONFIG_SYS_LOAD_ADDR 		0x82000000
-#define CONFIG_CMD_USB
 #define CONFIG_NEEDS_MANUAL_RELOC
-#define CONFIG_USB_BOOT
 
-#define CFG_USB_BOOT_MAX_PARTITIONS_SCAN 	16
-#define CFG_USB_BOOT_LOAD_ADDR 			0x82000000   /* starts at upper half of RAM */
-#define CFG_MAX_USB_BOOT_FILE_SIZE 		30*1024*1024 /* 30MB */
-#define CFG_MAX_USB_RECOVERY_FILE_SIZE 		0xFA0000 /* 15.625MB */
-#define CFG_USB_BOOT_FILENAME 			"8dev_uimage.bin"
-#define CFG_USB_RECOVERY_FILENAME 		"8dev_recovery.bin"
-#define CFG_USB_RECOVERY_FW_START_IN_FLASH 	"0x9f050000"
-#define CFG_USB_BOOT_BUTTON_ID			0
 
 #define CONFIG_AUTOBOOT_KEYED
 #define CONFIG_AUTOBOOT_PROMPT 			"Hit '%s' key(s) to stop autoboot: %2d "