random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Globally remove most CONFIG_SPL_BUILD tests from config headers

Browse Source 
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>
This commit is contained in:
Tom Rini 2022-06-10 22:59:38 -04:00
parent de47ff5363
commit 910feb50d4
88 changed files with 2 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/configs/am335x_igep003x.h
View File

@ -20,7 +20,6 @@
#define V_OSCK 24000000 /* Clock output from T2 */ #define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK) #define V_SCLK (V_OSCK)
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \ DEFAULT_LINUX_BOOT_ENV \
"bootdir=/boot\0" \ "bootdir=/boot\0" \
@ -89,7 +88,6 @@
"setenv fdtfile am335x-igep-base0040-lite.dtb; fi; " \ "setenv fdtfile am335x-igep-base0040-lite.dtb; fi; " \
"if test ${fdtfile} = ''; then " \ "if test ${fdtfile} = ''; then " \
"echo WARNING: Could not determine device tree to use; fi; \0" "echo WARNING: Could not determine device tree to use; fi; \0"
#endif
/* NS16550 Configuration */ /* NS16550 Configuration */
#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */

4
include/configs/am335x_sl50.h
View File

@ -16,8 +16,6 @@
#define V_OSCK 24000000 /* Clock output from T2 */ #define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK) #define V_SCLK (V_OSCK)
#ifndef CONFIG_SPL_BUILD
#define MEM_LAYOUT_ENV_SETTINGS \ #define MEM_LAYOUT_ENV_SETTINGS \
"scriptaddr=0x80000000\0" \ "scriptaddr=0x80000000\0" \
"pxefile_addr_r=0x80100000\0" \ "pxefile_addr_r=0x80100000\0" \
@ -39,8 +37,6 @@
MEM_LAYOUT_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \
BOOTENV BOOTENV
#endif
/* NS16550 Configuration */ /* NS16550 Configuration */
#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */

4
include/configs/apalis_imx6.h
View File

@ -48,7 +48,6 @@
#undef CONFIG_SERVERIP #undef CONFIG_SERVERIP
#define CONFIG_SERVERIP 192.168.10.1 #define CONFIG_SERVERIP 192.168.10.1
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
@ -58,9 +57,6 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#undef BOOTENV_RUN_NET_USB_START #undef BOOTENV_RUN_NET_USB_START
#define BOOTENV_RUN_NET_USB_START "" #define BOOTENV_RUN_NET_USB_START ""
#else /* CONFIG_SPL_BUILD */
#define BOOTENV
#endif /* CONFIG_SPL_BUILD */
#define UBOOT_UPDATE \ #define UBOOT_UPDATE \
"uboot_hwpart=1\0" \ "uboot_hwpart=1\0" \

2
include/configs/baltos.h
View File

@ -52,7 +52,6 @@
#define NANDARGS "" #define NANDARGS ""
#endif #endif
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \ DEFAULT_LINUX_BOOT_ENV \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
@ -183,7 +182,6 @@
"findfdt=setenv fdtfile am335x-baltos.dtb\0" \ "findfdt=setenv fdtfile am335x-baltos.dtb\0" \
NANDARGS NANDARGS
/*DFUARGS*/ /*DFUARGS*/
#endif
/* NS16550 Configuration */ /* NS16550 Configuration */
#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */

2
include/configs/brppt1.h
View File

@ -99,7 +99,6 @@ MMCSPI_TGTS \
#define LOAD_OFFSET(x) 0x8##x #define LOAD_OFFSET(x) 0x8##x
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
BUR_COMMON_ENV \ BUR_COMMON_ENV \
"verify=no\0" \ "verify=no\0" \
@ -123,7 +122,6 @@ NANDTGTS \
"b_default=run b_deftgts; for target in ${b_tgts};"\ "b_default=run b_deftgts; for target in ${b_tgts};"\
" do echo \"### booting ${target} ###\"; run b_${target};" \ " do echo \"### booting ${target} ###\"; run b_${target};" \
" if test ${b_break} = 1; then; exit; fi; done\0" " if test ${b_break} = 1; then; exit; fi; done\0"
#endif /* !CONFIG_SPL_BUILD*/
#ifdef CONFIG_MTD_RAW_NAND #ifdef CONFIG_MTD_RAW_NAND
/* /*

3
include/configs/brsmarc1.h
View File

@ -24,8 +24,6 @@
#define V_OSCK 26000000 /* Clock output from T2 */ #define V_OSCK 26000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK) #define V_SCLK (V_OSCK)
#ifndef CONFIG_SPL_BUILD
/* Default environment */ /* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
BUR_COMMON_ENV \ BUR_COMMON_ENV \
@ -56,7 +54,6 @@ BUR_COMMON_ENV \
" fdt boardsetup\0" \ " fdt boardsetup\0" \
"startsys=run vxargs && mw 0x80001100 0 && run vxfdt &&" \ "startsys=run vxargs && mw 0x80001100 0 && run vxfdt &&" \
" bootm ${loadaddr} - ${dtbaddr}\0" " bootm ${loadaddr} - ${dtbaddr}\0"
#endif /* !CONFIG_SPL_BUILD*/
/* SPI Flash */ /* SPI Flash */

3
include/configs/brxre1.h
View File

@ -23,8 +23,6 @@
#define V_OSCK 26000000 /* Clock output from T2 */ #define V_OSCK 26000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK) #define V_SCLK (V_OSCK)
#ifndef CONFIG_SPL_BUILD
/* Default environment */ /* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
BUR_COMMON_ENV \ BUR_COMMON_ENV \
@ -51,7 +49,6 @@ BUR_COMMON_ENV \
"b_usb0=usb start && load usb 0 ${scradr} usbscript.img && source ${scradr}\0" \ "b_usb0=usb start && load usb 0 ${scradr} usbscript.img && source ${scradr}\0" \
"b_default=run b_deftgts; for target in ${b_tgts};"\ "b_default=run b_deftgts; for target in ${b_tgts};"\
" do run b_${target}; if test ${b_break} = 1; then; exit; fi; done\0" " do run b_${target}; if test ${b_break} = 1; then; exit; fi; done\0"
#endif /* !CONFIG_SPL_BUILD*/
/* Environment */ /* Environment */

