summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ford <aford173@gmail.com>2021-03-05 20:48:50 -0600
committerLokesh Vutla <lokeshvutla@ti.com>2021-03-15 11:11:20 +0530
commita69c48959b7adb0df770c8733df73e42b5376d66 (patch)
treee493e74aa4433fb60f7c2d0a15e7cc98ee5a17b6
parent136284a3cf282585b600b10bba2286518263df20 (diff)
downloadu-boot-a69c48959b7adb0df770c8733df73e42b5376d66.tar.gz
u-boot-a69c48959b7adb0df770c8733df73e42b5376d66.tar.bz2
u-boot-a69c48959b7adb0df770c8733df73e42b5376d66.zip
ARM: da850-evm: Fix boot issues from missing SPL_PAD_TO
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>
-rw-r--r--include/configs/da850evm.h6
1 files changed, 5 insertions, 1 deletions
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 */