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: disable CONFIG_MTD_NOR_FLASH
[oweals/u-boot.git]
/
configs
/
calimain_defconfig
diff --git
a/configs/calimain_defconfig
b/configs/calimain_defconfig
index 505ab3734a0aac5955d35caa20e078f7e7bafd85..787294aef22333054b5f56e790761d85fc521f6e 100644
(file)
--- a/
configs/calimain_defconfig
+++ b/
configs/calimain_defconfig
@@
-1,7
+1,11
@@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CALIMAIN=y
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CALIMAIN=y
+# CONFIG_MMC is not set
CONFIG_BOOTDELAY=0
CONFIG_BOOTDELAY=0
+CONFIG_VERSION_VARIABLE=y
+# CONFIG_DISPLAY_CPUINFO is not set
+# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Calimain > "
CONFIG_AUTOBOOT_KEYED=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Calimain > "
CONFIG_AUTOBOOT_KEYED=y
@@
-12,4
+16,5
@@
CONFIG_CMD_GPIO=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
+CONFIG_MTD_NOR_FLASH=y
CONFIG_SYS_NS16550=y
CONFIG_SYS_NS16550=y