diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-31 08:49:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-31 08:49:53 -0500 |
| commit | 242ef48ea76ae13ac6357cc50aae01eb7a46bfef (patch) | |
| tree | 18105866b6063eddcc7ddb0530c002fadc377b3b /configs | |
| parent | 76404f86a24aa28efc26a296bf6ab9d697c60b9f (diff) | |
| parent | f84eda89e5970ef513fe64ba8e8d977788c44dca (diff) | |
Merge tag 'dm-pull-30jan21' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
tpm fixes for coral
binman fixes support for symbols in sub-sections
support for additional cros_ec commands
various minor fixes / tweaks
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/chromebook_coral_defconfig | 1 | ||||
| -rw-r--r-- | configs/sandbox_spl_defconfig | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/configs/chromebook_coral_defconfig b/configs/chromebook_coral_defconfig index 05e6ce6493..ab73a0a88c 100644 --- a/configs/chromebook_coral_defconfig +++ b/configs/chromebook_coral_defconfig @@ -29,6 +29,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_SPL_BOOTSTAGE_RECORD_COUNT=10 CONFIG_BOOTSTAGE_STASH=y CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS_SUBST=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_LOGF_FUNC=y CONFIG_SPL_LOG=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index d193b18f47..61dae34a6a 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -101,7 +101,6 @@ CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y CONFIG_DEVRES=y CONFIG_DEBUG_DEVRES=y -# CONFIG_SPL_SIMPLE_BUS is not set CONFIG_ADC=y CONFIG_ADC_SANDBOX=y CONFIG_AXI=y |