diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-01 14:41:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-01 14:41:22 -0400 |
| commit | 72ffb41a873722993d89c02bae4743a8ad6f16f9 (patch) | |
| tree | 2508a115df4604adc9395b4f72e8ec3ec8fff90f /common | |
| parent | 5371593aed56ee11cbb6cc6ac8d058fcd9b8f58c (diff) | |
| parent | eec44c7218a3c3ce924a282cc46a59e83feb9de1 (diff) | |
Merge tag 'dm-pull-1aug21' of https://source.denx.de/u-boot/custodians/u-boot-dm
sandbox TPM-emulator improvements
rST documentation and fixes for moveconfig
handle empty 'ranges' property in dtoc
patman warning for invalid tag
clean-ups to 'fdt add' command
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoboot.c | 6 | ||||
| -rw-r--r-- | common/board_r.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index 8b9e9aa878..5bb2e19089 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -406,7 +406,7 @@ static int abortboot(int bootdelay) int abort = 0; if (bootdelay >= 0) { - if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED)) + if (autoboot_keyed()) abort = abortboot_key_sequence(bootdelay); else abort = abortboot_single_key(bootdelay); @@ -481,7 +481,7 @@ void autoboot_command(const char *s) bool lock; int prev; - lock = IS_ENABLED(CONFIG_AUTOBOOT_KEYED) && + lock = autoboot_keyed() && !IS_ENABLED(CONFIG_AUTOBOOT_KEYED_CTRLC); if (lock) prev = disable_ctrlc(1); /* disable Ctrl-C checking */ @@ -498,4 +498,4 @@ void autoboot_command(const char *s) if (s) run_command_list(s, -1, 0); } -}
\ No newline at end of file +} diff --git a/common/board_r.c b/common/board_r.c index 3f82404772..e3e6248a1f 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -323,10 +323,16 @@ static int initr_manual_reloc_cmdtable(void) static int initr_binman(void) { + int ret; + if (!CONFIG_IS_ENABLED(BINMAN_FDT)) return 0; - return binman_init(); + ret = binman_init(); + if (ret) + printf("binman_init failed:%d\n", ret); + + return ret; } #if defined(CONFIG_MTD_NOR_FLASH) |