ARM: UniPhier: enable USB features

FAT-formated USB storage device access is available.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig
index e6aba422f811940b81784c591201b5e743240d4f..f54b15fa309fb60cb49bbf832382bec7df2e3b0a 100644 (file)
--- a/configs/ph1_ld4_defconfig
+++ b/configs/ph1_ld4_defconfig
@@ -8,4 +8,7 @@ CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
 CONFIG_DM_SERIAL=y
 CONFIG_UNIPHIER_SERIAL=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
 S:CONFIG_SPL_NAND_DENALI=y

diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
index 334ec4bbdff8ff9af4724770dc19d9a66524a711..e7957520fbebe7ff340eae161741f89563622afd 100644 (file)
--- a/configs/ph1_pro4_defconfig
+++ b/configs/ph1_pro4_defconfig
@@ -8,4 +8,7 @@ CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
 CONFIG_DM_SERIAL=y
 CONFIG_UNIPHIER_SERIAL=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
 S:CONFIG_SPL_NAND_DENALI=y

diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
index 4e8f354c9b596a30fe5eba2429477e1ef0d9b17a..65109374b7e05255bd6d26b2f465caf2aa40f3b4 100644 (file)
--- a/configs/ph1_sld8_defconfig
+++ b/configs/ph1_sld8_defconfig
@@ -8,4 +8,7 @@ CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
 CONFIG_DM_SERIAL=y
 CONFIG_UNIPHIER_SERIAL=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
 S:CONFIG_SPL_NAND_DENALI=y

diff --git a/include/configs/uniphier-common.h b/include/configs/uniphier-common.h
index b18ae6dfaeb3551573ae9810fd4ef817428e209f..c779c9fdacfee396b58c1c9271febd11d7faf297 100644 (file)
--- a/include/configs/uniphier-common.h
+++ b/include/configs/uniphier-common.h
@@ -166,6 +166,13 @@ are defined. Select only one of them."
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS                  0
 
+/* USB */
+#define CONFIG_CMD_USB
+#define CONFIG_USB_MAX_CONTROLLER_COUNT                2
+#define CONFIG_CMD_FAT
+#define CONFIG_FAT_WRITE
+#define CONFIG_DOS_PARTITION
+
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x01000000)