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 git://git.denx.de/u-boot-mmc
[platform/kernel/u-boot.git]
/
configs
/
ls1021aqds_qspi_defconfig
diff --git
a/configs/ls1021aqds_qspi_defconfig
b/configs/ls1021aqds_qspi_defconfig
index
77a430d
..
379ff90
100644
(file)
--- a/
configs/ls1021aqds_qspi_defconfig
+++ b/
configs/ls1021aqds_qspi_defconfig
@@
-1,6
+1,6
@@
CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
-CONFIG_
VIDEO=y
+CONFIG_
SYS_TEXT_BASE=0x40100000
CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-duart"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
@@
-14,7
+14,6
@@
CONFIG_SILENT_CONSOLE=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
-# CONFIG_CMD_IMLS is not set
CONFIG_CMD_GREPENV=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_GREPENV=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_MEMTEST=y
@@
-55,4
+54,5
@@
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=y
CONFIG_VIDEO_FSL_DCU_FB=y
+CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
# CONFIG_VIDEO_SW_CURSOR is not set