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-usb
[platform/kernel/u-boot.git]
/
configs
/
am335x_evm_nor_defconfig
diff --git
a/configs/am335x_evm_nor_defconfig
b/configs/am335x_evm_nor_defconfig
index
fecec5e
..
be90163
100644
(file)
--- a/
configs/am335x_evm_nor_defconfig
+++ b/
configs/am335x_evm_nor_defconfig
@@
-1,4
+1,6
@@
CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,NOR"
+CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_CONS_INDEX=1
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_AM335X_EVM=y
+CONFIG_NOR=y