diff options
author | Tom Rini <trini@konsulko.com> | 2020-10-22 21:36:47 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-10-22 21:36:47 +0300 |
commit | ae4fdd7b0432bcb0bc2fe7d90b6d3e92001ab478 (patch) | |
tree | e933e67609989d0e4960f1464384e9ff40732b30 /common/spl | |
parent | b90daf2743b38022bea8727ede867ad63e971db2 (diff) | |
parent | dddfde5401ed5ad82c996b35b61dc4a45bb4e2b3 (diff) | |
download | u-boot-ae4fdd7b0432bcb0bc2fe7d90b6d3e92001ab478.tar.xz |
Merge branch '2020-10-22-misc-changes'
- Assorted updates for Xen, IPQ40xx, ASpeed, Keymile
- Assorted typo / documentation fixes
- Fix default preboot cmd to act like before with USB_STORAGE set
- A number of other bugfixes throughout the code
Diffstat (limited to 'common/spl')
-rw-r--r-- | common/spl/Kconfig | 8 | ||||
-rw-r--r-- | common/spl/spl_ymodem.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 620ea1e8b4..af47f5ce1c 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -37,9 +37,9 @@ config SPL_FRAMEWORK_BOARD_INIT_F config SPL_SIZE_LIMIT hex "Maximum size of SPL image" depends on SPL - default 69632 if ARCH_MX6 && !MX6_OCRAM_256KB - default 200704 if ARCH_MX6 && MX6_OCRAM_256KB - default 0 + default 0x11000 if ARCH_MX6 && !MX6_OCRAM_256KB + default 0x31000 if ARCH_MX6 && MX6_OCRAM_256KB + default 0x0 help Specifies the maximum length of the U-Boot SPL image. If this value is zero, it is ignored. @@ -1335,7 +1335,7 @@ if TPL config TPL_SIZE_LIMIT hex "Maximum size of TPL image" depends on TPL - default 0 + default 0x0 help Specifies the maximum length of the U-Boot TPL image. If this value is zero, it is ignored. diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c index 284512478f..e979f780ad 100644 --- a/common/spl/spl_ymodem.c +++ b/common/spl/spl_ymodem.c @@ -32,7 +32,7 @@ struct ymodem_fit_info { static int getcymodem(void) { if (tstc()) - return (getc()); + return (getchar()); return -1; } |