diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-15 08:43:29 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-15 08:43:29 -0400 |
| commit | 23986be8cad36346f210aabab4ff30038f2b731c (patch) | |
| tree | 1b9c32575bff08557053c8c5e208a1654fa90a77 /include/configs | |
| parent | e8a10a02bd9ce6988942c393373d89dee5704c59 (diff) | |
| parent | f72edfddde5cd90e6aa52e11374adc7af499adce (diff) | |
| download | u-boot-23986be8cad36346f210aabab4ff30038f2b731c.zip u-boot-23986be8cad36346f210aabab4ff30038f2b731c.tar.gz u-boot-23986be8cad36346f210aabab4ff30038f2b731c.tar.bz2 | |
Merge tag 'ti-v2021.04-rc4' of https://source.denx.de/u-boot/custodians/u-boot-tiWIP/15Mar2021
- Fix boot for da850-evm and omap3_logic
- Optimize SPL size for am65x boards
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/am65x_evm.h | 2 | ||||
| -rw-r--r-- | include/configs/da850evm.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index b39a5b4..76d7308 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -30,7 +30,7 @@ * our memory footprint. The less we use for BSS the more we have available * for everything else. */ -#define CONFIG_SPL_BSS_MAX_SIZE 0x5000 +#define CONFIG_SPL_BSS_MAX_SIZE 0xc00 /* * Link BSS to be within SPL in a dedicated region located near the top of * the MCU SRAM, this way making it available also before relocation. Note diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 0f41748..883cbc9 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -215,6 +215,10 @@ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15 +#ifndef CONFIG_MTD_NOR_FLASH +#define CONFIG_SPL_PAD_TO 32768 +#endif + #ifdef CONFIG_SPL_BUILD /* defines for SPL */ #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ @@ -222,7 +226,7 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN #define CONFIG_SPL_STACK 0x8001ff00 #define CONFIG_SPL_MAX_FOOTPRINT 32768 -#define CONFIG_SPL_PAD_TO 32768 + #endif /* Load U-Boot Image From MMC */ |