From 1a2645341a1fd6adda37deb8b9bc9f92c2fb9dbd Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 17 Dec 2015 18:00:40 +0900 Subject: [PATCH] ARM: uniphier: support ProXstream2, PH1-LD6b boards in single defconfig These boards are similar enough to be supported in 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 --- ...ld6b_defconfig => uniphier_pxs2_ld6b_defconfig} | 3 ++- doc/README.uniphier | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) rename configs/{ph1_ld6b_defconfig => uniphier_pxs2_ld6b_defconfig} (88%) diff --git a/configs/ph1_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig similarity index 88% rename from configs/ph1_ld6b_defconfig rename to configs/uniphier_pxs2_ld6b_defconfig index bbcb3444ae..f8cb794b8f 100644 --- a/configs/ph1_ld6b_defconfig +++ b/configs/uniphier_pxs2_ld6b_defconfig @@ -1,10 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_ARCH_UNIPHIER_PROXSTREAM2=y CONFIG_ARCH_UNIPHIER_PH1_LD6B=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 -CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld6b-ref" +CONFIG_DEFAULT_DEVICE_TREE="uniphier-proxstream2-vodka" CONFIG_HUSH_PARSER=y # CONFIG_CMD_XIMG is not set # CONFIG_CMD_ENV_EXISTS is not set diff --git a/doc/README.uniphier b/doc/README.uniphier index 68cc05df1d..7562e6fa90 100644 --- a/doc/README.uniphier +++ b/doc/README.uniphier @@ -48,14 +48,18 @@ PH1-Pro5: $ make ph1_pro5_defconfig $ make CROSS_COMPILE=arm-linux-gnueabi- -ProXstream2: - $ make pxs2_defconfig - $ make CROSS_COMPILE=arm-linux-gnueabi- +ProXstream2 Gentil board: + $ make uniphier_pxs2_ld6b_defconfig + $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-proxstream2-gentil -PH1-LD6b: - $ make ph1_ld6b_defconfig +ProXstream2 Vodka board: + $ make uniphier_pxs2_ld6b_defconfig $ make CROSS_COMPILE=arm-linux-gnueabi- +PH1-LD6b reference board: + $ make uniphier_pxs2_ld6b_defconfig + $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ph1-ld6b-ref + You may wish to change the "CROSS_COMPILE=arm-linux-gnueabi-" to use your favorite compiler. -- 2.25.1