3
include/configs/capricorn-common.h
View File

@ -25,15 +25,12 @@
#define CONFIG_FEC_ENET_DEV 1 #define CONFIG_FEC_ENET_DEV 1
#define CONFIG_FEC_MXC_PHYADDR 0x0 #define CONFIG_FEC_MXC_PHYADDR 0x0
/* I2C Configuration */
#ifndef CONFIG_SPL_BUILD
/* EEPROM */ /* EEPROM */
#define EEPROM_I2C_BUS 0 /* I2C0 */ #define EEPROM_I2C_BUS 0 /* I2C0 */
#define EEPROM_I2C_ADDR 0x50 #define EEPROM_I2C_ADDR 0x50
/* PCA9552 */ /* PCA9552 */
#define PCA9552_1_I2C_BUS 1 /* I2C1 */ #define PCA9552_1_I2C_BUS 1 /* I2C1 */
#define PCA9552_1_I2C_ADDR 0x60 #define PCA9552_1_I2C_ADDR 0x60
#endif /* !CONFIG_SPL_BUILD */
/* AHAB */ /* AHAB */
#ifdef CONFIG_AHAB_BOOT #ifdef CONFIG_AHAB_BOOT

6
include/configs/clearfog.h
View File

@ -31,9 +31,7 @@
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */ /* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_SCAN_SHOW #define CONFIG_PCI_SCAN_SHOW
#endif
/* Keep device tree and initrd in lower memory so the kernel can access them */ /* Keep device tree and initrd in lower memory so the kernel can access them */
#define RELOCATION_LIMITS_ENV_SETTINGS \ #define RELOCATION_LIMITS_ENV_SETTINGS \
@ -47,8 +45,6 @@
#include "mv-common.h" #include "mv-common.h"
/* Include the common distro boot environment */ /* Include the common distro boot environment */
#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_MMC #ifdef CONFIG_MMC
#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) #define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
#else #else
@ -125,6 +121,4 @@
"console=ttyS0,115200\0" \ "console=ttyS0,115200\0" \
BOOTENV BOOTENV
#endif /* CONFIG_SPL_BUILD */
#endif /* _CONFIG_CLEARFOG_H */ #endif /* _CONFIG_CLEARFOG_H */

6
include/configs/cm_fx6.h
View File

@ -30,7 +30,6 @@
/* Environment */ /* Environment */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
@ -130,16 +129,11 @@
func(SATA, sata, 0) func(SATA, sata, 0)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else
#define CONFIG_EXTRA_ENV_SETTINGS
#endif
/* NAND */ /* NAND */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_BASE 0x40000000
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
/* APBH DMA is required for NAND support */ /* APBH DMA is required for NAND support */
#endif
/* Ethernet */ /* Ethernet */
#define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_FEC_MXC_PHYADDR 0

4
include/configs/cm_t335.h
View File

@ -19,7 +19,6 @@
#define V_OSCK 25000000 /* Clock output from T2 */ #define V_OSCK 25000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK) #define V_SCLK (V_OSCK)
#ifndef CONFIG_SPL_BUILD
#define MMCARGS \ #define MMCARGS \
"mmcdev=0\0" \ "mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \ "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
@ -55,7 +54,6 @@
"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
MMCARGS \ MMCARGS \
NANDARGS NANDARGS
#endif /* CONFIG_SPL_BUILD */
#define CONFIG_SYS_AUTOLOAD "no" #define CONFIG_SYS_AUTOLOAD "no"
@ -95,7 +93,6 @@
/* EEPROM */ /* EEPROM */
#ifndef CONFIG_SPL_BUILD
/* /*
* Enable PCA9555 at I2C0-0x26. * Enable PCA9555 at I2C0-0x26.
* First select the I2C0 bus with "i2c dev 0", then use "pca953x" command. * First select the I2C0 bus with "i2c dev 0", then use "pca953x" command.
@ -103,6 +100,5 @@
#define CONFIG_PCA953X #define CONFIG_PCA953X
#define CONFIG_SYS_I2C_PCA953X_ADDR 0x26 #define CONFIG_SYS_I2C_PCA953X_ADDR 0x26
#define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x26, 16} } #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x26, 16} }
#endif /* CONFIG_SPL_BUILD */
#endif /* __CONFIG_CM_T335_H */ #endif /* __CONFIG_CM_T335_H */

4
include/configs/colibri_imx6.h
View File

@ -45,7 +45,6 @@
#undef CONFIG_SERVERIP #undef CONFIG_SERVERIP
#define CONFIG_SERVERIP 192.168.10.1 #define CONFIG_SERVERIP 192.168.10.1
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
@ -54,9 +53,6 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#undef BOOTENV_RUN_NET_USB_START #undef BOOTENV_RUN_NET_USB_START
#define BOOTENV_RUN_NET_USB_START "" #define BOOTENV_RUN_NET_USB_START ""
#else /* CONFIG_SPL_BUILD */
#define BOOTENV
#endif /* CONFIG_SPL_BUILD */
#define UBOOT_UPDATE \ #define UBOOT_UPDATE \
"uboot_hwpart=1\0" \ "uboot_hwpart=1\0" \

2
include/configs/controlcenterdc.h
View File

@ -18,9 +18,7 @@
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */ /* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_SCAN_SHOW #define CONFIG_PCI_SCAN_SHOW
#endif
/* /*
* Environment Configuration * Environment Configuration

2
include/configs/da850evm.h
View File

@ -101,9 +101,7 @@
/* /*
* I2C Configuration * I2C Configuration
*/ */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20 #define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20
#endif
/* /*
* Flash & Environment * Flash & Environment

2
include/configs/db-88f6820-amc.h
View File

@ -15,9 +15,7 @@
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */ /* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_SCAN_SHOW #define CONFIG_PCI_SCAN_SHOW
#endif
/* NAND */ /* NAND */

2
include/configs/db-88f6820-gp.h
View File

@ -18,9 +18,7 @@
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */ /* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_SCAN_SHOW #define CONFIG_PCI_SCAN_SHOW
#endif
/* Keep device tree and initrd in lower memory so the kernel can access them */ /* Keep device tree and initrd in lower memory so the kernel can access them */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

2
include/configs/db-mv784mp-gp.h
View File

