projects
/
oweals
/
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-sunxi
[oweals/u-boot.git]
/
configs
/
ls1021aqds_nor_SECURE_BOOT_defconfig
diff --git
a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
index 567c8525090b7ea9cfb38c0d83bc7fb7beb9a8f7..820d6fcce28e0840e804ec5d6c9b26496224033d 100644
(file)
--- a/
configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/
configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@
-1,13
+1,12
@@
CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
-CONFIG_S
YS_FSL_DDR3
=y
+CONFIG_S
ECURE_BOOT
=y
CONFIG_VIDEO=y
# CONFIG_SYS_MALLOC_F is not set
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_VIDEO=y
# CONFIG_SYS_MALLOC_F is not set
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
-CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
CONFIG_BOOTDELAY=3
CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set
CONFIG_BOOTDELAY=3
CONFIG_SILENT_CONSOLE=y
# CONFIG_CONSOLE_MUX is not set
@@
-27,6
+26,7
@@
CONFIG_CMD_PING=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_DM=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_DM=y
+CONFIG_SYS_FSL_DDR3=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_PCI=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_PCI=y