[U-Boot] [PATCH 1/5] ARM: uniphier: merge two defconfig files

[Masahiro Yamada]

PH1-Pro5 support and ProXstream2/PH1-LD6b support can coexist in one
image and there is bit more room in SPL to accommodate all of them.
Merge uniphier_pro5_defconfig into uniphier_pxs2_defconfig.

Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>
---

 configs/uniphier_pro5_defconfig      | 33 ---------------------------------
 configs/uniphier_pxs2_ld6b_defconfig |  1 +
 doc/README.uniphier                  |  4 ++--
 3 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 configs/uniphier_pro5_defconfig

diff --git a/configs/uniphier_pro5_defconfig b/configs/uniphier_pro5_defconfig
deleted file mode 100644
index 0029cd3..0000000
--- a/configs/uniphier_pro5_defconfig
+++ /dev/null
@@ -1,33 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_UNIPHIER=y
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_ARCH_UNIPHIER_PH1_PRO5=y
-CONFIG_MICRO_SUPPORT_CARD=y
-CONFIG_SYS_TEXT_BASE=0x84000000
-CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro5-4kbox"
-CONFIG_HUSH_PARSER=y
-# CONFIG_CMD_XIMG is not set
-# CONFIG_CMD_ENV_EXISTS is not set
-CONFIG_CMD_NAND=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_FPGA is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_TIME=y
-# CONFIG_CMD_MISC is not set
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SPL_SIMPLE_BUS=y
-CONFIG_GPIO_UNIPHIER=y
-CONFIG_MMC_UNIPHIER=y
-CONFIG_NAND_DENALI=y
-CONFIG_SYS_NAND_DENALI_64BIT=y
-CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
-CONFIG_SPL_NAND_DENALI=y
-CONFIG_PINCTRL=y
-CONFIG_SPL_PINCTRL=y
-CONFIG_UNIPHIER_SERIAL=y
-CONFIG_USB=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_STORAGE=y
diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig
index 0115c21..10af9c8 100644
--- a/configs/uniphier_pxs2_ld6b_defconfig
+++ b/configs/uniphier_pxs2_ld6b_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ARCH_UNIPHIER_PH1_PRO5=y
 CONFIG_ARCH_UNIPHIER_PROXSTREAM2=y
 CONFIG_ARCH_UNIPHIER_PH1_LD6B=y
 CONFIG_MICRO_SUPPORT_CARD=y
diff --git a/doc/README.uniphier b/doc/README.uniphier
index 5ac52bd..6c3b092 100644
--- a/doc/README.uniphier
+++ b/doc/README.uniphier
@@ -45,8 +45,8 @@ PH1-Pro4 reference board:
     $ make CROSS_COMPILE=arm-linux-gnueabi-
 
 PH1-Pro5 4KBOX Board:
-    $ make uniphier_pro5_defconfig
-    $ make CROSS_COMPILE=arm-linux-gnueabi-
+    $ make uniphier_pxs2_ld6b_defconfig
+    $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ph1-pro5-4kbox
 
 ProXstream2 Gentil board:
     $ make uniphier_pxs2_ld6b_defconfig
-- 
1.9.1