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 tag 'u-boot-rockchip-20200531' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
configs
/
slimbootloader_defconfig
diff --git
a/configs/slimbootloader_defconfig
b/configs/slimbootloader_defconfig
index b16ed71469497f394685f509d5d2434e18967396..4a4fb1100d40ae62913183c3e594143420b03c77 100644
(file)
--- a/
configs/slimbootloader_defconfig
+++ b/
configs/slimbootloader_defconfig
@@
-1,22
+1,23
@@
CONFIG_X86=y
CONFIG_X86=y
+CONFIG_ENV_SIZE=0x1000
CONFIG_VENDOR_INTEL=y
CONFIG_TARGET_SLIMBOOTLOADER=y
CONFIG_VENDOR_INTEL=y
CONFIG_TARGET_SLIMBOOTLOADER=y
-CONFIG_DEFAULT_DEVICE_TREE="slimbootloader"
-CONFIG_REGMAP=y
-CONFIG_SYSCON=y
+# CONFIG_USE_CAR is not set
+CONFIG_BOOTSTAGE=y
+CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_BOOTDELAY=10
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_LAST_STAGE_INIT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_MMC=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_LAST_STAGE_INIT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
-CONFIG_CMD_USB=y
-CONFIG_DOS_PARTITION=y
CONFIG_EFI_PARTITION=y
CONFIG_EFI_PARTITION=y
-CONFIG_OF_CONTROL=y
-CONFIG_BOOTSTAGE=y
-CONFIG_BOOTSTAGE_REPORT=y
-CONFIG_BOOTDELAY=10
-CONFIG_CONSOLE_SCROLL_LINES=5
+CONFIG_DEFAULT_DEVICE_TREE="slimbootloader"
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
# CONFIG_PCI_PNP is not set
# CONFIG_PCI_PNP is not set
+CONFIG_CONSOLE_SCROLL_LINES=5