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>

diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h
index 2cf77a67c0c2fced2c560e7ca7d1e240c9235cf0..8d36ddeba596bc351638f40e1a725dd745fa6887 100644 (file)
--- 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 a57d551bcf172972454de19f41b3dbfc0d1eaec7..79d9d03a176bc5fdda0cd5e53823b576633e4ce7 100644 (file)
--- 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 5db8b2be2cb83efadc208f367ed4cebfc2f35721..7767fce4050e6e8a2b44330af945ca1ba28ce65b 100644 (file)
--- 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 7b43741fde7c857370065f926ecda804a8bc23f5..1abda0836ab6dbd2bd31e62fcf50129766867c49 100644 (file)
--- 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 12a4048a511c0eb2ece3a4d333ce1a4754345047..440571a799e5881540265877aba502e4de8986ba 100644 (file)
--- 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 f1e6dbf613583c39bde8c04374ec7a2e48a9be9c..eccf16fdb7a147049ff6fdca5867c2754f94869a 100644 (file)
--- 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 d34d69778f1ba5399fa73d53d69823747cfa5dfb..b4e8d73db05ab89afaee1e1dcdf5c8ab09e71496 100644 (file)
--- 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 456d1828d6297e4bcdb836d4fba64982b88d7603..6b1e82ad3b17e04ad3388643a32530975899bb8e 100644 (file)
--- 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 8497fe28effe3ac2c56f53a3be1a1ef63fb50442..af04352eda3b8a2cd5f8534ba7ea7d997ed0a576 100644 (file)
--- 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 fbe1e35e001affe97f29228005539a49291ae150..02935430c25ec1dc545b8c1c7e0eed33b7ca838a 100644 (file)
--- 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 b3ccc3cac3dac576204be4c1034faa69730e9401..b2bec10960aa56a3c994539da26b28ca0381f0b9 100644 (file)
--- 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 f62a3f6688ed13e1aa938c12f19550c6f4a04fb3..0d8922bc3f83de33061a3b01eccb8c1f96bdf43e 100644 (file)
--- 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 d1bea54b207ea550ec35744849d94a7c17130b09..bb1595f96111015f1d114c685f4d00317c8538e7 100644 (file)
--- 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 71ebca587d143f780f1707544ea4b2727c411feb..1f6ac8d28adf52ea7cae38ba0c99c1e0247d223e 100644 (file)
--- 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 3c442018ab1d1a2bb92bd3c268e66e2f4ce8d298..6912f39d32d2d3d47dd3418e59b2cc09d2dad110 100644 (file)
--- 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 6b2edbb1e0d3aaf6c702bb4caf406bc9506402c9..3b3a7abd281f1f75ed5cf2d8e2e96fb22b72d01a 100644 (file)
--- 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 b4cfa61d4e7540633ad82129cf0fcde58a8f8e27..da6514b64fc91522f0c48c0a384c97220b325e17 100644 (file)
--- 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 6fe45a86dcc05e18cb721739ee20c38f51d1f37c..0c0abe6023e8b695a07e51447f3649008aa2fb70 100644 (file)
--- 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 b4998f5c2e56c6683349829cfc68fe41ffb6efd4..21367f0a6f5eeffdbc1322890fb601f530db619a 100644 (file)
--- 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 e3940dc3217ca5fa19f14480a710fe5f3226ded4..705146d04f76bab4a22f5139aecfa0fd040a30f3 100644 (file)
--- 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 7fa1a4ebf020c34d2a9fad9a60b30093838db494..7e3f657e31cc8734e822f0e1859d6ddfe12affe1 100644 (file)
--- 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 23eb0d4375df0003526fcf05ac64671c24771803..cae20073584c849e69cd153964146b3c62ea43c4 100644 (file)
--- 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 2707ae6440679c1c9602e9f80deb1b23a962b102..0bae238a4b0393c7d71696582ad5672913f145b4 100644 (file)
--- 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 282b295497c7d6ecf0e2c1ae54664d2f81575f34..5392569a556a70ce28e5b2d95bad7afccb4bb5ac 100644 (file)
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -38,8 +38,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"                                                 \
@@ -105,5 +103,3 @@
                "fi"
 
 #endif