@ -23,9 +23,7 @@
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */ /* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_SCAN_SHOW #define CONFIG_PCI_SCAN_SHOW
#endif
/* NAND */ /* NAND */

2
include/configs/dh_imx6.h
View File

@ -52,7 +52,6 @@
#endif #endif
#endif #endif
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200\0" \ "console=ttymxc0,115200\0" \
"fdt_addr=0x18000000\0" \ "fdt_addr=0x18000000\0" \
@ -77,7 +76,6 @@
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
/* Physical Memory Map */ /* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR

6
include/configs/draco.h
View File

@ -30,8 +30,6 @@
/* Define own nand partitions */ /* Define own nand partitions */
#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE) #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
#ifndef CONFIG_SPL_BUILD
/* Default env settings */ /* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"hostname=draco\0" \ "hostname=draco\0" \
@ -43,8 +41,4 @@
CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_V2 \
CONFIG_ENV_SETTINGS_NAND_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 */ #endif /* ! __CONFIG_DRACO_H */

2
include/configs/dragonboard820c.h
View File

@ -22,9 +22,7 @@
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_SYS_BOOTM_LEN SZ_64M
#ifndef CONFIG_SPL_BUILD
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) func(MMC, mmc, 0)

2
include/configs/ds414.h
View File

@ -20,9 +20,7 @@
#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE #define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
/* PCIe support */ /* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_SCAN_SHOW #define CONFIG_PCI_SCAN_SHOW
#endif
/* /*
* mv-common.h should be defined after CMD configs since it used them * mv-common.h should be defined after CMD configs since it used them

6
include/configs/helios4.h
View File

@ -31,9 +31,7 @@
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */ /* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_SCAN_SHOW #define CONFIG_PCI_SCAN_SHOW
#endif
/* Keep device tree and initrd in lower memory so the kernel can access them */ /* Keep device tree and initrd in lower memory so the kernel can access them */
#define RELOCATION_LIMITS_ENV_SETTINGS \ #define RELOCATION_LIMITS_ENV_SETTINGS \
@ -47,8 +45,6 @@
#include "mv-common.h" #include "mv-common.h"
/* Include the common distro boot environment */ /* Include the common distro boot environment */
#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_MMC #ifdef CONFIG_MMC
#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) #define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
#else #else
@ -126,6 +122,4 @@
"console=ttyS0,115200\0" \ "console=ttyS0,115200\0" \
BOOTENV BOOTENV
#endif /* CONFIG_SPL_BUILD */
#endif /* _CONFIG_HELIOS4_H */ #endif /* _CONFIG_HELIOS4_H */

2
include/configs/imx6dl-mamoj.h
View File

@ -20,7 +20,6 @@
/* Environment in MMC */ /* Environment in MMC */
#endif #endif
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"scriptaddr=0x14000000\0" \ "scriptaddr=0x14000000\0" \
"fdt_addr_r=0x13000000\0" \ "fdt_addr_r=0x13000000\0" \
@ -34,7 +33,6 @@
func(MMC, mmc, 2) func(MMC, mmc, 2)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
/* UART */ /* UART */
#define CONFIG_MXC_UART_BASE UART3_BASE #define CONFIG_MXC_UART_BASE UART3_BASE

4
include/configs/imx8mm_data_modul_edm_sbc.h
View File

@ -38,8 +38,6 @@
#define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
#if !defined(CONFIG_SPL_BUILD)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"altbootcmd=setenv devpart 2 && run bootcmd ; reset\0" \ "altbootcmd=setenv devpart 2 && run bootcmd ; reset\0" \
"bootlimit=3\0" \ "bootlimit=3\0" \
@ -105,5 +103,3 @@
"fi" "fi"
#endif #endif
#endif

2
include/configs/imx8mm_evk.h
View File

@ -22,14 +22,12 @@
#endif #endif
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

4
include/configs/imx8mm_icore_mx8mm.h
View File

@ -20,14 +20,10 @@
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_SPL_BUILD */
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
func(MMC, mmc, 0) func(MMC, mmc, 0)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else
#define BOOTENV
#endif
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"fdt_addr_r=0x44000000\0" \ "fdt_addr_r=0x44000000\0" \

4
include/configs/imx8mm_venice.h
View File

@ -28,7 +28,6 @@
"kernel_comp_addr_r=0x40200000\0" "kernel_comp_addr_r=0x40200000\0"
/* Enable Distro Boot */ /* Enable Distro Boot */
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
@ -36,9 +35,6 @@
func(USB, usb, 1) \ func(USB, usb, 1) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else
#define BOOTENV
#endif
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

7
include/configs/imx8mn_evk.h
View File

@ -16,19 +16,12 @@
#define CONFIG_SYS_UBOOT_BASE \ #define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) (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) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
/* Initial environment variables */ /* Initial environment variables */
/* see include/configs/ti_armv7_common.h */ /* see include/configs/ti_armv7_common.h */

4
include/configs/imx8mn_venice.h
View File

@ -25,16 +25,12 @@
"kernel_comp_addr_r=0x40200000\0" "kernel_comp_addr_r=0x40200000\0"
/* Enable Distro Boot */ /* Enable Distro Boot */
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
func(USB, usb, 0) \ func(USB, usb, 0) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else
#define BOOTENV
#endif
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

4
include/configs/imx8mp_dhcom_pdk2.h
View File

@ -32,8 +32,6 @@
#define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
#if !defined(CONFIG_SPL_BUILD)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"altbootcmd=run bootcmd ; reset\0" \ "altbootcmd=run bootcmd ; reset\0" \
"bootlimit=3\0" \ "bootlimit=3\0" \
@ -85,5 +83,3 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif #endif
#endif

2
include/configs/imx8mp_evk.h
View File

@ -32,13 +32,11 @@
#endif #endif
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 2) func(MMC, mmc, 2)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

4
include/configs/imx8mp_venice.h
View File

@ -25,16 +25,12 @@
"kernel_comp_addr_r=0x40200000\0" "kernel_comp_addr_r=0x40200000\0"
/* Enable Distro Boot */ /* Enable Distro Boot */
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
func(USB, usb, 0) \ func(USB, usb, 0) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else
#define BOOTENV
#endif
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

