summaryrefslogtreecommitdiff
path: root/configs/uniphier_pxs2_ld6b_defconfig
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-26 18:59:41 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-02-29 03:50:16 +0900
commitfe7c95ee5c2e4a757941221ae3b624c78bdaf068 (patch)
tree601185e6454c3f0e8818f1d6bc30f5e274b30349 /configs/uniphier_pxs2_ld6b_defconfig
parent4e651003e5413530aaea6ff00841ef52fb48b797 (diff)
ARM: uniphier: merge two defconfig files
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@socionext.com>
Diffstat (limited to 'configs/uniphier_pxs2_ld6b_defconfig')
-rw-r--r--configs/uniphier_pxs2_ld6b_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig
index 0115c215f8..10af9c884b 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