-
-#endif

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index e4b2544410b76bb03339bda668f177d6e0c1aad4..227e9649f53bd100512007148c50ea4a7fd622bd 100644 (file)
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -22,14 +22,12 @@
 
 #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 dfe6966c46211d2cda70454fbbd66981050af752..ec4aea337c93e68cf5e1e255f1f4b71f0001a0ee 100644 (file)
--- a/include/configs/imx8mm_icore_mx8mm.h
+++ b/include/configs/imx8mm_icore_mx8mm.h
@@ -20,14 +20,10 @@
 /* For RAW image gives a error info not panic */
 #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 8a6cc69b5ebf5d01817f5abba17ca852ade260aa..cfcad110c716b75777e4da2e26f92d2d762d42f1 100644 (file)
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -28,7 +28,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) \
@@ -36,9 +35,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 1396ae1422ece359197ea1aea923441473c6fb36..9de31cfe81c9bea2969f1d6c2c9343cfc0b89fd3 100644 (file)
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -16,19 +16,12 @@
 #define CONFIG_SYS_UBOOT_BASE  \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
-#ifdef CONFIG_SPL_BUILD
-/* For RAW image gives a error info not panic */
-
-#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 */
 /* see include/configs/ti_armv7_common.h */

diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index 8ef55aa6eba38ffde3ace0193d0f4c3e8f33029f..adac387fac92f3f867f15bbd52e213c5ef90631b 100644 (file)
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -25,16 +25,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 79db625d03737d42256f0acf6aba0d0476128735..797ea0c7fad20e0c06a3cbe7f062ff9c44c29e1d 100644 (file)
--- 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 618010db9fbe1f7edbec1811575ea1dba3048c0f..f161cffb97160917e458c7af048a9d42ed0574aa 100644 (file)
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -32,13 +32,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 fce87b1657da1883514d18c5e4d02a9c893ce5d0..51fdcb7d5b19287142bc4f0e1087dad09b85c627 100644 (file)
--- a/include/configs/imx8mp_venice.h
+++ b/include/configs/imx8mp_venice.h
@@ -25,16 +25,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 a5d6adfaa4c5774eb031e57620a336eacf32f660..f7a254359c9be7180e86ee9af5513d5c63d442aa 100644 (file)
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -26,14 +26,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 182f45bb74d9e8b6b7f1b0a3cb90cd0e55d1dd81..43328082edc6cbeb814f49b8db0f7f817cb2cc1e 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -32,14 +32,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 296bcd4c7b7b696ea585eefa0e3ffa2c372454eb..d379bad0b1548a7df79ccc17bcba66be248a3a07 100644 (file)
--- 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 d04684955d3c30cdde9045192bfd957add64fbaf..7b5e57734644e96d367b90ace0104a6610d21e37 100644 (file)
--- 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 e28bfb88ff07b7196b00dffadaf9633e5e23811f..a8468229f69e1b646cca174e06fa6e9c64ce7870 100644 (file)
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -36,7 +36,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) \
@@ -46,9 +45,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 a513213c5980a95d74c2709dfdd3247678e07fe1..7b8e70e594535574186b6ab5e63508aba4b2529d 100644 (file)
--- 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 75fc03f147234805ff676d8c9eb26d2fa98695fd..fea7c835fdcb19e38180079a6413d3890850d0ed 100644 (file)
--- 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 1d8d9485e7435af7528c94ece920fc061ea431ac..19201a735f0aaf56fca2d719dd3299d022459f3b 100644 (file)
--- 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 cb79d6362fcbcd0c269ca997484d9dca22b85ff6..674bcbeb75844f24a19b9d923b515a0479681aa6 100644 (file)
--- 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 a1d23b64630dbe6b94fe85f22e9abaef90d82d1d..7f083c597e309bb70f35d3a4d61c652e0adc63c8 100644 (file)
--- 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 fe9a8fd3754e86b5c5f8de73373fde8c877abc26..6e2c048fb1285a9078e2f6b0d970d687d1e2ee8d 100644 (file)
--- 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 8e9103562eb7cddeb802e1aa646370abb510966d..e139aa93e1fc9f042fa5f27d0f5fd32f671b2374 100644 (file)
--- 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 d56d0c029474435843d7648244e00aa6c2e7ef17..e663fa0f6c7d44d26b09bc42e11a9871a1504bc6 100644 (file)
--- 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 f2eae073810bd99b90d5c28a886d13f891681afc..21ca4afa51ce516a4cbd89bf933611a30faf442b 100644 (file)
--- 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 c6744e970f68bd566e539acf68cf9394e8f50b1d..cffbb64bcd539fee1584ec794a1bf0834e6fbe88 100644 (file)
--- 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 a5596d98fe6845dfa8afa425b4dc1ce75c21b970..8bddc5281e5ed81302957f0ba2d02b6c638128a1 100644 (file)
--- 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 7c76290a2aeb812e40317fe6d391a211660bd2f7..6a110132a759c0879e688065ebe8f68f6f1d441d 100644 (file)
--- 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 9c67a3a77750c554571a0f89bb721f95ffaecd26..40304ba468c1f5baa30b50c55bd475fb4a217761 100644 (file)
--- 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 c1ef040ce360099184549dc82a36bde768f8d836..6be214753f1b00bf1cf1a50b2c967c19f2cee9dd 100644 (file)
--- 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 ebfba72d0da458a9be19e00caec8b6333857e4c1..d368376d20284b3fbbee372aadb202567df32cd8 100644 (file)
--- 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 7ab6a896040f708f7a42c29855fdb73ed7c28dd2..ed3201aa3c42e7379c7b232e88367c0851bb0cf5 100644 (file)
--- 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 11d408f19084f57c77e89d5fb7cb33f16a2df60b..647bb3d02a1b734fb6ead109736925ee9139af11 100644 (file)
--- 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 6def3691103c455e05099fce1518e4f936ca5ea6..b119465420df3070285e6668139fe0333eed1355 100644 (file)
--- 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 96dcfb420f7bfe954fefc8099ebb77408ce8a567..62ed86b29c89eefc09edd6dc359bd078ba74b8fa 100644 (file)
--- 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 ad05920ad6b10061defa0cbd4f9a375d98abbe71..4f24b13f500edd90c46ea6ee74960669d5ef0544 100644 (file)
--- 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 f3e16e55966d493b85e87f4ee2b53ee4d86ca8e6..a81c503d9fd1976168ab7c74aab8dc4c292f68ef 100644 (file)
--- 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 6c942a809809133a32c77e5cea486103ed5cebd4..5de980ddc00aae696aa2a2ab28c597af8bde1b19 100644 (file)
--- 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 2f3260e449c1c64f230038f20f252a55f5e89f8d..ac57721f02143f79f07e112be9c9fba4f06e41e8 100644 (file)
--- 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 41e0d18f88c6beca860d5400fb763835114fb818..9297184bded8b8f43494b42c49f1bdb43376f422 100644 (file)
--- 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 5c60d119f99524f906dd818bde94191804725bfa..f3e0eefb9a21452c356ff39d728f17fb55783a7b 100644 (file)
--- 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 c1d66845412f5077d35dd4eb92275c1bef708791..56fba3ff2578ae957f244a010742958e4dcc58e8 100644 (file)
--- 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 dd1a207aed33b43956f472a41cfec3e8008350ee..c3279b84d3a4f16d4a7216ebeb7f9334c3dc57e3 100644 (file)
--- 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 844c154217bd807128d4b30ff00c30776f223b37..18f4289d29ab7f71a053b648964d77b5521c9170 100644 (file)
--- 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 169cf2ac9c1f02670d0464068d5c8a2252aad875..d5aadd5fa803ebd833c384f7ad65dc038e2907c2 100644 (file)
--- 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 9cdc9004a91fcc2d35905b9cbb8a62d2437f46fc..90183579202de7d6264066ee6d12dc6f22294597 100644 (file)
--- 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 ac88188682458c3d6d603891a2c6cecb0cba86b2..4db4026ebe5661dd36b34f3d147cec4e70ed8ce5 100644 (file)
--- 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 f9c7c23cd9ab8deda49eb34f5f394b66063612cc..ef4f725b5793faf92aa9e617f5d57eec2f7d6a28 100644 (file)
--- 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 fc3194654ae3283767e3984284db07696eb168b2..ac48372b6c0ba2272636912075f535766b1671f4 100644 (file)
--- 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 f088f0e7a0c189d7d1bad37aaf614029640e8cb2..d8de9c25df2b10e4d9a6759df78512792b367314 100644 (file)
--- 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 c22b74f707ef4440506a0a47cb35dd5f0b754fc0..5168e2fa353121d05e71f95fa48e10bbe0010238 100644 (file)
--- 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 941e02c5c68d31bd8ba18aae48154a511ee42f8b..db8ff848285a04e4043345f74d8b81515211eea8 100644 (file)
--- 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 4442fc29e316964e400bda2377650ea0a04ce34b..a99d143485c4bc18817101f1568896e2a91e8094 100644 (file)
--- 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 f5a341c84496b517c8da5c6d161112e9f86a7c6c..680caac377bc717927a5dbf4d2df467b62ea49e1 100644 (file)
--- 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 cde6abc6261123fedc661d4ca0ee467c33e80550..458d22d61f4869976192e292e4be77e38277c15c 100644 (file)
--- 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 b71f8bab156fe1a83b29a396619117ce54cc5f56..c388ae9a816ccb51a740e12ca9eafa7f16ca584e 100644 (file)
--- 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 327bf98ddb23e06fa62dc15625b827d3bf8a9dd3..1f77b7b2dfde969efdfbfc56f1dbfcb3c5095875 100644 (file)
--- 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 5b862f4f2ee940ca3c26de38e3bb614ee25494bd..63d897d090af24edad171a5f2eb9708478585c5a 100644 (file)
--- 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 b9285e8cabad5686b8ecf16e194ae4d1fdd20eb1..798d72d8e26bfef590fb60f553d64bcbd2b96d87 100644 (file)
--- 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 755a41fef7e2f1200112f0921f94029cd2a6afd1..c8f9d7cb175c267cb78076015923e8e209884316 100644 (file)
--- 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 bb0b9fa1560db8704b1bdd7b8f83a586357bcaab..fd903537ae5e6cf31ea2ad1a8022779e29704642 100644 (file)
--- 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 5d8c45af2fa0bf974f685cfe7bc9e3c1fdaecdbd..fcf282bc4c18012e8a8da28efc0c2ea3161a15f8 100644 (file)
--- 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 2bb9e59b94621361b492bc42b74830c064d25090..8096b2c896036f047b51bc56daae9e96f616d032 100644 (file)
--- 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 0867ccad0a270a56814366ef8136550639c495e7..710321944abcee58355f3edfc8336035e4a262f3 100644 (file)
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -28,15 +28,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 9ad24e82dbeaa9574bcc77bc0a5d083c48543cfb..0de249aa96b20cb9086cd7c58843ec9aa61ea026 100644 (file)
--- a/include/configs/verdin-imx8mp.h
+++ b/include/configs/verdin-imx8mp.h
@@ -40,15 +40,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 d8fc3c13d062e30b4ecac246ec5636d874cf56b1..1f1b4e1449eb830e0ea1d30a0850c925ef8051d7 100644 (file)
--- 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 bfd622bb02899a5478e9dd27cb94aa7b1f84f71e..20515b4e26ac973839a7c9248efaa0ac976f68f2 100644 (file)
--- 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