diff options
| author | Tom Rini <[email protected]> | 2022-11-21 11:54:58 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-11-21 11:54:58 -0500 |
| commit | 347ed8482217c86a011d6269bcd3e75fbecc2834 (patch) | |
| tree | 1fe2bbd3b83d93636a95973f7948e5a6ab9bef55 /common | |
| parent | bebb393b340295edb9ba50a996fc0510cd1b6ac0 (diff) | |
| parent | 4b0a1f59873abca079a4462a9a90d76abbcbc419 (diff) | |
Merge branch '2022-11-21-important-fixes'
- Several important fixes for the Nokia RX51 platform, and a few other
fixes while we're at it.
Diffstat (limited to 'common')
| -rw-r--r-- | common/cli_readline.c | 6 | ||||
| -rw-r--r-- | common/spl/Kconfig | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/common/cli_readline.c b/common/cli_readline.c index f6e2bcdeceb..d6444f5fc1d 100644 --- a/common/cli_readline.c +++ b/common/cli_readline.c @@ -517,10 +517,8 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len, } #endif default: - if (ichar >= ' ' && ichar <= '~') { - cread_add_char(ichar, insert, &num, &eol_num, - buf, *len); - } + cread_add_char(ichar, insert, &num, &eol_num, buf, + *len); break; } } diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 05181bdba3e..fef01bdd7da 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1440,7 +1440,8 @@ config SPL_YMODEM_SUPPORT config SPL_ATF bool "Support ARM Trusted Firmware" - depends on ARM64 && SPL_FIT + depends on ARM64 + depends on SPL_LOAD_FIT && !SPL_FIT_IMAGE_TINY help ATF(ARM Trusted Firmware) is a component for ARM AArch64 which is loaded by SPL (which is considered as BL2 in ATF terminology). @@ -1487,6 +1488,7 @@ config SPL_OPTEE_IMAGE config SPL_OPENSBI bool "Support RISC-V OpenSBI" depends on RISCV && SPL_RISCV_MMODE && RISCV_SMODE + depends on SPL_LOAD_FIT && !SPL_FIT_IMAGE_TINY help OpenSBI is an open-source implementation of the RISC-V Supervisor Binary Interface (SBI) specification. U-Boot supports the OpenSBI FW_DYNAMIC |