2
include/configs/imx8mq_cm.h
View File

@ -26,14 +26,12 @@
/* ENET Config */ /* ENET Config */
/* ENET1 */ /* ENET1 */
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

2
include/configs/imx8mq_evk.h
View File

@ -32,14 +32,12 @@
#define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_FEC_MXC_PHYADDR 0
#endif #endif
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

4
include/configs/iot2050.h
View File

@ -21,8 +21,6 @@
#define EXTRA_ENV_IOT2050_BOARD_SETTINGS \ #define EXTRA_ENV_IOT2050_BOARD_SETTINGS \
"usb_pgood_delay=900\0" "usb_pgood_delay=900\0"
#ifndef CONFIG_SPL_BUILD
#if CONFIG_IS_ENABLED(CMD_USB) #if CONFIG_IS_ENABLED(CMD_USB)
# define BOOT_TARGET_USB(func) \ # define BOOT_TARGET_USB(func) \
func(USB, usb, 0) \ func(USB, usb, 0) \
@ -44,8 +42,6 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \ DEFAULT_LINUX_BOOT_ENV \
BOOTENV \ BOOTENV \

4
include/configs/kontron-sl-mx6ul.h
View File

@ -35,7 +35,6 @@
#endif #endif
/* Boot order for distro boot */ /* Boot order for distro boot */
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
@ -44,9 +43,6 @@
func(PXE, pxe, na) \ func(PXE, pxe, na) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else
#define BOOTENV
#endif
/* MMC Configs */ /* MMC Configs */
#ifdef CONFIG_FSL_USDHC #ifdef CONFIG_FSL_USDHC

4
include/configs/kontron-sl-mx8mm.h
View File

@ -36,7 +36,6 @@
EFI_GUID(0xd488e45a, 0x4929, 0x4b55, 0x8c, 0x14, \ EFI_GUID(0xd488e45a, 0x4929, 0x4b55, 0x8c, 0x14, \
0x86, 0xce, 0xa2, 0xcd, 0x66, 0x29) 0x86, 0xce, 0xa2, 0xcd, 0x66, 0x29)
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
@ -46,9 +45,6 @@
/* Do not try to probe USB net adapters for net boot */ /* Do not try to probe USB net adapters for net boot */
#undef BOOTENV_RUN_NET_USB_START #undef BOOTENV_RUN_NET_USB_START
#define BOOTENV_RUN_NET_USB_START #define BOOTENV_RUN_NET_USB_START
#else
#define BOOTENV
#endif
#define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_SYS_BOOTM_LEN SZ_64M

2
include/configs/kp_imx6q_tpc.h
View File

@ -26,7 +26,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */
#endif #endif
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200\0" \ "console=ttymxc0,115200\0" \
"fdt_addr=0x18000000\0" \ "fdt_addr=0x18000000\0" \
@ -87,7 +86,6 @@
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
/* Physical Memory Map */ /* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR

6
include/configs/kylin_rk3036.h
View File

@ -9,10 +9,4 @@
#include <linux/sizes.h> #include <linux/sizes.h>
#include <configs/rk3036_common.h> #include <configs/rk3036_common.h>
#ifndef CONFIG_SPL_BUILD
/* Store env in emmc */
#endif
#endif #endif

2
include/configs/ls1012a_common.h
View File

@ -36,14 +36,12 @@
#define CONFIG_HWCONFIG #define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128 #define HWCONFIG_BUFFER_SIZE 128
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(USB, usb, 0) \ func(USB, usb, 0) \
func(SCSI, scsi, 0) \ func(SCSI, scsi, 0) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

2
include/configs/ls1012afrdm.h
View File

@ -12,11 +12,9 @@
/* DDR */ /* DDR */
#define CONFIG_SYS_SDRAM_SIZE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000
#ifndef CONFIG_SPL_BUILD
#undef BOOT_TARGET_DEVICES #undef BOOT_TARGET_DEVICES
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(USB, usb, 0) func(USB, usb, 0)
#endif
#undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

2
include/configs/ls1012afrwy.h
View File

@ -19,13 +19,11 @@
/* ENV */ /* ENV */
#define CONFIG_SYS_FSL_QSPI_BASE 0x40000000 #define CONFIG_SYS_FSL_QSPI_BASE 0x40000000
#ifndef CONFIG_SPL_BUILD
#undef BOOT_TARGET_DEVICES #undef BOOT_TARGET_DEVICES
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(USB, usb, 0) \ func(USB, usb, 0) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#endif
#define CONFIG_PCIE1 /* PCIE controller 1 */ #define CONFIG_PCIE1 /* PCIE controller 1 */

2
include/configs/ls1043a_common.h
View File

@ -137,13 +137,11 @@
#define HWCONFIG_BUFFER_SIZE 128 #define HWCONFIG_BUFFER_SIZE 128
#ifndef SPL_NO_MISC #ifndef SPL_NO_MISC
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(USB, usb, 0) \ func(USB, usb, 0) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

2
include/configs/ls1046a_common.h
View File

@ -104,14 +104,12 @@
#define CONFIG_HWCONFIG #define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128 #define HWCONFIG_BUFFER_SIZE 128
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(SCSI, scsi, 0) \ func(SCSI, scsi, 0) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(USB, usb, 0) \ func(USB, usb, 0) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
#if defined(CONFIG_TARGET_LS1046AFRWY) #if defined(CONFIG_TARGET_LS1046AFRWY)
#define LS1046A_BOOT_SRC_AND_HDR\ #define LS1046A_BOOT_SRC_AND_HDR\

2
include/configs/ls1046afrwy.h
View File

@ -80,13 +80,11 @@
*/ */
#define CONFIG_SYS_FSL_QSPI_BASE 0x40000000 #define CONFIG_SYS_FSL_QSPI_BASE 0x40000000
#ifndef CONFIG_SPL_BUILD
#undef BOOT_TARGET_DEVICES #undef BOOT_TARGET_DEVICES
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(USB, usb, 0) \ func(USB, usb, 0) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#endif
/* FMan */ /* FMan */
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN

2
include/configs/ls2080aqds.h
View File

