Exynos: Move down common USB configuration

USB is a pretty common feature on exynos 5 board, so it seems sensible
to configure it directly from exynos5-common. As a side-effect this
makes USB available from u-boot on exynos 5420 based boards.

While there enable support for common USB ethernet cards to make it more
likely the default config allows booting for network and enable XHCI on
SMDK5420 which has it defined in the dts but not in its config.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 81e8a7c3a362ebedf3d573df6156123bd47ee53a..6bd27a24467a486bf7129fa20bf69a0548060f11 100644 (file)
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -24,10 +24,6 @@
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_EXYNOS
 
-#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     3
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_ASIX
-
 /* MMC SPL */
 #define CONFIG_EXYNOS_SPL
 

diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 8f9b780003065960c02b99e4606de6f456a5583c..ad63f3c5496d39e0be23c35d2a1d29c92edf8c11 100644 (file)
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -174,6 +174,16 @@
 
 #define CONFIG_CMD_GPIO
 
+/* USB */
+#define CONFIG_CMD_USB
+#define CONFIG_USB_STORAGE
+#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     3
+#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS     2
+
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_USB_ETHER_SMSC95XX
+
 /* USB boot mode */
 #define CONFIG_USB_BOOTING
 #define EXYNOS_COPY_USB_FNPTR_ADDR     0x02020070

diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index a0107e8b4d4b551a4688c06bf66f73aaee58b73f..671431397fc02598316a9da65e170cd9196c5df8 100644 (file)
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -22,11 +22,6 @@
 
 #define CONFIG_SPL_MAX_FOOTPRINT       (14 * 1024)
 
-/* USB */
-#define CONFIG_CMD_USB
-#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS     2
-#define CONFIG_USB_STORAGE
-
 #define CONFIG_SPL_TEXT_BASE   0x02023400
 
 #define CONFIG_IRAM_STACK      0x02050000

diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index 7322f336381dcafe7e709b91e1c8db6cbc72e7e9..fe72bd0d3bc7d05b02fdb33e130e0b58c1d03362 100644 (file)
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -38,6 +38,4 @@
 
 #define CONFIG_BOARD_REV_GPIO_COUNT    2
 
-#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS     2
-
 #endif /* __CONFIG_EXYNOS5420_H */

diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 6b459488f26ccbf69f627c2e666d3ad70a56a4d6..61f582f37516b57cc1d38de64635a7b65ea69aa4 100644 (file)
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -34,6 +34,10 @@
 #define CONFIG_IDENT_STRING    " for SMDK5420"
 #define CONFIG_DEFAULT_CONSOLE         "console=ttySAC1,115200n8\0"
 
+/* USB */
+#define CONFIG_USB_XHCI
+#define CONFIG_USB_XHCI_EXYNOS
+
 /* DRAM Memory Banks */
 #define CONFIG_NR_DRAM_BANKS   7
 #define SDRAM_BANK_SIZE                (512UL << 20UL) /* 512 MB */