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 ---
MAINTAINERS | 1 + configs/ph1_sld8_defconfig | 30 ---------------------- ...1_ld4_defconfig => uniphier_ld4_sld8_defconfig} | 1 + doc/README.uniphier | 12 ++++----- 4 files changed, 8 insertions(+), 36 deletions(-) delete mode 100644 configs/ph1_sld8_defconfig rename configs/{ph1_ld4_defconfig => uniphier_ld4_sld8_defconfig} (95%)
diff --git a/MAINTAINERS b/MAINTAINERS index 394be1e..18d8fce 100644 --- 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 deleted file mode 100644 index 4474ec3..0000000 --- a/configs/ph1_sld8_defconfig +++ /dev/null @@ -1,30 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_UNIPHIER=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_ARCH_UNIPHIER_PH1_SLD8=y -CONFIG_MICRO_SUPPORT_CARD=y -CONFIG_SYS_TEXT_BASE=0x84000000 -CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref" -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_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_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_EHCI_HCD=y -CONFIG_USB_STORAGE=y diff --git a/configs/ph1_ld4_defconfig b/configs/uniphier_ld4_sld8_defconfig similarity index 95% rename from configs/ph1_ld4_defconfig rename to configs/uniphier_ld4_sld8_defconfig index 2ddd1eb..ee3cbad 100644 --- a/configs/ph1_ld4_defconfig +++ b/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 index 57b947b..68cc05d 100644 --- 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-