usb: Remove some unused CONFIG settings

On platforms that use CONFIG_USB_OHCI_NEW we do not need to set
CONFIG_SYS_USB_OHCI_REGS_BASE nor CONFIG_SYS_USB_OHCI_SLOT_NAME.  Drop
these from platforms that we can.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 4fac0aad42c519d73ab3a06bd194a3b7537fa48d..4d492988eba7feb446d427c7d32e835d4c5dd80b 100644 (file)
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -39,11 +39,6 @@
        "bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\
        "bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0"
 
-/* USB host */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE  ATMEL_BASE_OHCI
-#endif
-
 /* SPL */
 
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)

diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 758a91cdaa97f3b61cf0834bd9ccfb5d20b6d15c..0e7665843dba5189a14e2b87bf24b0e9f12d18d6 100644 (file)
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -38,13 +38,6 @@
 #define CONFIG_SYS_NAND_READY_PIN      AT91_PIN_PD5
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#ifndef CONFIG_USB_EHCI_HCD
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          ATMEL_BASE_OHCI
-#endif
-#endif
-
 /* SPL */
 
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)

diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 529b9837318f57e24b575b313e55177198f3d7bc..88a702f1af27bb99ee64d41bbe5eb79c284bb9a8 100644 (file)
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -59,11 +59,6 @@
 #define CONFIG_SYS_MMC_CD_PIN          AT91_PIO_PORTC, 8
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE  0x00500000
-#endif
-
 /* RTC */
 #if defined(CONFIG_CMD_DATE) || defined(CONFIG_CMD_SNTP)
 #define CONFIG_SYS_I2C_RTC_ADDR                0x51

diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index 22839d544a504e311392ec052abd2da7bdef1bca..fad65cb112343f9668a681da889d4a66a995f1ee 100644 (file)
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -37,11 +37,6 @@
 #define CONFIG_SYS_NAND_MASK_CLE       (1 << 22)
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00600000
-#endif
-
 /* SPL */
 
 /* size of u-boot.bin to load */

diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index dc89148a0450529e34d7432ec3152f77e1a41e9e..7bc3f91e77a80967ebe216cb186b2ac1c4255b9a 100644 (file)
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -50,11 +50,6 @@
 #define CONFIG_SYS_NAND_MASK_CLE       (1 << 22)
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          ATMEL_BASE_OHCI
-#endif
-
 /* SPL */
 
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 65bc3c672eedef7513e16b818a064a8c1034d6d1..1a3ac817fbfc3cd7156ed851b8e2dc699a771582 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -66,9 +66,6 @@
 #define CONFIG_USART_BASE              ATMEL_BASE_DBGU
 #define CONFIG_USART_ID                        ATMEL_ID_SYS
 
-/* USB configuration */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE  ATMEL_UHP_BASE
-
 /* USB DFU support */
 
 #define CONFIG_USB_GADGET_AT91

diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 2b7afb5d25e556fa2d145870f68d6ea3cb7df282..7adb349f9a54c1b4547054c755de406987d8ba6d 100644 (file)
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -37,9 +37,6 @@
 #define CONFIG_SYS_NAND_ENABLE_PIN     AT91_PIN_PC14
 #define CONFIG_SYS_NAND_READY_PIN      AT91_PIN_PC13
 
-/* USB */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE  ATMEL_UHP_BASE
-
 /* GPIOs and IO expander */
 #define CONFIG_PCA953X
 #define CONFIG_SYS_I2C_PCA953X_ADDR    0x28

diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index ab2dc3d7146b46147c1a0a921a5b7a4ecff99816..4758e23f55724c7ca690646976de15c555f780d6 100644 (file)
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -63,10 +63,7 @@
 #define CONFIG_SYS_NAND_READY_PIN      AT91_PIN_PC13
 #endif
 
-/* USB */
 #if defined(CONFIG_BOARD_TAURUS)
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00500000
-
 /* USB DFU support */
 
 #define CONFIG_USB_GADGET_AT91

diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 8cb8c609d052b80eada43bdce40db11dd28271f1..e0dde1cc83658ebc7a9b769dcac5d4ab370d5ac8 100644 (file)
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -43,11 +43,6 @@
 #define CONFIG_SYS_NAND_READY_PIN              GPIO_PIN_PA(22)
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00a00000
-#endif
-
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_EXTRA_ENV_SETTINGS \