projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ARM: uniphier: merge two defconfig files
[oweals/u-boot.git]
/
configs
/
uniphier_pxs2_ld6b_defconfig
diff --git
a/configs/uniphier_pxs2_ld6b_defconfig
b/configs/uniphier_pxs2_ld6b_defconfig
index 0115c215f83a5b19de1f2f770c1db397a9e583df..10af9c884b8ca28ac93f59e20da2d605c6746621 100644
(file)
--- 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