@ -410,7 +410,7 @@
"env exists secureboot && esbc_halt;" "env exists secureboot && esbc_halt;"
#endif #endif
#if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_FSL_MC_ENET)
#define CONFIG_FSL_MEMAC #define CONFIG_FSL_MEMAC
#define SGMII_CARD_PORT1_PHY_ADDR 0x1C #define SGMII_CARD_PORT1_PHY_ADDR 0x1C
#define SGMII_CARD_PORT2_PHY_ADDR 0x1d #define SGMII_CARD_PORT2_PHY_ADDR 0x1d

5
include/configs/mx6cuboxi.h
View File

@ -27,7 +27,6 @@
#define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_MXC_UART_BASE UART1_BASE
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"som_rev=undefined\0" \ "som_rev=undefined\0" \
"has_emmc=undefined\0" \ "has_emmc=undefined\0" \
@ -87,10 +86,6 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else
#define CONFIG_EXTRA_ENV_SETTINGS
#endif /* CONFIG_SPL_BUILD */
/* Physical Memory Map */ /* Physical Memory Map */
#define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR

4
include/configs/mx6sxsabresd.h
View File

@ -136,10 +136,6 @@
#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1) #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1)
#endif #endif
#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_DM_VIDEO
#define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR
#endif
#endif
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

4
include/configs/mx6ul_14x14_evk.h
View File

@ -134,10 +134,6 @@
#endif #endif
#endif #endif
#ifndef CONFIG_SPL_BUILD
#if defined(CONFIG_DM_VIDEO)
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#endif
#endif
#endif #endif

5
include/configs/novena.h
View File

@ -76,7 +76,6 @@
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP
/* Extra U-Boot environment. */ /* Extra U-Boot environment. */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
@ -147,8 +146,4 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else
#define CONFIG_EXTRA_ENV_SETTINGS
#endif /* CONFIG_SPL_BUILD */
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

4
include/configs/omap3_igep00x0.h
View File

@ -28,8 +28,6 @@
#define GPIO_IGEP00X0_BOARD_DETECTION 28 #define GPIO_IGEP00X0_BOARD_DETECTION 28
#define GPIO_IGEP00X0_REVISION_DETECTION 129 #define GPIO_IGEP00X0_REVISION_DETECTION 129
#ifndef CONFIG_SPL_BUILD
/* Environment */ /* Environment */
#define ENV_DEVICE_SETTINGS \ #define ENV_DEVICE_SETTINGS \
"stdin=serial\0" \ "stdin=serial\0" \
@ -67,8 +65,6 @@
MEM_LAYOUT_SETTINGS \ MEM_LAYOUT_SETTINGS \
BOOTENV BOOTENV
#endif
/* OneNAND config */ /* OneNAND config */
#define CONFIG_USE_ONENAND_BOARD_INIT #define CONFIG_USE_ONENAND_BOARD_INIT
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP

4
include/configs/opos6uldev.h
View File

@ -30,11 +30,7 @@
#endif #endif
/* LCD */ /* LCD */
#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_DM_VIDEO
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#endif
#endif
/* Environment is stored in the eMMC boot partition */ /* Environment is stored in the eMMC boot partition */

2
include/configs/pdu001.h
View File

@ -32,7 +32,6 @@
#define CONSOLE_DEV "ttyO5" #define CONSOLE_DEV "ttyO5"
#endif #endif
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \ DEFAULT_LINUX_BOOT_ENV \
"fdtfile=am335x-pdu001.dtb\0" \ "fdtfile=am335x-pdu001.dtb\0" \
@ -49,7 +48,6 @@
"reset;" \ "reset;" \
"fi;" \ "fi;" \
"\0" "\0"
#endif
/* NS16550 Configuration */ /* NS16550 Configuration */
#define CONFIG_SYS_NS16550_COM1 UART0_BASE #define CONFIG_SYS_NS16550_COM1 UART0_BASE

2
include/configs/pomelo.h
View File

@ -16,12 +16,10 @@
/*BOOT*/ /*BOOT*/
#define CONFIG_SYS_BOOTM_LEN 0x3c00000 #define CONFIG_SYS_BOOTM_LEN 0x3c00000
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(SCSI, scsi, 0) \ func(SCSI, scsi, 0) \
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

2
include/configs/poplar.h
View File

@ -31,9 +31,7 @@
func(USB, usb, 0) \ func(USB, usb, 0) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#ifndef CONFIG_SPL_BUILD
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"loader_mmc_blknum=0x0\0" \ "loader_mmc_blknum=0x0\0" \

4
include/configs/px30_common.h
View File

@ -24,8 +24,6 @@
#define SDRAM_MAX_SIZE 0xff000000 #define SDRAM_MAX_SIZE 0xff000000
#define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_BANK_SIZE (2UL << 30)
#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x00500000\0" \ "scriptaddr=0x00500000\0" \
"pxefile_addr_r=0x00600000\0" \ "pxefile_addr_r=0x00600000\0" \
@ -43,5 +41,3 @@
BOOTENV BOOTENV
#endif #endif
#endif

7
include/configs/pxm2.h
View File

@ -30,8 +30,6 @@
/* Physical Memory Map */ /* Physical Memory Map */
#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */ #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */
#ifndef CONFIG_SPL_BUILD
/* Use common default */ /* Use common default */
/* Default env settings */ /* Default env settings */
@ -67,9 +65,4 @@
"bootm ${kloadaddr}\0" \ "bootm ${kloadaddr}\0" \
"" ""
#ifndef CONFIG_RESTORE_FLASH
/* set to negative value for no autoboot */
#endif
#endif /* CONFIG_SPL_BUILD */
#endif /* ! __CONFIG_PXM2_H */ #endif /* ! __CONFIG_PXM2_H */

2
include/configs/qemu-riscv.h
View File

@ -21,7 +21,6 @@
/* Environment options */ /* Environment options */
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(QEMU, qemu, na) \ func(QEMU, qemu, na) \
func(VIRTIO, virtio, 0) \ func(VIRTIO, virtio, 0) \
@ -50,6 +49,5 @@
"pxefile_addr_r=0x8c200000\0" \ "pxefile_addr_r=0x8c200000\0" \
"ramdisk_addr_r=0x8c300000\0" \ "ramdisk_addr_r=0x8c300000\0" \
BOOTENV BOOTENV
#endif
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

