In order to use CONFIG_PREBOOT with Kconfig, CONFIG_USE_PREBOOT must be
defined for each board. To prepare for conversion to Kconfig, add this.
Signed-off-by: Simon Glass <s...@chromium.org>
---
include/configs/MPC8349EMDS.h | 1 +
include/configs/TQM834x.h | 1 +
include/configs/am3517_crane.h | 1 +
include/configs/am3517_evm.h | 1 +
include/configs/apf27.h | 1 +
include/configs/arndale.h | 1 +
include/configs/bcmstb.h | 1 +
include/configs/bk4r1.h | 1 +
include/configs/bur_cfg_common.h | 1 +
include/configs/calimain.h | 1 +
include/configs/cm_fx6.h | 1 +
include/configs/conga-qeval20-qa3-e3845.h | 1 +
include/configs/controlcenterdc.h | 1 +
include/configs/dfi-bt700.h | 1 +
include/configs/ds414.h | 1 +
include/configs/ea20.h | 1 +
include/configs/evb_rk3229.h | 1 +
include/configs/gw_ventana.h | 1 +
include/configs/hrcon.h | 1 +
include/configs/ids8313.h | 1 +
include/configs/m53menlo.h | 1 +
include/configs/meesc.h | 1 +
include/configs/meson64.h | 1 +
include/configs/microblaze-generic.h | 3 ++-
include/configs/mv-common.h | 1 +
include/configs/mvebu_armada-37xx.h | 1 +
include/configs/mvebu_armada-8k.h | 1 +
include/configs/mx51evk.h | 1 +
include/configs/mx53cx9020.h | 1 +
include/configs/mx53loco.h | 1 +
include/configs/mx6cuboxi.h | 1 +
include/configs/nitrogen6x.h | 1 +
include/configs/nokia_rx51.h | 1 +
include/configs/omap3_beagle.h | 1 +
include/configs/omap3_evm.h | 1 +
include/configs/omap3_logic.h | 1 +
include/configs/opos6uldev.h | 1 +
include/configs/ot1200.h | 1 +
include/configs/platinum.h | 1 +
include/configs/qemu-arm.h | 1 +
include/configs/rk3036_common.h | 1 +
include/configs/rk3188_common.h | 1 +
include/configs/rk322x_common.h | 1 +
include/configs/rk3288_common.h | 1 +
include/configs/rpi.h | 1 +
include/configs/siemens-am33x-common.h | 1 +
include/configs/socfpga_dbm_soc1.h | 1 +
include/configs/socfpga_vining_fpga.h | 1 +
include/configs/socrates.h | 1 +
include/configs/stm32mp1.h | 1 +
include/configs/strider.h | 1 +
include/configs/sunxi-common.h | 1 +
include/configs/tbs2910.h | 1 +
include/configs/tegra-common-post.h | 1 +
include/configs/theadorable-x86-common.h | 1 +
include/configs/theadorable.h | 1 +
include/configs/topic_miami.h | 1 +
include/configs/turris_mox.h | 1 +
include/configs/xpedite517x.h | 1 +
include/configs/xpedite520x.h | 1 +
include/configs/xpedite537x.h | 1 +
include/configs/xpedite550x.h | 1 +
include/configs/zipitz2.h | 1 +
include/configs/zmx25.h | 1 +
include/configs/zynq-common.h | 1 +
scripts/config_whitelist.txt | 1 -
66 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index bda477cc160..5e6a751d8f8 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -686,6 +686,7 @@
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm
*/
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 0942b872ac3..4f92fda308f 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -420,6 +420,7 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 400000
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 2c510265cca..276cc36fa15 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -73,6 +73,7 @@
#ifdef CONFIG_USB_MUSB_HCD
#ifdef CONFIG_USB_KEYBOARD
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "usb start"
#endif /* CONFIG_USB_KEYBOARD */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 9475e9975d5..875ccf33640 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -33,6 +33,7 @@
#ifdef CONFIG_USB_MUSB_HOST
#ifdef CONFIG_USB_KEYBOARD
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "usb start"
#endif /* CONFIG_USB_KEYBOARD */
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index b7a7ec5ee0c..d7af4f91bcb 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -83,6 +83,7 @@
#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "run check_flash check_env;"
/*
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index dd321c4748d..e8a1dc87718 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -33,6 +33,7 @@
#define CONFIG_POWER
#define CONFIG_POWER_I2C
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#define CONFIG_S5P_PA_SYSRAM 0x02020000
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index cc289244ff2..648a4db8f17 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -157,6 +157,7 @@ extern phys_addr_t prior_stage_fdt_address;
/*
* Save the prior stage provided DTB.
*/
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT \
"fdt addr ${fdtcontroladdr};" \
"fdt move ${fdtcontroladdr} ${fdtsaveaddr};" \
diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index 05ebb7d9c5c..76dc38766d4 100644
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -37,6 +37,7 @@
"run manage_userdata; "
/* Enable PREBOOT variable */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
/* Set ARP_TIMEOUT to 500ms */
diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h
index 0f293849ab0..0a8d41b8f6d 100644
--- a/include/configs/bur_cfg_common.h
+++ b/include/configs/bur_cfg_common.h
@@ -23,6 +23,7 @@
"setcurs 1 10;lcdputs serverip; setcurs 10 10; lcdputs ${serverip};" \
"setenv stdout nc;setenv stdin nc;setenv stderr nc\0"
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "run cfgscr; run brdefaultip"
/* Network defines */
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index e77218466f1..e5903964347 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -249,6 +249,7 @@
"erase 0x60040000 +0x40000;\0" \
"altbootcmd=run bootrlk\0"
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT \
"echo Version: $ver; " \
"echo Serial: $serial; " \
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 2e8dda8ab85..7b9640fb26e 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -144,6 +144,7 @@
"echo WARNING: Could not determine dtb to use; fi; \0" \
BOOTENV
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "usb start;sf probe"
#define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/conga-qeval20-qa3-e3845.h
b/include/configs/conga-qeval20-qa3-e3845.h
index 94aa2736abd..1978074617f 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -37,6 +37,7 @@
"upd_uboot=tftp 100000 conga/u-boot.rom;" \
"sf probe;sf update 100000 0 800000;saveenv\0"
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#endif /* __CONFIG_H */
diff --git a/include/configs/controlcenterdc.h
b/include/configs/controlcenterdc.h
index 3affdb0f684..f0f460aac9b 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -124,6 +124,7 @@
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "ccdc.img"
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_EXTRA_ENV_SETTINGS
\
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index f7bad8e1e93..d3a4a61c6c1 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -42,6 +42,7 @@
"upd_uboot=usb reset;tftp 100000 dfi/u-boot.rom;" \
"sf probe;sf update 100000 0 800000;saveenv\0"
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#endif /* __CONFIG_H */
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 7269c42a5f6..2b44437ed37 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -99,6 +99,7 @@
/* Default Environment */
#define CONFIG_BOOTCOMMAND "sf read ${loadaddr} 0xd0000 0x700000; bootm"
#define CONFIG_LOADADDR 0x80000
+#define CONFIG_USE_PREBOOT
#undef CONFIG_PREBOOT /* override preboot for USB and SPI flash init
*/
#define CONFIG_PREBOOT "usb start; sf probe"
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 88f2e17d402..13b4c16c785 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -17,6 +17,7 @@
#define CONFIG_SYS_USE_NAND
#define CONFIG_DRIVER_TI_EMAC_USE_RMII
#define CONFIG_DRIVER_TI_EMAC_RMII_NO_NEGOTIATE
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
/*
diff --git a/include/configs/evb_rk3229.h b/include/configs/evb_rk3229.h
index 369b0bc68a2..2cbf60e2454 100644
--- a/include/configs/evb_rk3229.h
+++ b/include/configs/evb_rk3229.h
@@ -35,6 +35,7 @@
"name=persist,size=4M,uuid=${uuid_gpt_persist};" \
"name=userdata,size=-,uuid=${uuid_gpt_userdata};\0" \
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#define CONFIG_SYS_BOOT_RAMDISK_HIGH
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 02ceb4c8fc8..aec5d61c563 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -138,6 +138,7 @@
/* Miscellaneous configurable options */
#define CONFIG_HWCONFIG
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
/* Memory configuration */
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 52e62778a3c..e972c9b81d6 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -577,6 +577,7 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_EXTRA_ENV_SETTINGS
\
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 7e4c497fe0a..f8cc8cc6799 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -432,6 +432,7 @@
#define CONFIG_SYS_LOAD_ADDR 0x100000
#define CONFIG_LOADS_ECHO
#define CONFIG_TIMESTAMP
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run nfsboot\\\" " \
"to mount root filesystem over NFS;echo"
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index fc0b1f480ce..1661a783b9a 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -187,6 +187,7 @@
/*
* Extra Environments
*/
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "run try_bootscript"
#define CONFIG_HOSTNAME "m53menlo"
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index a1fd5f61950..6cf8c672eb6 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -40,6 +40,7 @@
#define CONFIG_REVISION_TAG
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT /* enable preboot variable */
/*
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index d82a674270c..7ced66774f6 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -31,6 +31,7 @@
#ifdef CONFIG_USB_KEYBOARD
#define STDIN_CFG "usbkbd,serial"
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "usb start"
#else
#define STDIN_CFG "serial"
diff --git a/include/configs/microblaze-generic.h
b/include/configs/microblaze-generic.h
index d1ab40ec13d..f99bd71167d 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -140,7 +140,8 @@
/* architecture dependent code */
#define CONFIG_SYS_USR_EXCEP /* user exception */
-#define CONFIG_PREBOOT "echo U-BOOT for ${hostname};setenv
preboot;echo"
+#define CONFIG_USE_PREBOOT
+#define CONFIG_PREBOOT "echo U-BOOT for ${hostname};setenv preboot;echo"
#ifndef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" \
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index a8030931635..6ee0443f112 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -38,6 +38,7 @@
#endif
/* auto boot */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
/*
diff --git a/include/configs/mvebu_armada-37xx.h
b/include/configs/mvebu_armada-37xx.h
index 10b94f438f1..dbedad1a97b 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -14,6 +14,7 @@
#define CONFIG_SYS_SDRAM_BASE 0x00000000
/* auto boot */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
diff --git a/include/configs/mvebu_armada-8k.h
b/include/configs/mvebu_armada-8k.h
index b28f3b94085..29310147446 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -15,6 +15,7 @@
#define CONFIG_SYS_SDRAM_BASE 0x00000000
/* auto boot */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index f5fd01de220..8e66a2bf679 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -66,6 +66,7 @@
#define CONFIG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED
/* Framebuffer and LCD */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 9bf5d9169b4..e4bca14dbf0 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -159,6 +159,7 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
/* Framebuffer and LCD */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 4f179081a8a..6eca8b60278 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -176,6 +176,7 @@
#endif
/* Framebuffer and LCD */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 7b4ae2102eb..cde8fa210bc 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -49,6 +49,7 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT \
"if hdmidet; then " \
"usb start; " \
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index afaa9084062..3709fa65379 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -67,6 +67,7 @@
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT ""
#ifdef CONFIG_CMD_MMC
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 453dd32fbdc..495c74521c0 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -254,6 +254,7 @@ int rx51_kp_getc(struct stdio_dev *sdev);
"bootmenu_delay=30\0" \
""
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT \
"setenv mmcnum 1; setenv mmcpart 1;" \
"setenv mmcscriptfile bootmenu.scr;" \
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index f0c8c990faf..26673dbecb3 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -62,6 +62,7 @@
/* Environment */
#define CONFIG_ENV_SIZE SZ_128K
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "usb start"
#define MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 5b9d8a57e3d..28931480be1 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -56,6 +56,7 @@
/* Environment */
#define CONFIG_ENV_SIZE SZ_128K
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "usb start"
#define MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index e318a9f8967..2dae473f9c1 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -56,6 +56,7 @@
/* Environment information */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT \
"setenv preboot;" \
"saveenv;"
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index e0c76ff43da..d7dd77e5357 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -76,6 +76,7 @@
#define ACFG_CONSOLE_DEV ttymxc0
#define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME)
"-root"
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "run check_env"
#define CONFIG_BOOTCOMMAND "run emmcboot"
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 925e7ae3dbc..307797d0e3e 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -77,6 +77,7 @@
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
#endif
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT ""
/* Thermal support */
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index d1ebaf55615..ced843f97e4 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -102,6 +102,7 @@
#define CONFIG_BOOTCOMMAND "run bootubi_scr"
/* Miscellaneous configurable options */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
/* MTD/UBI/UBIFS config */
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index 65fdb1e9298..0e9f737f571 100644
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -32,6 +32,7 @@
#include <config_distro_bootcmd.h>
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "pci enum"
#define CONFIG_EXTRA_ENV_SETTINGS \
"fdt_high=0xffffffff\0" \
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index f5d09d18e5e..9ad10e6c75b 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -55,6 +55,7 @@
BOOTENV
#endif
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#endif
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index 1d417028467..d93f8cc5c87 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -62,6 +62,7 @@
#endif /* CONFIG_SPL_BUILD */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#endif
diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index 3a96748f6b7..1f106fbd1ab 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -54,6 +54,7 @@
BOOTENV
#endif
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#endif
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 7c79ed61382..50d6859d9b4 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -63,6 +63,7 @@
BOOTENV
#endif
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#endif
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 9ce41767a97..501dbd8d970 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -73,6 +73,7 @@
/* Environment */
#define CONFIG_ENV_SIZE SZ_16K
#define CONFIG_SYS_LOAD_ADDR 0x1000000
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "usb start"
/* Shell */
diff --git a/include/configs/siemens-am33x-common.h
b/include/configs/siemens-am33x-common.h
index 12819553b07..0e659e6f4c4 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -190,6 +190,7 @@
/* UBI Support */
/* Commen environment */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#define COMMON_ENV_DFU_ARGS "dfu_args=run bootargs_defaults;" \
"setenv bootargs ${bootargs};" \
diff --git a/include/configs/socfpga_dbm_soc1.h
b/include/configs/socfpga_dbm_soc1.h
index b36d7e56fb1..56876d3db5b 100644
--- a/include/configs/socfpga_dbm_soc1.h
+++ b/include/configs/socfpga_dbm_soc1.h
@@ -12,6 +12,7 @@
/* Booting Linux */
#define CONFIG_BOOTFILE "fitImage"
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "run try_bootscript"
#define CONFIG_BOOTCOMMAND "run mmc_mmc"
#define CONFIG_LOADADDR 0x01000000
diff --git a/include/configs/socfpga_vining_fpga.h
b/include/configs/socfpga_vining_fpga.h
index 29a92b91468..05369e72251 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -33,6 +33,7 @@
* if button B is not pressed, boot normal Linux system immediatelly
* if button B is pressed, wait $bootdelay and boot recovery system
*/
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT \
"setenv hostname vining-${unit_serial} ; " \
"setenv PS1 \"${unit_ident} (${unit_serial}) => \" ; " \
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 3f84fabdb60..3e26476dea6 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -274,6 +274,7 @@
#define CONFIG_LOADADDR 200000 /* default addr for tftp &
bootm*/
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "echo;" \
"echo Welcome on the ABB Socrates Board;" \
"echo"
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index fd6c97a0c61..a1c8a75b61d 100644
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -95,6 +95,7 @@
* for nand boot, boot with on ubifs partition on nand
* for nor boot, use the default order
*/
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#define STM32MP_BOOTCMD "bootcmd_stm32mp=" \
diff --git a/include/configs/strider.h b/include/configs/strider.h
index 972543d6bd1..bd4e54b1407 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -609,6 +609,7 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_EXTRA_ENV_SETTINGS
\
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index accc21f56fc..4c3851fbd63 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -289,6 +289,7 @@ extern int soft_i2c_gpio_scl;
#endif
#ifdef CONFIG_USB_KEYBOARD
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#endif
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index a753d418354..c935577f5d5 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -80,6 +80,7 @@
#define CONFIG_USBD_HS
#endif /* CONFIG_CMD_USB_MASS_STORAGE */
#ifdef CONFIG_USB_KEYBOARD
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT \
"usb start; " \
"if hdmidet; then " \
diff --git a/include/configs/tegra-common-post.h
b/include/configs/tegra-common-post.h
index e54428ba43e..1977f047446 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -40,6 +40,7 @@
#ifdef CONFIG_USB_KEYBOARD
#define STDIN_KBD_USB ",usbkbd"
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT "usb start"
#else
#define STDIN_KBD_USB ""
diff --git a/include/configs/theadorable-x86-common.h
b/include/configs/theadorable-x86-common.h
index e0a033bec1c..ac7ee2eda53 100644
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -13,6 +13,7 @@
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 6d41d184932..d28978467b6 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -47,6 +47,7 @@
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
/* Keep device tree and initrd in lower memory so the kernel can access them */
diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index 69aa79bafc8..3d48ab2352a 100644
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -79,6 +79,7 @@
# define EXTRA_ENV_USB
#endif
+#define CONFIG_USE_PREBOOT
#undef CONFIG_PREBOOT
#undef CONFIG_EXTRA_ENV_SETTINGS
diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 0de40eddcb5..fc0fe1504ce 100644
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -21,6 +21,7 @@
#define CONFIG_SYS_SDRAM_BASE 0x00000000
/* auto boot */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 2d2a87a7190..b8abbcee903 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -473,6 +473,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
*/
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_LOADADDR 0x1000000 /* default location for
tftp and bootm */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS
*/
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 5737cfee950..ee22042a815 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -271,6 +271,7 @@
*/
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_LOADADDR 0x1000000 /* default location for
tftp and bootm */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS
*/
#define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 22dd3c036eb..fe3a6305c6e 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -323,6 +323,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
*/
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_LOADADDR 0x1000000 /* default location for
tftp and bootm */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS
*/
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index a7c8dc4e336..d9710c0cf54 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -321,6 +321,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
*/
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_LOADADDR 0x1000000 /* default location for
tftp and bootm */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS
*/
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 24fea68a11f..e6e3ba354ae 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -14,6 +14,7 @@
#define CONFIG_CPU_PXA27X 1 /* Marvell PXA270 CPU */
#undef CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
/*
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index c8b6161a299..bc9419225f9 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -98,6 +98,7 @@
#define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM + (512*1024))
#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM + PHYS_SDRAM_SIZE)
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT ""
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 523d4da56b2..46da8be02c1 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -103,6 +103,7 @@
#define CONFIG_ENV_OVERWRITE
/* enable preboot to be loaded before CONFIG_BOOTDELAY */
+#define CONFIG_USE_PREBOOT
#define CONFIG_PREBOOT
/* Boot configuration */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fd77eb7967d..787cefc1507 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1526,7 +1526,6 @@ CONFIG_PPC_SPINTABLE_COMPATIBLE
CONFIG_PQ_MDS_PIB
CONFIG_PQ_MDS_PIB_ATM
CONFIG_PRAM
-CONFIG_PREBOOT
CONFIG_PRINTK
CONFIG_PROC_FS
CONFIG_PROFILE_ALL_BRANCHES
--
2.21.0.1020.gf2820cf01a-goog
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
