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
/
tricorder_flash_defconfig
diff --git
a/configs/tricorder_flash_defconfig
b/configs/tricorder_flash_defconfig
index f6e1c464aadd806d744c1e14567716fbd2d9c967..1cf39286a09ad0bf7a6207c62a9fee450b8cae94 100644
(file)
--- a/
configs/tricorder_flash_defconfig
+++ b/
configs/tricorder_flash_defconfig
@@
-1,5
+1,13
@@
+CONFIG_ARM=y
+CONFIG_OMAP34XX=y
+CONFIG_TARGET_TRICORDER=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD"
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD"
-+S:CONFIG_ARM=y
-+S:CONFIG_OMAP34XX=y
-+S:CONFIG_TARGET_TRICORDER=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+CONFIG_SYS_NS16550=y