ARM: uniphier: merge ph1_ld4_defconfig and ph1_sld8_defconfig

These two are similar enough to be merged into a single defconfig file. Distinguish one from another by "DEVICE_TREE" from the command line. The how-to-build in doc/README.uniphier should be also updated. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
friendlyarm · Dec 22, 2015 · 5fd3f43 · 5fd3f43
1 parent 752b75d
commit 5fd3f43
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 36 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -162,6 +162,7 @@ S:	Maintained
 T:	git git://git.denx.de/u-boot-uniphier.git
 F:	arch/arm/mach-uniphier/
 F:	configs/ph1_*_defconfig
+F:	configs/uniphier_*_defconfig
 N:	uniphier
 
 ARM ZYNQ

diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
diff --git a/configs/ph1_ld4_defconfig → configs/uniphier_ld4_sld8_defconfig b/configs/ph1_ld4_defconfig → configs/uniphier_ld4_sld8_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ARCH_UNIPHIER_PH1_LD4=y
+CONFIG_ARCH_UNIPHIER_PH1_SLD8=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref"

diff --git a/doc/README.uniphier b/doc/README.uniphier
@@ -32,18 +32,18 @@ PH1-sLD3:
     $ make ph1_sld3_defconfig
     $ make CROSS_COMPILE=arm-linux-gnueabi-
 
-PH1-LD4:
-    $ make ph1_ld4_defconfig
+PH1-LD4 reference board:
+    $ make uniphier_ld4_sld8_defconfig
     $ make CROSS_COMPILE=arm-linux-gnueabi-
 
+PH1-sLD8 reference board:
+    $ make uniphier_ld4_sld8_defconfig
+    $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ph1-sld8-ref
+
 PH1-Pro4:
     $ make ph1_pro4_defconfig
     $ make CROSS_COMPILE=arm-linux-gnueabi-
 
-PH1-sLD8:
-    $ make ph1_sld8_defconfig
-    $ make CROSS_COMPILE=arm-linux-gnueabi-
-
 PH1-Pro5:
     $ make ph1_pro5_defconfig
     $ make CROSS_COMPILE=arm-linux-gnueabi-