6
include/configs/rastaban.h
View File

@ -40,8 +40,6 @@
/* Define own nand partitions */ /* Define own nand partitions */
#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE) #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
#ifndef CONFIG_SPL_BUILD
/* Default env settings */ /* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"hostname=rastaban\0" \ "hostname=rastaban\0" \
@ -53,8 +51,4 @@
CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_V2 \
CONFIG_ENV_SETTINGS_NAND_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 */ #endif /* ! __CONFIG_RASTABAN_H */

3
include/configs/rk3036_common.h
View File

@ -17,8 +17,6 @@
#define SDRAM_BANK_SIZE (512UL << 20UL) #define SDRAM_BANK_SIZE (512UL << 20UL)
#define SDRAM_MAX_SIZE (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE) #define SDRAM_MAX_SIZE (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE)
#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x60000000\0" \ "scriptaddr=0x60000000\0" \
"pxefile_addr_r=0x60100000\0" \ "pxefile_addr_r=0x60100000\0" \
@ -36,6 +34,5 @@
"partitions=" PARTS_DEFAULT \ "partitions=" PARTS_DEFAULT \
ENV_MEM_LAYOUT_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \
BOOTENV BOOTENV
#endif
#endif #endif

4
include/configs/rk3066_common.h
View File

@ -15,8 +15,6 @@
#define SDRAM_BANK_SIZE (1024UL << 20UL) #define SDRAM_BANK_SIZE (1024UL << 20UL)
#define SDRAM_MAX_SIZE CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE #define SDRAM_MAX_SIZE CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE
#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x60000000\0" \ "scriptaddr=0x60000000\0" \
"pxefile_addr_r=0x60100000\0" \ "pxefile_addr_r=0x60100000\0" \
@ -34,6 +32,4 @@
ROCKCHIP_DEVICE_SETTINGS \ ROCKCHIP_DEVICE_SETTINGS \
BOOTENV BOOTENV
#endif /* CONFIG_SPL_BUILD */
#endif #endif

4
include/configs/rk3128_common.h
View File

@ -22,8 +22,6 @@
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
#ifndef CONFIG_SPL_BUILD
/* usb mass storage */ /* usb mass storage */
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
@ -41,5 +39,3 @@
BOOTENV BOOTENV
#endif #endif
#endif

3
include/configs/rk3188_common.h
View File

@ -19,7 +19,6 @@
#define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_BANK_SIZE (2UL << 30)
#define SDRAM_MAX_SIZE 0x80000000 #define SDRAM_MAX_SIZE 0x80000000
#ifndef CONFIG_SPL_BUILD
/* usb otg */ /* usb otg */
/* usb host support */ /* usb host support */
@ -43,6 +42,4 @@
ROCKCHIP_DEVICE_SETTINGS \ ROCKCHIP_DEVICE_SETTINGS \
BOOTENV BOOTENV
#endif /* CONFIG_SPL_BUILD */
#endif #endif

3
include/configs/rk322x_common.h
View File

@ -20,8 +20,6 @@
#define SDRAM_BANK_SIZE (512UL << 20UL) #define SDRAM_BANK_SIZE (512UL << 20UL)
#define SDRAM_MAX_SIZE 0x80000000 #define SDRAM_MAX_SIZE 0x80000000
#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x60000000\0" \ "scriptaddr=0x60000000\0" \
"pxefile_addr_r=0x60100000\0" \ "pxefile_addr_r=0x60100000\0" \
@ -39,6 +37,5 @@
"partitions=" PARTS_DEFAULT \ "partitions=" PARTS_DEFAULT \
ENV_MEM_LAYOUT_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \
BOOTENV BOOTENV
#endif
#endif #endif

3
include/configs/rk3288_common.h
View File

@ -23,8 +23,6 @@
#define CONFIG_SYS_MONITOR_LEN (600 * 1024) #define CONFIG_SYS_MONITOR_LEN (600 * 1024)
#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x00000000\0" \ "scriptaddr=0x00000000\0" \
"pxefile_addr_r=0x00100000\0" \ "pxefile_addr_r=0x00100000\0" \
@ -44,6 +42,5 @@
ENV_MEM_LAYOUT_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \
ROCKCHIP_DEVICE_SETTINGS \ ROCKCHIP_DEVICE_SETTINGS \
BOOTENV BOOTENV
#endif
#endif #endif

4
include/configs/rk3308_common.h
View File

@ -20,8 +20,6 @@
#define SDRAM_MAX_SIZE 0xff000000 #define SDRAM_MAX_SIZE 0xff000000
#define SDRAM_BANK_SIZE (2UL << 30) #define SDRAM_BANK_SIZE (2UL << 30)
#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x00500000\0" \ "scriptaddr=0x00500000\0" \
"pxefile_addr_r=0x00600000\0" \ "pxefile_addr_r=0x00600000\0" \
@ -37,5 +35,3 @@
BOOTENV BOOTENV
#endif #endif
#endif

4
include/configs/rk3328_common.h
View File

@ -16,8 +16,6 @@
#define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_SYS_SDRAM_BASE 0
#define SDRAM_MAX_SIZE 0xff000000 #define SDRAM_MAX_SIZE 0xff000000
#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x00500000\0" \ "scriptaddr=0x00500000\0" \
"pxefile_addr_r=0x00600000\0" \ "pxefile_addr_r=0x00600000\0" \
@ -32,8 +30,6 @@
"partitions=" PARTS_DEFAULT \ "partitions=" PARTS_DEFAULT \
BOOTENV BOOTENV
#endif
/* rockchip ohci host driver */ /* rockchip ohci host driver */
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1

3
include/configs/rk3368_common.h
View File

@ -18,7 +18,6 @@
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x00500000\0" \ "scriptaddr=0x00500000\0" \
"pxefile_addr_r=0x00600000\0" \ "pxefile_addr_r=0x00600000\0" \
@ -34,5 +33,3 @@
BOOTENV BOOTENV
#endif #endif
#endif

2
include/configs/rk3568_common.h
View File

