Convert CONFIG_USB_OHCI_NEW et al to Kconfig

[platform/kernel/u-boot.git] / include / configs / taurus.h

diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index b9285e8..ab2dc3d 100644 (file)
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -65,13 +65,7 @@
 
 /* USB */
 #if defined(CONFIG_BOARD_TAURUS)
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00500000
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9260"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
 
 /* USB DFU support */
 
@@ -84,13 +78,8 @@
 /* SPI EEPROM */
 #define TAURUS_SPI_MASK (1 << 4)
 
-#if defined(CONFIG_SPL_BUILD)
-/* SPL related */
-#endif
-
 /* bootstrap in spi flash , u-boot + env + linux in nandflash */
 
-#ifndef CONFIG_SPL_BUILD
 #if defined(CONFIG_BOARD_AXM)
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
@@ -139,7 +128,6 @@
        "stdout=serial\0" \
        "upgrade_available=0\0"
 #endif
-#endif /* #ifndef CONFIG_SPL_BUILD */
 
 /* Defines for SPL */