summaryrefslogtreecommitdiff
path: root/include/configs/helios4.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-06-10 22:59:38 -0400
committerTom Rini <trini@konsulko.com>2022-06-28 17:11:48 -0400
commit910feb50d40acdd38b3709050fbe6b650e8c4b9d (patch)
treea5c3ad3ffb6761477a9f2e8f9811dffc87c7a09d /include/configs/helios4.h
parentde47ff536363289f92f85ed1e4901724d238432d (diff)
downloadu-boot-910feb50d40acdd38b3709050fbe6b650e8c4b9d.tar.gz
Globally remove most CONFIG_SPL_BUILD tests from config headers
With the exception of how PowerPC handles SPL and TPL (which has its own issues), we cannot safely hide options under CONFIG_SPL_BUILD. Largely remove the places that have this test today. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/helios4.h')
-rw-r--r--include/configs/helios4.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index 23eb0d4375..cae2007358 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -31,9 +31,7 @@
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */
-#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_SCAN_SHOW
-#endif
/* Keep device tree and initrd in lower memory so the kernel can access them */
#define RELOCATION_LIMITS_ENV_SETTINGS \
@@ -47,8 +45,6 @@
#include "mv-common.h"
/* Include the common distro boot environment */
-#ifndef CONFIG_SPL_BUILD
-
#ifdef CONFIG_MMC
#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
#else
@@ -126,6 +122,4 @@
"console=ttyS0,115200\0" \
BOOTENV
-#endif /* CONFIG_SPL_BUILD */
-
#endif /* _CONFIG_HELIOS4_H */