@ -15,7 +15,6 @@
#define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_SYS_SDRAM_BASE 0
#define SDRAM_MAX_SIZE 0xf0000000 #define SDRAM_MAX_SIZE 0xf0000000
#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x00c00000\0" \ "scriptaddr=0x00c00000\0" \
"pxefile_addr_r=0x00e00000\0" \ "pxefile_addr_r=0x00e00000\0" \
@ -30,6 +29,5 @@
"partitions=" PARTS_DEFAULT \ "partitions=" PARTS_DEFAULT \
ROCKCHIP_DEVICE_SETTINGS \ ROCKCHIP_DEVICE_SETTINGS \
BOOTENV BOOTENV
#endif
#endif #endif

8
include/configs/rut.h
View File

@ -24,8 +24,6 @@
/* Watchdog */ /* Watchdog */
#define WATCHDOG_TRIGGER_GPIO 14 #define WATCHDOG_TRIGGER_GPIO 14
#ifndef CONFIG_SPL_BUILD
/* Use common default */ /* Use common default */
/* Default env settings */ /* Default env settings */
@ -59,10 +57,4 @@
"bootm ${kloadaddr}\0" \ "bootm ${kloadaddr}\0" \
"" ""
#ifndef CONFIG_RESTORE_FLASH
/* set to negative value for no autoboot */
#endif
#endif /* CONFIG_SPL_BUILD */
#endif /* ! __CONFIG_RUT_H */ #endif /* ! __CONFIG_RUT_H */

3
include/configs/rv1108_common.h
View File

@ -20,9 +20,7 @@
/* rockchip ohci host driver */ /* rockchip ohci host driver */
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
#endif
#ifndef CONFIG_SPL_BUILD
#define ENV_MEM_LAYOUT_SETTINGS \ #define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x60000000\0" \ "scriptaddr=0x60000000\0" \
"fdt_addr_r=0x61f00000\0" \ "fdt_addr_r=0x61f00000\0" \
@ -35,4 +33,5 @@
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
"partitions=" PARTS_DEFAULT \ "partitions=" PARTS_DEFAULT \
BOOTENV BOOTENV
#endif #endif

2
include/configs/sandbox.h
View File

@ -6,9 +6,7 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#ifndef CONFIG_SPL_BUILD
#define CONFIG_IO_TRACE #define CONFIG_IO_TRACE
#endif
#define CONFIG_MALLOC_F_ADDR 0x0010000 #define CONFIG_MALLOC_F_ADDR 0x0010000

6
include/configs/siemens-am33x-common.h
View File

@ -17,9 +17,7 @@
/* commands to include */ /* commands to include */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_ROOTPATH "/opt/eldk" #define CONFIG_ROOTPATH "/opt/eldk"
#endif
#define CONFIG_SYS_AUTOLOAD "yes" #define CONFIG_SYS_AUTOLOAD "yes"
@ -81,16 +79,12 @@
* we don't need to do it twice. * we don't need to do it twice.
*/ */
#ifndef CONFIG_SPL_BUILD
/* USB DRACO ID as default */ /* USB DRACO ID as default */
#define CONFIG_USBD_HS #define CONFIG_USBD_HS
/* USB Device Firmware Update support */ /* USB Device Firmware Update support */
#define DFU_MANIFEST_POLL_TIMEOUT 25000 #define DFU_MANIFEST_POLL_TIMEOUT 25000
#endif /* CONFIG_SPL_BUILD */
/* /*
* Default to using SPI for environment, etc. We have multiple copies * Default to using SPI for environment, etc. We have multiple copies
* of SPL as the ROM will check these locations. * of SPL as the ROM will check these locations.

2
include/configs/sifive-unleashed.h
View File

@ -24,7 +24,6 @@
/* Environment options */ /* Environment options */
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(SF, sf, 0) \ func(SF, sf, 0) \
@ -61,6 +60,5 @@
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
BOOTENV \ BOOTENV \
BOOTENV_SF BOOTENV_SF
#endif
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

2
include/configs/sifive-unmatched.h
View File

@ -19,7 +19,6 @@
/* Environment options */ /* Environment options */
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(NVME, nvme, 0) \ func(NVME, nvme, 0) \
func(USB, usb, 0) \ func(USB, usb, 0) \
@ -53,7 +52,6 @@
"partitions=" PARTS_DEFAULT "\0" \ "partitions=" PARTS_DEFAULT "\0" \
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
BOOTENV BOOTENV
#endif /* CONFIG_SPL_BUILD */
#define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_EEPROM_BUS_NUM 0

2
include/configs/smartweb.h
View File

@ -69,7 +69,6 @@
#define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID ATMEL_ID_SYS #define CONFIG_USART_ID ATMEL_ID_SYS
#if !defined(CONFIG_SPL_BUILD)
/* USB configuration */ /* USB configuration */
#define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL
#define CONFIG_USB_ATMEL_CLK_SEL_PLLB #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
@ -85,7 +84,6 @@
/* DFU class support */ /* DFU class support */
#define DFU_MANIFEST_POLL_TIMEOUT 25000 #define DFU_MANIFEST_POLL_TIMEOUT 25000
#endif
/* General Boot Parameter */ /* General Boot Parameter */

15
include/configs/socfpga_soc64_common.h
View File

@ -34,21 +34,6 @@
* U-Boot environment configurations * 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 * Environment variable
*/ */

6
include/configs/sunxi-common.h
View File

@ -125,8 +125,6 @@
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
#endif #endif
#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_ARM64 #ifdef CONFIG_ARM64
/* /*
* Boards seem to come with at least 512MB of DRAM. * Boards seem to come with at least 512MB of DRAM.
@ -372,8 +370,4 @@
BOOTCMD_SUNXI_COMPAT \ BOOTCMD_SUNXI_COMPAT \
BOOTENV BOOTENV
#else /* ifndef CONFIG_SPL_BUILD */
#define CONFIG_EXTRA_ENV_SETTINGS
#endif
#endif /* _SUNXI_COMMON_CONFIG_H */ #endif /* _SUNXI_COMMON_CONFIG_H */

4
include/configs/synquacer.h
View File

