| Message ID | 20210306024850.872843-1-aford173@gmail.com |
|---|---|
| State | Accepted |
| Commit | a69c48959b7adb0df770c8733df73e42b5376d66 |
| Delegated to: | Lokesh Vutla |
| Headers | show |
| Series | ARM: da850-evm: Fix boot issues from missing SPL_PAD_TO | expand |
On 06/03/21 8:18 am, Adam Ford wrote: > In a previous attempt to unify config options and remove items > from the whitelist file, SPL items were moved into a section > enabled with CONFIG_SPL_BUILD. Unfortunately, SPL_PAD_TO > is referenced at the head Makefile and uses this define > to create padding of the output file. When it was moved > to CONFIG_SPL_BUILD, it caused boot errors with devices > that are not booting from NOR. Fix the boot issues by moving > SPL_PAD_TO out so it's always. > > Fixes: 7bb33e4684aa ("ARM: da850-evm: Unify config options with Kconfig") > Signed-off-by: Adam Ford <aford173@gmail.com> Applied to u-boot-ti/for-rc Thanks and regards, Lokesh
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 0f41748093..883cbc95d2 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 */
In a previous attempt to unify config options and remove items from the whitelist file, SPL items were moved into a section enabled with CONFIG_SPL_BUILD. Unfortunately, SPL_PAD_TO is referenced at the head Makefile and uses this define to create padding of the output file. When it was moved to CONFIG_SPL_BUILD, it caused boot errors with devices that are not booting from NOR. Fix the boot issues by moving SPL_PAD_TO out so it's always. Fixes: 7bb33e4684aa ("ARM: da850-evm: Unify config options with Kconfig") Signed-off-by: Adam Ford <aford173@gmail.com>