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 --- include/configs/am335x_igep003x.h | 2 -- include/configs/am335x_sl50.h | 4 ---- include/configs/apalis_imx6.h | 4 ---- include/configs/baltos.h | 2 -- include/configs/brppt1.h | 2 -- include/configs/brsmarc1.h | 3 --- include/configs/brxre1.h | 3 --- include/configs/capricorn-common.h | 3 --- include/configs/clearfog.h | 6 ------ include/configs/cm_fx6.h | 6 ------ include/configs/cm_t335.h | 4 ---- include/configs/colibri_imx6.h | 4 ---- include/configs/controlcenterdc.h | 2 -- include/configs/da850evm.h | 2 -- include/configs/db-88f6820-amc.h | 2 -- include/configs/db-88f6820-gp.h | 2 -- include/configs/db-mv784mp-gp.h | 2 -- include/configs/dh_imx6.h | 2 -- include/configs/draco.h | 6 ------ include/configs/dragonboard820c.h | 2 -- include/configs/ds414.h | 2 -- include/configs/helios4.h | 6 ------ include/configs/imx6dl-mamoj.h | 2 -- include/configs/imx8mm_data_modul_edm_sbc.h | 4 ---- include/configs/imx8mm_evk.h | 2 -- include/configs/imx8mm_icore_mx8mm.h | 4 ---- include/configs/imx8mm_venice.h | 4 ---- include/configs/imx8mn_evk.h | 2 -- include/configs/imx8mn_venice.h | 4 ---- include/configs/imx8mp_dhcom_pdk2.h | 4 ---- include/configs/imx8mp_evk.h | 2 -- include/configs/imx8mp_venice.h | 4 ---- include/configs/imx8mq_cm.h | 2 -- include/configs/imx8mq_evk.h | 2 -- include/configs/iot2050.h | 4 ---- include/configs/kontron-sl-mx6ul.h | 4 ---- include/configs/kontron-sl-mx8mm.h | 4 ---- include/configs/kp_imx6q_tpc.h | 2 -- include/configs/kylin_rk3036.h | 6 ------ include/configs/ls1012a_common.h | 2 -- include/configs/ls1012afrdm.h | 2 -- include/configs/ls1012afrwy.h | 2 -- include/configs/ls1043a_common.h | 2 -- include/configs/ls1046a_common.h | 2 -- include/configs/ls1046afrwy.h | 2 -- include/configs/ls2080aqds.h | 2 +- include/configs/mx6cuboxi.h | 5 ----- include/configs/mx6sxsabresd.h | 4 ---- include/configs/mx6ul_14x14_evk.h | 4 ---- include/configs/novena.h | 5 ----- include/configs/omap3_igep00x0.h | 4 ---- include/configs/opos6uldev.h | 4 ---- include/configs/pdu001.h | 2 -- include/configs/pomelo.h | 2 -- include/configs/poplar.h | 2 -- include/configs/px30_common.h | 4 ---- include/configs/pxm2.h | 7 ------- include/configs/qemu-riscv.h | 2 -- include/configs/rastaban.h | 6 ------ include/configs/rk3036_common.h | 3 --- include/configs/rk3066_common.h | 4 ---- include/configs/rk3128_common.h | 4 ---- include/configs/rk3188_common.h | 3 --- include/configs/rk322x_common.h | 3 --- include/configs/rk3288_common.h | 3 --- include/configs/rk3308_common.h | 4 ---- include/configs/rk3328_common.h | 4 ---- include/configs/rk3368_common.h | 3 --- include/configs/rk3568_common.h | 2 -- include/configs/rut.h | 8 -------- include/configs/rv1108_common.h | 3 +-- include/configs/sandbox.h | 2 -- include/configs/siemens-am33x-common.h | 6 ------ include/configs/sifive-unleashed.h | 2 -- include/configs/sifive-unmatched.h | 2 -- include/configs/smartweb.h | 2 -- include/configs/socfpga_soc64_common.h | 15 --------------- include/configs/sunxi-common.h | 6 ------ include/configs/synquacer.h | 4 ---- include/configs/taurus.h | 6 ------ include/configs/tegra-common-post.h | 5 ----- include/configs/thuban.h | 6 ------ include/configs/ti_omap4_common.h | 2 -- include/configs/uniphier.h | 4 ---- include/configs/verdin-imx8mm.h | 4 ---- include/configs/verdin-imx8mp.h | 4 ---- include/configs/x530.h | 2 -- include/configs/xilinx_zynqmp.h | 2 -- 88 files changed, 2 insertions(+), 308 deletions(-)
diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index 2cf77a67c0c2..8d36ddeba596 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -20,7 +20,6 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK)
-#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "bootdir=/boot\0" \ @@ -89,7 +88,6 @@ "setenv fdtfile am335x-igep-base0040-lite.dtb; fi; " \ "if test ${fdtfile} = ''; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" -#endif
/* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index a57d551bcf17..79d9d03a176b 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -16,8 +16,6 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK)
-#ifndef CONFIG_SPL_BUILD - #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x80000000\0" \ "pxefile_addr_r=0x80100000\0" \ @@ -39,8 +37,6 @@ MEM_LAYOUT_ENV_SETTINGS \ BOOTENV
-#endif - /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 5db8b2be2cb8..7767fce4050e 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -48,7 +48,6 @@ #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ @@ -58,9 +57,6 @@ #include <config_distro_bootcmd.h> #undef BOOTENV_RUN_NET_USB_START #define BOOTENV_RUN_NET_USB_START "" -#else /* CONFIG_SPL_BUILD */ -#define BOOTENV -#endif /* CONFIG_SPL_BUILD */
#define UBOOT_UPDATE \ "uboot_hwpart=1\0" \ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 7b43741fde7c..1abda0836ab6 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -52,7 +52,6 @@ #define NANDARGS "" #endif
-#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "boot_fdt=try\0" \ @@ -183,7 +182,6 @@ "findfdt=setenv fdtfile am335x-baltos.dtb\0" \ NANDARGS /*DFUARGS*/ -#endif
/* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 12a4048a511c..440571a799e5 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -99,7 +99,6 @@ MMCSPI_TGTS \
#define LOAD_OFFSET(x) 0x8##x
-#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ "verify=no\0" \ @@ -123,7 +122,6 @@ NANDTGTS \ "b_default=run b_deftgts; for target in ${b_tgts};"\ " do echo "### booting ${target} ###"; run b_${target};" \ " if test ${b_break} = 1; then; exit; fi; done\0" -#endif /* !CONFIG_SPL_BUILD*/
#ifdef CONFIG_MTD_RAW_NAND /* diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index f1e6dbf61358..eccf16fdb7a1 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -24,8 +24,6 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK)
-#ifndef CONFIG_SPL_BUILD - /* Default environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ @@ -56,7 +54,6 @@ BUR_COMMON_ENV \ " fdt boardsetup\0" \ "startsys=run vxargs && mw 0x80001100 0 && run vxfdt &&" \ " bootm ${loadaddr} - ${dtbaddr}\0" -#endif /* !CONFIG_SPL_BUILD*/
/* SPI Flash */
diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index d34d69778f1b..b4e8d73db05a 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -23,8 +23,6 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK)
-#ifndef CONFIG_SPL_BUILD - /* Default environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ @@ -51,7 +49,6 @@ BUR_COMMON_ENV \ "b_usb0=usb start && load usb 0 ${scradr} usbscript.img && source ${scradr}\0" \ "b_default=run b_deftgts; for target in ${b_tgts};"\ " do run b_${target}; if test ${b_break} = 1; then; exit; fi; done\0" -#endif /* !CONFIG_SPL_BUILD*/
/* Environment */
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 456d1828d629..6b1e82ad3b17 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -25,15 +25,12 @@ #define CONFIG_FEC_ENET_DEV 1 #define CONFIG_FEC_MXC_PHYADDR 0x0
-/* I2C Configuration */ -#ifndef CONFIG_SPL_BUILD /* EEPROM */ #define EEPROM_I2C_BUS 0 /* I2C0 */ #define EEPROM_I2C_ADDR 0x50 /* PCA9552 */ #define PCA9552_1_I2C_BUS 1 /* I2C1 */ #define PCA9552_1_I2C_ADDR 0x60 -#endif /* !CONFIG_SPL_BUILD */
/* AHAB */ #ifdef CONFIG_AHAB_BOOT diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 8497fe28effe..af04352eda3b 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.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 @@ -125,6 +121,4 @@ "console=ttyS0,115200\0" \ BOOTENV
-#endif /* CONFIG_SPL_BUILD */ - #endif /* _CONFIG_CLEARFOG_H */ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index fbe1e35e001a..02935430c25e 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -30,7 +30,6 @@
/* Environment */
-#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ @@ -130,16 +129,11 @@ func(SATA, sata, 0)
#include <config_distro_bootcmd.h> -#else -#define CONFIG_EXTRA_ENV_SETTINGS -#endif
/* NAND */ -#ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* APBH DMA is required for NAND support */ -#endif
/* Ethernet */ #define CONFIG_FEC_MXC_PHYADDR 0 diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index b3ccc3cac3da..b2bec10960aa 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -19,7 +19,6 @@ #define V_OSCK 25000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK)
-#ifndef CONFIG_SPL_BUILD #define MMCARGS \ "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \ @@ -55,7 +54,6 @@ "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ MMCARGS \ NANDARGS -#endif /* CONFIG_SPL_BUILD */
#define CONFIG_SYS_AUTOLOAD "no"
@@ -95,7 +93,6 @@
/* EEPROM */
-#ifndef CONFIG_SPL_BUILD /* * Enable PCA9555 at I2C0-0x26. * First select the I2C0 bus with "i2c dev 0", then use "pca953x" command. @@ -103,6 +100,5 @@ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR 0x26 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x26, 16} } -#endif /* CONFIG_SPL_BUILD */
#endif /* __CONFIG_CM_T335_H */ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index f62a3f6688ed..0d8922bc3f83 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -45,7 +45,6 @@ #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ @@ -54,9 +53,6 @@ #include <config_distro_bootcmd.h> #undef BOOTENV_RUN_NET_USB_START #define BOOTENV_RUN_NET_USB_START "" -#else /* CONFIG_SPL_BUILD */ -#define BOOTENV -#endif /* CONFIG_SPL_BUILD */
#define UBOOT_UPDATE \ "uboot_hwpart=1\0" \ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index d1bea54b207e..bb1595f96111 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -18,9 +18,7 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */ -#ifndef CONFIG_SPL_BUILD #define CONFIG_PCI_SCAN_SHOW -#endif
/* * Environment Configuration diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 71ebca587d14..1f6ac8d28adf 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -101,9 +101,7 @@ /* * I2C Configuration */ -#ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20 -#endif
/* * Flash & Environment diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 3c442018ab1d..6912f39d32d2 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -15,9 +15,7 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */ -#ifndef CONFIG_SPL_BUILD #define CONFIG_PCI_SCAN_SHOW -#endif
/* NAND */
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 6b2edbb1e0d3..3b3a7abd281f 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -18,9 +18,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 CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index b4cfa61d4e75..da6514b64fc9 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -23,9 +23,7 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */ -#ifndef CONFIG_SPL_BUILD #define CONFIG_PCI_SCAN_SHOW -#endif
/* NAND */
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 6fe45a86dcc0..0c0abe6023e8 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -52,7 +52,6 @@ #endif #endif
-#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ "fdt_addr=0x18000000\0" \ @@ -77,7 +76,6 @@ func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> -#endif
/* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/draco.h b/include/configs/draco.h index b4998f5c2e56..21367f0a6f5e 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -30,8 +30,6 @@ /* Define own nand partitions */ #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
-#ifndef CONFIG_SPL_BUILD - /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hostname=draco\0" \ @@ -43,8 +41,4 @@ CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_NAND_V2
-#ifndef CONFIG_RESTORE_FLASH -/* set to negative value for no autoboot */ -#endif -#endif /* CONFIG_SPL_BUILD */ #endif /* ! __CONFIG_DRACO_H */ diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h index e3940dc3217c..705146d04f76 100644 --- a/include/configs/dragonboard820c.h +++ b/include/configs/dragonboard820c.h @@ -22,9 +22,7 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_BOOTM_LEN SZ_64M
-#ifndef CONFIG_SPL_BUILD #include <config_distro_bootcmd.h> -#endif
#define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 7fa1a4ebf020..7e3f657e31cc 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -20,9 +20,7 @@ #define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
/* PCIe support */ -#ifndef CONFIG_SPL_BUILD #define CONFIG_PCI_SCAN_SHOW -#endif
/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/helios4.h b/include/configs/helios4.h index 23eb0d4375df..cae20073584c 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 */ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 2707ae644067..0bae238a4b03 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -20,7 +20,6 @@ /* Environment in MMC */ #endif
-#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x14000000\0" \ "fdt_addr_r=0x13000000\0" \ @@ -34,7 +33,6 @@ func(MMC, mmc, 2)
#include <config_distro_bootcmd.h> -#endif
/* UART */ #define CONFIG_MXC_UART_BASE UART3_BASE diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h index f8af3baef6f4..e8f56b0759aa 100644 --- a/include/configs/imx8mm_data_modul_edm_sbc.h +++ b/include/configs/imx8mm_data_modul_edm_sbc.h @@ -35,8 +35,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
-#if !defined(CONFIG_SPL_BUILD) - #define CONFIG_EXTRA_ENV_SETTINGS \ "altbootcmd=setenv devpart 2 && run bootcmd ; reset\0" \ "bootlimit=3\0" \ @@ -102,5 +100,3 @@ "fi"
#endif - -#endif diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index d239c926ad5c..fbbc3ab30058 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -20,14 +20,12 @@ #define CONFIG_MALLOC_F_ADDR 0x930000 #endif
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> -#endif
/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index f02d6d58c4ad..dc7756e0c610 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -19,14 +19,10 @@ # define CONFIG_MALLOC_F_ADDR 0x930000 #endif /* CONFIG_SPL_BUILD */
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 2) \ func(MMC, mmc, 0) #include <config_distro_bootcmd.h> -#else -#define BOOTENV -#endif
#define ENV_MEM_LAYOUT_SETTINGS \ "fdt_addr_r=0x44000000\0" \ diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 573af3b7e286..9d3ecd51ccda 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -26,7 +26,6 @@ "kernel_comp_addr_r=0x40200000\0"
/* Enable Distro Boot */ -#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ @@ -34,9 +33,6 @@ func(USB, usb, 1) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#else -#define BOOTENV -#endif
/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 1b8caba3321c..f6889d4676db 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -16,14 +16,12 @@ #define CONFIG_SYS_UBOOT_BASE \ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> -#endif
/* Initial environment variables */ /* see include/configs/ti_armv7_common.h */ diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h index a3ba520eb0b5..0103d7df6131 100644 --- a/include/configs/imx8mn_venice.h +++ b/include/configs/imx8mn_venice.h @@ -21,16 +21,12 @@ "kernel_comp_addr_r=0x40200000\0"
/* Enable Distro Boot */ -#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#else -#define BOOTENV -#endif
/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/imx8mp_dhcom_pdk2.h b/include/configs/imx8mp_dhcom_pdk2.h index 79db625d0373..797ea0c7fad2 100644 --- a/include/configs/imx8mp_dhcom_pdk2.h +++ b/include/configs/imx8mp_dhcom_pdk2.h @@ -32,8 +32,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
-#if !defined(CONFIG_SPL_BUILD) - #define CONFIG_EXTRA_ENV_SETTINGS \ "altbootcmd=run bootcmd ; reset\0" \ "bootlimit=3\0" \ @@ -85,5 +83,3 @@ #include <config_distro_bootcmd.h>
#endif - -#endif diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 6464d2ff28b3..206f5c2fb353 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -31,13 +31,11 @@
#endif
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2)
#include <config_distro_bootcmd.h> -#endif
/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h index 7b30a3a21d7b..c9a2cefcd632 100644 --- a/include/configs/imx8mp_venice.h +++ b/include/configs/imx8mp_venice.h @@ -21,16 +21,12 @@ "kernel_comp_addr_r=0x40200000\0"
/* Enable Distro Boot */ -#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#else -#define BOOTENV -#endif
/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index 28f61b9fa13e..96e736e1e69a 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -24,14 +24,12 @@ /* ENET Config */ /* ENET1 */
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> -#endif
/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 63bd1955f453..781a40e3de29 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -31,14 +31,12 @@ #define CONFIG_FEC_MXC_PHYADDR 0 #endif
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> -#endif
/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h index 296bcd4c7b7b..d379bad0b154 100644 --- a/include/configs/iot2050.h +++ b/include/configs/iot2050.h @@ -21,8 +21,6 @@ #define EXTRA_ENV_IOT2050_BOARD_SETTINGS \ "usb_pgood_delay=900\0"
-#ifndef CONFIG_SPL_BUILD - #if CONFIG_IS_ENABLED(CMD_USB) # define BOOT_TARGET_USB(func) \ func(USB, usb, 0) \ @@ -44,8 +42,6 @@
#include <config_distro_bootcmd.h>
-#endif - #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ BOOTENV \ diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index d04684955d3c..7b5e57734644 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -35,7 +35,6 @@ #endif
/* Boot order for distro boot */ -#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ @@ -44,9 +43,6 @@ func(PXE, pxe, na) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#else -#define BOOTENV -#endif
/* MMC Configs */ #ifdef CONFIG_FSL_USDHC diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 64bfddde3b00..dcc98fdef867 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -37,7 +37,6 @@ EFI_GUID(0xd488e45a, 0x4929, 0x4b55, 0x8c, 0x14, \ 0x86, 0xce, 0xa2, 0xcd, 0x66, 0x29)
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ @@ -47,9 +46,6 @@ /* Do not try to probe USB net adapters for net boot */ #undef BOOTENV_RUN_NET_USB_START #define BOOTENV_RUN_NET_USB_START -#else -#define BOOTENV -#endif
#define CONFIG_SYS_BOOTM_LEN SZ_64M
diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index a513213c5980..7b8e70e59453 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -26,7 +26,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ #endif
-#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ "fdt_addr=0x18000000\0" \ @@ -87,7 +86,6 @@ func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> -#endif
/* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h index 75fc03f14723..fea7c835fdcb 100644 --- a/include/configs/kylin_rk3036.h +++ b/include/configs/kylin_rk3036.h @@ -9,10 +9,4 @@ #include <linux/sizes.h> #include <configs/rk3036_common.h>
-#ifndef CONFIG_SPL_BUILD - -/* Store env in emmc */ - -#endif - #endif diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 1d8d9485e743..19201a735f0a 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -36,14 +36,12 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ func(SCSI, scsi, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#endif
/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index cb79d6362fcb..674bcbeb7584 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -12,11 +12,9 @@ /* DDR */ #define CONFIG_SYS_SDRAM_SIZE 0x20000000
-#ifndef CONFIG_SPL_BUILD #undef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES(func) \ func(USB, usb, 0) -#endif
#undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index a1d23b64630d..7f083c597e30 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -19,13 +19,11 @@ /* ENV */ #define CONFIG_SYS_FSL_QSPI_BASE 0x40000000
-#ifndef CONFIG_SPL_BUILD #undef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) -#endif
#define CONFIG_PCIE1 /* PCIE controller 1 */
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index fe9a8fd3754e..6e2c048fb128 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -137,13 +137,11 @@ #define HWCONFIG_BUFFER_SIZE 128
#ifndef SPL_NO_MISC -#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#endif
/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 8e9103562eb7..e139aa93e1fc 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -104,14 +104,12 @@ #define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 128
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(SCSI, scsi, 0) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#endif
#if defined(CONFIG_TARGET_LS1046AFRWY) #define LS1046A_BOOT_SRC_AND_HDR\ diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h index d56d0c029474..e663fa0f6c7d 100644 --- a/include/configs/ls1046afrwy.h +++ b/include/configs/ls1046afrwy.h @@ -80,13 +80,11 @@ */ #define CONFIG_SYS_FSL_QSPI_BASE 0x40000000
-#ifndef CONFIG_SPL_BUILD #undef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) -#endif
/* FMan */ #ifdef CONFIG_SYS_DPAA_FMAN diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index f2eae073810b..21ca4afa51ce 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -410,7 +410,7 @@ "env exists secureboot && esbc_halt;" #endif
-#if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_FSL_MC_ENET) #define CONFIG_FSL_MEMAC #define SGMII_CARD_PORT1_PHY_ADDR 0x1C #define SGMII_CARD_PORT2_PHY_ADDR 0x1d diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index c6744e970f68..cffbb64bcd53 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -27,7 +27,6 @@
#define CONFIG_MXC_UART_BASE UART1_BASE
-#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ "som_rev=undefined\0" \ "has_emmc=undefined\0" \ @@ -87,10 +86,6 @@
#include <config_distro_bootcmd.h>
-#else -#define CONFIG_EXTRA_ENV_SETTINGS -#endif /* CONFIG_SPL_BUILD */ - /* Physical Memory Map */ #define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index a5596d98fe68..8bddc5281e5e 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -136,10 +136,6 @@ #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1) #endif
-#ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_DM_VIDEO #define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR -#endif -#endif
#endif /* __CONFIG_H */ diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 7c76290a2aeb..6a110132a759 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -134,10 +134,6 @@ #endif #endif
-#ifndef CONFIG_SPL_BUILD -#if defined(CONFIG_DM_VIDEO) #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR -#endif -#endif
#endif diff --git a/include/configs/novena.h b/include/configs/novena.h index 9c67a3a77750..40304ba468c1 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -76,7 +76,6 @@ #define CONFIG_IMX_VIDEO_SKIP
/* Extra U-Boot environment. */ -#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ @@ -147,8 +146,4 @@
#include <config_distro_bootcmd.h>
-#else -#define CONFIG_EXTRA_ENV_SETTINGS -#endif /* CONFIG_SPL_BUILD */ - #endif /* __CONFIG_H */ diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index c1ef040ce360..6be214753f1b 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -28,8 +28,6 @@ #define GPIO_IGEP00X0_BOARD_DETECTION 28 #define GPIO_IGEP00X0_REVISION_DETECTION 129
-#ifndef CONFIG_SPL_BUILD - /* Environment */ #define ENV_DEVICE_SETTINGS \ "stdin=serial\0" \ @@ -67,8 +65,6 @@ MEM_LAYOUT_SETTINGS \ BOOTENV
-#endif - /* OneNAND config */ #define CONFIG_USE_ONENAND_BOARD_INIT #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index ebfba72d0da4..d368376d2028 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -30,11 +30,7 @@ #endif
/* LCD */ -#ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_DM_VIDEO #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR -#endif -#endif
/* Environment is stored in the eMMC boot partition */
diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h index 7ab6a896040f..ed3201aa3c42 100644 --- a/include/configs/pdu001.h +++ b/include/configs/pdu001.h @@ -32,7 +32,6 @@ #define CONSOLE_DEV "ttyO5" #endif
-#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "fdtfile=am335x-pdu001.dtb\0" \ @@ -49,7 +48,6 @@ "reset;" \ "fi;" \ "\0" -#endif
/* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 UART0_BASE diff --git a/include/configs/pomelo.h b/include/configs/pomelo.h index 11d408f19084..647bb3d02a1b 100644 --- a/include/configs/pomelo.h +++ b/include/configs/pomelo.h @@ -16,12 +16,10 @@ /*BOOT*/ #define CONFIG_SYS_BOOTM_LEN 0x3c00000
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(SCSI, scsi, 0) \
#include <config_distro_bootcmd.h> -#endif
/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/poplar.h b/include/configs/poplar.h index 6def3691103c..b119465420df 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -31,9 +31,7 @@ func(USB, usb, 0) \ func(MMC, mmc, 0) \ func(DHCP, dhcp, na) -#ifndef CONFIG_SPL_BUILD #include <config_distro_bootcmd.h> -#endif
#define CONFIG_EXTRA_ENV_SETTINGS \ "loader_mmc_blknum=0x0\0" \ diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h index 96dcfb420f7b..62ed86b29c89 100644 --- a/include/configs/px30_common.h +++ b/include/configs/px30_common.h @@ -24,8 +24,6 @@ #define SDRAM_MAX_SIZE 0xff000000 #define SDRAM_BANK_SIZE (2UL << 30)
-#ifndef CONFIG_SPL_BUILD - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \ "pxefile_addr_r=0x00600000\0" \ @@ -43,5 +41,3 @@ BOOTENV
#endif - -#endif diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index ad05920ad6b1..4f24b13f500e 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -30,8 +30,6 @@ /* Physical Memory Map */ #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */
-#ifndef CONFIG_SPL_BUILD - /* Use common default */
/* Default env settings */ @@ -67,9 +65,4 @@ "bootm ${kloadaddr}\0" \ ""
-#ifndef CONFIG_RESTORE_FLASH -/* set to negative value for no autoboot */ -#endif -#endif /* CONFIG_SPL_BUILD */ - #endif /* ! __CONFIG_PXM2_H */ diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index f3e16e55966d..a81c503d9fd1 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -21,7 +21,6 @@
/* Environment options */
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(QEMU, qemu, na) \ func(VIRTIO, virtio, 0) \ @@ -50,6 +49,5 @@ "pxefile_addr_r=0x8c200000\0" \ "ramdisk_addr_r=0x8c300000\0" \ BOOTENV -#endif
#endif /* __CONFIG_H */ diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 6c942a809809..5de980ddc00a 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -40,8 +40,6 @@ /* Define own nand partitions */ #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
-#ifndef CONFIG_SPL_BUILD - /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hostname=rastaban\0" \ @@ -53,8 +51,4 @@ CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_NAND_V2
-#ifndef CONFIG_RESTORE_FLASH -/* set to negative value for no autoboot */ -#endif -#endif /* CONFIG_SPL_BUILD */ #endif /* ! __CONFIG_RASTABAN_H */ diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 2f3260e449c1..ac57721f0214 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -17,8 +17,6 @@ #define SDRAM_BANK_SIZE (512UL << 20UL) #define SDRAM_MAX_SIZE (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE)
-#ifndef CONFIG_SPL_BUILD - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ @@ -36,6 +34,5 @@ "partitions=" PARTS_DEFAULT \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV -#endif
#endif diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h index 41e0d18f88c6..9297184bded8 100644 --- a/include/configs/rk3066_common.h +++ b/include/configs/rk3066_common.h @@ -15,8 +15,6 @@ #define SDRAM_BANK_SIZE (1024UL << 20UL) #define SDRAM_MAX_SIZE CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE
-#ifndef CONFIG_SPL_BUILD - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ @@ -34,6 +32,4 @@ ROCKCHIP_DEVICE_SETTINGS \ BOOTENV
-#endif /* CONFIG_SPL_BUILD */ - #endif diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 5c60d119f995..f3e0eefb9a21 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -22,8 +22,6 @@ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
-#ifndef CONFIG_SPL_BUILD - /* usb mass storage */
#define ENV_MEM_LAYOUT_SETTINGS \ @@ -41,5 +39,3 @@ BOOTENV
#endif - -#endif diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index c1d66845412f..56fba3ff2578 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -19,7 +19,6 @@ #define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_MAX_SIZE 0x80000000
-#ifndef CONFIG_SPL_BUILD /* usb otg */
/* usb host support */ @@ -43,6 +42,4 @@ ROCKCHIP_DEVICE_SETTINGS \ BOOTENV
-#endif /* CONFIG_SPL_BUILD */ - #endif diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index dd1a207aed33..c3279b84d3a4 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -20,8 +20,6 @@ #define SDRAM_BANK_SIZE (512UL << 20UL) #define SDRAM_MAX_SIZE 0x80000000
-#ifndef CONFIG_SPL_BUILD - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ @@ -39,6 +37,5 @@ "partitions=" PARTS_DEFAULT \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV -#endif
#endif diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 844c154217bd..18f4289d29ab 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -23,8 +23,6 @@
#define CONFIG_SYS_MONITOR_LEN (600 * 1024)
-#ifndef CONFIG_SPL_BUILD - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00000000\0" \ "pxefile_addr_r=0x00100000\0" \ @@ -44,6 +42,5 @@ ENV_MEM_LAYOUT_SETTINGS \ ROCKCHIP_DEVICE_SETTINGS \ BOOTENV -#endif
#endif diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index 169cf2ac9c1f..d5aadd5fa803 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -20,8 +20,6 @@ #define SDRAM_MAX_SIZE 0xff000000 #define SDRAM_BANK_SIZE (2UL << 30)
-#ifndef CONFIG_SPL_BUILD - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \ "pxefile_addr_r=0x00600000\0" \ @@ -37,5 +35,3 @@ BOOTENV
#endif - -#endif diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 9cdc9004a91f..90183579202d 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -16,8 +16,6 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000
-#ifndef CONFIG_SPL_BUILD - #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \ "pxefile_addr_r=0x00600000\0" \ @@ -32,8 +30,6 @@ "partitions=" PARTS_DEFAULT \ BOOTENV
-#endif - /* rockchip ohci host driver */ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index ac8818868245..4db4026ebe56 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -18,7 +18,6 @@
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
-#ifndef CONFIG_SPL_BUILD #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \ "pxefile_addr_r=0x00600000\0" \ @@ -34,5 +33,3 @@ BOOTENV
#endif - -#endif diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h index f9c7c23cd9ab..ef4f725b5793 100644 --- a/include/configs/rk3568_common.h +++ b/include/configs/rk3568_common.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xf0000000
-#ifndef CONFIG_SPL_BUILD #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00c00000\0" \ "pxefile_addr_r=0x00e00000\0" \ @@ -30,6 +29,5 @@ "partitions=" PARTS_DEFAULT \ ROCKCHIP_DEVICE_SETTINGS \ BOOTENV -#endif
#endif diff --git a/include/configs/rut.h b/include/configs/rut.h index fc3194654ae3..ac48372b6c0b 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -24,8 +24,6 @@ /* Watchdog */ #define WATCHDOG_TRIGGER_GPIO 14
-#ifndef CONFIG_SPL_BUILD - /* Use common default */
/* Default env settings */ @@ -59,10 +57,4 @@ "bootm ${kloadaddr}\0" \ ""
-#ifndef CONFIG_RESTORE_FLASH -/* set to negative value for no autoboot */ -#endif - -#endif /* CONFIG_SPL_BUILD */ - #endif /* ! __CONFIG_RUT_H */ diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index f088f0e7a0c1..d8de9c25df2b 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -20,9 +20,7 @@ /* rockchip ohci host driver */ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 -#endif
-#ifndef CONFIG_SPL_BUILD #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "fdt_addr_r=0x61f00000\0" \ @@ -35,4 +33,5 @@ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ BOOTENV + #endif diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index c22b74f707ef..5168e2fa3531 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -6,9 +6,7 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#ifndef CONFIG_SPL_BUILD #define CONFIG_IO_TRACE -#endif
#define CONFIG_MALLOC_F_ADDR 0x0010000
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 941e02c5c68d..db8ff848285a 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -17,9 +17,7 @@
/* commands to include */
-#ifndef CONFIG_SPL_BUILD #define CONFIG_ROOTPATH "/opt/eldk" -#endif
#define CONFIG_SYS_AUTOLOAD "yes"
@@ -81,16 +79,12 @@ * we don't need to do it twice. */
-#ifndef CONFIG_SPL_BUILD - /* USB DRACO ID as default */ #define CONFIG_USBD_HS
/* USB Device Firmware Update support */ #define DFU_MANIFEST_POLL_TIMEOUT 25000
-#endif /* CONFIG_SPL_BUILD */ - /* * Default to using SPI for environment, etc. We have multiple copies * of SPL as the ROM will check these locations. diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h index 4442fc29e316..a99d143485c4 100644 --- a/include/configs/sifive-unleashed.h +++ b/include/configs/sifive-unleashed.h @@ -24,7 +24,6 @@
/* Environment options */
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(SF, sf, 0) \ @@ -61,6 +60,5 @@ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ BOOTENV \ BOOTENV_SF -#endif
#endif /* __CONFIG_H */ diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index f5a341c84496..680caac377bc 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -19,7 +19,6 @@
/* Environment options */
-#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(NVME, nvme, 0) \ func(USB, usb, 0) \ @@ -53,7 +52,6 @@ "partitions=" PARTS_DEFAULT "\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ BOOTENV -#endif /* CONFIG_SPL_BUILD */
#define CONFIG_SYS_EEPROM_BUS_NUM 0
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index cde6abc62611..458d22d61f48 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -69,7 +69,6 @@ #define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS
-#if !defined(CONFIG_SPL_BUILD) /* USB configuration */ #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_PLLB @@ -85,7 +84,6 @@
/* DFU class support */ #define DFU_MANIFEST_POLL_TIMEOUT 25000 -#endif
/* General Boot Parameter */
diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index b71f8bab156f..c388ae9a816c 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -34,21 +34,6 @@ * U-Boot environment configurations */
-/* - * QSPI support - */ - #ifdef CONFIG_CADENCE_QSPI -/* Enable it if you want to use dual-stacked mode */ -/*#define CONFIG_QSPI_RBF_ADDR 0x720000*/ - -/* Flash device info */ - -#ifndef CONFIG_SPL_BUILD -#define MTDIDS_DEFAULT "nor0=ff705000.spi.0" -#endif /* CONFIG_SPL_BUILD */ - -#endif /* CONFIG_CADENCE_QSPI */ - /* * Environment variable */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 327bf98ddb23..1f77b7b2dfde 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -125,8 +125,6 @@ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 #endif
-#ifndef CONFIG_SPL_BUILD - #ifdef CONFIG_ARM64 /* * Boards seem to come with at least 512MB of DRAM. @@ -372,8 +370,4 @@ BOOTCMD_SUNXI_COMPAT \ BOOTENV
-#else /* ifndef CONFIG_SPL_BUILD */ -#define CONFIG_EXTRA_ENV_SETTINGS -#endif - #endif /* _SUNXI_COMMON_CONFIG_H */ diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 5b862f4f2ee9..63d897d090af 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -60,7 +60,6 @@ 0xf0, 0xa3, 0x83, 0x87, 0xe6, 0x30)
/* Distro boot settings */ -#ifndef CONFIG_SPL_BUILD #ifdef CONFIG_CMD_USB #define BOOT_TARGET_DEVICE_USB(func) func(USB, usb, 0) #else @@ -92,9 +91,6 @@ BOOT_TARGET_DEVICE_NVME(func) \
#include <config_distro_bootcmd.h> -#else /* CONFIG_SPL_BUILD */ -#define BOOTENV -#endif
#define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_addr_r=0x9fe00000\0" \ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index b9285e8cabad..798d72d8e26b 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -84,13 +84,8 @@ /* SPI EEPROM */ #define TAURUS_SPI_MASK (1 << 4)
-#if defined(CONFIG_SPL_BUILD) -/* SPL related */ -#endif - /* bootstrap in spi flash , u-boot + env + linux in nandflash */
-#ifndef CONFIG_SPL_BUILD #if defined(CONFIG_BOARD_AXM) #define CONFIG_EXTRA_ENV_SETTINGS \ "addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \ @@ -139,7 +134,6 @@ "stdout=serial\0" \ "upgrade_available=0\0" #endif -#endif /* #ifndef CONFIG_SPL_BUILD */
/* Defines for SPL */
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 755a41fef7e2..c8f9d7cb175c 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -9,8 +9,6 @@
#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */
-#ifndef CONFIG_SPL_BUILD - #if CONFIG_IS_ENABLED(CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else @@ -26,9 +24,6 @@ func(DHCP, dhcp, na) #endif #include <config_distro_bootcmd.h> -#else -#define BOOTENV -#endif
#ifdef CONFIG_TEGRA_KEYBOARD #define STDIN_KBD_KBC ",tegra-kbc" diff --git a/include/configs/thuban.h b/include/configs/thuban.h index bb0b9fa1560d..fd903537ae5e 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -33,8 +33,6 @@ /* Define own nand partitions */ #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
-#ifndef CONFIG_SPL_BUILD - /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hostname=thuban\0" \ @@ -46,8 +44,4 @@ CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_NAND_V2
-#ifndef CONFIG_RESTORE_FLASH -/* set to negative value for no autoboot */ -#endif -#endif /* CONFIG_SPL_BUILD */ #endif /* ! __CONFIG_THUBAN_H */ diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 5d8c45af2fa0..fcf282bc4c18 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -47,9 +47,7 @@ #endif
/* TWL6030 */ -#ifndef CONFIG_SPL_BUILD #define CONFIG_TWL6030_POWER 1 -#endif
/* * Environment setup diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 2bb9e59b9462..8096b2c89603 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -10,7 +10,6 @@ #ifndef __CONFIG_UNIPHIER_H__ #define __CONFIG_UNIPHIER_H__
-#ifndef CONFIG_SPL_BUILD #include <config_distro_bootcmd.h>
#ifdef CONFIG_CMD_MMC @@ -35,9 +34,6 @@ BOOT_TARGET_DEVICE_MMC(func) \ BOOT_TARGET_DEVICE_UBIFS(func) \ BOOT_TARGET_DEVICE_USB(func) -#else -#define BOOTENV -#endif
#define CONFIG_SYS_MONITOR_LEN 0x00200000 /* 2MB */
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 846d6566a55a..0192a4fe06cb 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -27,15 +27,11 @@ "scriptaddr=0x46000000\0"
/* Enable Distro Boot */ -#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#else -#define BOOTENV -#endif
/* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 2bbe2b72e0a7..beec393a3997 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -39,15 +39,11 @@ "scriptaddr=0x46000000\0"
/* Enable Distro Boot */ -#ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#else -#define BOOTENV -#endif
#if defined(CONFIG_TDX_EASY_INSTALLER) # define BOOT_SCRIPT "boot-tezi.scr" diff --git a/include/configs/x530.h b/include/configs/x530.h index d8fc3c13d062..1f1b4e1449eb 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -48,9 +48,7 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */ -#ifndef CONFIG_SPL_BUILD #define CONFIG_PCI_SCAN_SHOW -#endif
/* NAND */
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index bfd622bb0289..20515b4e26ac 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -37,13 +37,11 @@ #define DFU_DEFAULT_POLL_TIMEOUT 300 #define CONFIG_THOR_RESET_OFF
-#ifndef CONFIG_SPL_BUILD # define PARTS_DEFAULT \ "partitions=uuid_disk=${uuid_gpt_disk};" \ "name=""boot"",size=16M,uuid=${uuid_gpt_boot};" \ "name=""Linux"",size=-M,uuid=${uuid_gpt_Linux}\0" #endif -#endif
#if !defined(PARTS_DEFAULT) # define PARTS_DEFAULT