projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
[platform/kernel/u-boot.git]
/
configs
/
at91sam9xeek_nandflash_defconfig
diff --git
a/configs/at91sam9xeek_nandflash_defconfig
b/configs/at91sam9xeek_nandflash_defconfig
index
b8ad4c1
..
d00843f
100644
(file)
--- a/
configs/at91sam9xeek_nandflash_defconfig
+++ b/
configs/at91sam9xeek_nandflash_defconfig
@@
-3,6
+3,7
@@
CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91SAM9260EK=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
+# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="U-Boot> "
# CONFIG_CMD_BDI is not set
CONFIG_CMD_BOOTZ=y