@ -60,7 +60,6 @@
0xf0, 0xa3, 0x83, 0x87, 0xe6, 0x30) 0xf0, 0xa3, 0x83, 0x87, 0xe6, 0x30)
/* Distro boot settings */ /* Distro boot settings */
#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
#define BOOT_TARGET_DEVICE_USB(func) func(USB, usb, 0) #define BOOT_TARGET_DEVICE_USB(func) func(USB, usb, 0)
#else #else
@ -92,9 +91,6 @@
BOOT_TARGET_DEVICE_NVME(func) \ BOOT_TARGET_DEVICE_NVME(func) \
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else /* CONFIG_SPL_BUILD */
#define BOOTENV
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"fdt_addr_r=0x9fe00000\0" \ "fdt_addr_r=0x9fe00000\0" \

6
include/configs/taurus.h
View File

@ -84,13 +84,8 @@
/* SPI EEPROM */ /* SPI EEPROM */
#define TAURUS_SPI_MASK (1 << 4) #define TAURUS_SPI_MASK (1 << 4)
#if defined(CONFIG_SPL_BUILD)
/* SPL related */
#endif
/* bootstrap in spi flash , u-boot + env + linux in nandflash */ /* bootstrap in spi flash , u-boot + env + linux in nandflash */
#ifndef CONFIG_SPL_BUILD
#if defined(CONFIG_BOARD_AXM) #if defined(CONFIG_BOARD_AXM)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \ "addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
@ -139,7 +134,6 @@
"stdout=serial\0" \ "stdout=serial\0" \
"upgrade_available=0\0" "upgrade_available=0\0"
#endif #endif
#endif /* #ifndef CONFIG_SPL_BUILD */
/* Defines for SPL */ /* Defines for SPL */

5
include/configs/tegra-common-post.h
View File

@ -9,8 +9,6 @@
#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */ #define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */
#ifndef CONFIG_SPL_BUILD
#if CONFIG_IS_ENABLED(CMD_USB) #if CONFIG_IS_ENABLED(CMD_USB)
# define BOOT_TARGET_USB(func) func(USB, usb, 0) # define BOOT_TARGET_USB(func) func(USB, usb, 0)
#else #else
@ -26,9 +24,6 @@
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#endif #endif
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else
#define BOOTENV
#endif
#ifdef CONFIG_TEGRA_KEYBOARD #ifdef CONFIG_TEGRA_KEYBOARD
#define STDIN_KBD_KBC ",tegra-kbc" #define STDIN_KBD_KBC ",tegra-kbc"

6
include/configs/thuban.h
View File

@ -33,8 +33,6 @@
/* Define own nand partitions */ /* Define own nand partitions */
#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE) #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
#ifndef CONFIG_SPL_BUILD
/* Default env settings */ /* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"hostname=thuban\0" \ "hostname=thuban\0" \
@ -46,8 +44,4 @@
CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_V2 \
CONFIG_ENV_SETTINGS_NAND_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 */ #endif /* ! __CONFIG_THUBAN_H */

2
include/configs/ti_omap4_common.h
View File

@ -47,9 +47,7 @@
#endif #endif
/* TWL6030 */ /* TWL6030 */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_TWL6030_POWER 1 #define CONFIG_TWL6030_POWER 1
#endif
/* /*
* Environment setup * Environment setup

4
include/configs/uniphier.h
View File

@ -10,7 +10,6 @@
#ifndef __CONFIG_UNIPHIER_H__ #ifndef __CONFIG_UNIPHIER_H__
#define __CONFIG_UNIPHIER_H__ #define __CONFIG_UNIPHIER_H__
#ifndef CONFIG_SPL_BUILD
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#ifdef CONFIG_CMD_MMC #ifdef CONFIG_CMD_MMC
@ -35,9 +34,6 @@
BOOT_TARGET_DEVICE_MMC(func) \ BOOT_TARGET_DEVICE_MMC(func) \
BOOT_TARGET_DEVICE_UBIFS(func) \ BOOT_TARGET_DEVICE_UBIFS(func) \
BOOT_TARGET_DEVICE_USB(func) BOOT_TARGET_DEVICE_USB(func)
#else
#define BOOTENV
#endif
#define CONFIG_SYS_MONITOR_LEN 0x00200000 /* 2MB */ #define CONFIG_SYS_MONITOR_LEN 0x00200000 /* 2MB */

4
include/configs/verdin-imx8mm.h
View File

@ -28,15 +28,11 @@
"scriptaddr=0x46000000\0" "scriptaddr=0x46000000\0"
/* Enable Distro Boot */ /* Enable Distro Boot */
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else
#define BOOTENV
#endif
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

4
include/configs/verdin-imx8mp.h
View File

@ -40,15 +40,11 @@
"scriptaddr=0x46000000\0" "scriptaddr=0x46000000\0"
/* Enable Distro Boot */ /* Enable Distro Boot */
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#else
#define BOOTENV
#endif
#if defined(CONFIG_TDX_EASY_INSTALLER) #if defined(CONFIG_TDX_EASY_INSTALLER)
# define BOOT_SCRIPT "boot-tezi.scr" # define BOOT_SCRIPT "boot-tezi.scr"

2
include/configs/x530.h
View File

@ -48,9 +48,7 @@
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* PCIe support */ /* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_SCAN_SHOW #define CONFIG_PCI_SCAN_SHOW
#endif
/* NAND */ /* NAND */

2
include/configs/xilinx_zynqmp.h
View File

@ -37,13 +37,11 @@
#define DFU_DEFAULT_POLL_TIMEOUT 300 #define DFU_DEFAULT_POLL_TIMEOUT 300
#define CONFIG_THOR_RESET_OFF #define CONFIG_THOR_RESET_OFF
#ifndef CONFIG_SPL_BUILD
# define PARTS_DEFAULT \ # define PARTS_DEFAULT \
"partitions=uuid_disk=${uuid_gpt_disk};" \ "partitions=uuid_disk=${uuid_gpt_disk};" \
"name=""boot"",size=16M,uuid=${uuid_gpt_boot};" \ "name=""boot"",size=16M,uuid=${uuid_gpt_boot};" \
"name=""Linux"",size=-M,uuid=${uuid_gpt_Linux}\0" "name=""Linux"",size=-M,uuid=${uuid_gpt_Linux}\0"
#endif #endif
#endif
#if !defined(PARTS_DEFAULT) #if !defined(PARTS_DEFAULT)
# define PARTS_DEFAULT # define PARTS_DEFAULT