From b06da06dd41b9c72b06c9d03f434d4263bbf6bbd Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sat, 20 Jul 2019 20:51:13 -0600
Subject: [PATCH] Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT

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 <sjg@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/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/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_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/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/zmx25.h                   | 1 +
 include/configs/zynq-common.h             | 1 +
 59 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 7640d7610d..b37f3a8727 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -347,6 +347,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 0da34d05af..0c2df7ec03 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -236,6 +236,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 cacd799aa2..e9a9da3aed 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -72,6 +72,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 c2c5c1f668..1b9dafa1a5 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -34,6 +34,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 b7a7ec5ee0..d7af4f91bc 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 841f361648..0485e7a6d8 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -29,6 +29,7 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR	CONFIG_IRAM_STACK
 
+#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 cc289244ff..648a4db8f1 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 05ebb7d9c5..76dc38766d 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 0f293849ab..0a8d41b8f6 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/cm_fx6.h b/include/configs/cm_fx6.h
index 2e8dda8ab8..7b9640fb26 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 94aa2736ab..1978074617 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 3affdb0f68..f0f460aac9 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 f7bad8e1e9..d3a4a61c6c 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 7269c42a5f..2b44437ed3 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/gw_ventana.h b/include/configs/gw_ventana.h
index 02ceb4c8fc..aec5d61c56 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 6e6c1714ce..31ce410448 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -403,6 +403,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 b1d01c58f9..8bc8e00f98 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -253,6 +253,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 e98dbfbb7e..0fe83be527 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -185,6 +185,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 a1fd5f6195..6cf8c672eb 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 d82a674270..7ced66774f 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 d1ab40ec13..f99bd71167 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 a803093163..6ee0443f11 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 10b94f438f..dbedad1a97 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 b28f3b9408..2931014744 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 f5fd01de22..8e66a2bf67 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 ab61a07f96..fb57a2113c 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -160,6 +160,7 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_IMX_VIDEO_SKIP
+#define CONFIG_USE_PREBOOT
 #define CONFIG_PREBOOT
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 4f179081a8..6eca8b6027 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 7b4ae2102e..cde8fa210b 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 afaa908406..3709fa6537 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 d9f4bdc1d6..43dfeeac32 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -253,6 +253,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 a2a6be7cf8..0bf2df22ea 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -58,6 +58,7 @@
 
 /* TWL4030 LED Support */
 
+#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 1fbd371a50..8b1773ea07 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -60,6 +60,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 e0c76ff43d..d7dd77e535 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 925e7ae3db..307797d0e3 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 d1ebaf5561..ced843f97e 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 35e3c5ad7a..afbf7a828d 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 73be079b20..5f864fd2ba 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -56,6 +56,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 92524b06ad..455d284c3f 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -61,6 +61,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 9582cdfb64..4489b21f96 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -56,6 +56,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 da10e29139..0a66b07fba 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -70,6 +70,7 @@
 	BOOTENV
 #endif
 
+#define CONFIG_USE_PREBOOT
 #define CONFIG_PREBOOT
 
 #endif
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index f76c7d18ef..0a612a642d 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 c07814f91b..f1ce7a0117 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -189,6 +189,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 fc1db2442e..9e0d5d45f5 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 5416c4b170..7fc1a95e8e 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 7d266d1bcd..ee3cf87327 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -273,6 +273,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/strider.h b/include/configs/strider.h
index 8b942e3446..525b548344 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -436,6 +436,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 7be94ee7d1..7d92c2177f 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -286,6 +286,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 a753d41835..c935577f5d 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 9685ee5059..f19218799d 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -42,6 +42,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 e0a033bec1..ac7ee2eda5 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 6d41d18493..d28978467b 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 69aa79bafc..3d48ab2352 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 0de40eddcb..fc0fe1504c 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 1ef803b020..710bcaeb1a 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -472,6 +472,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 5737cfee95..ee22042a81 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 0a87f226f8..c33a6e018a 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -322,6 +322,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 0389874609..f42987cf70 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -320,6 +320,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/zmx25.h b/include/configs/zmx25.h
index c8b6161a29..bc9419225f 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 62fbf8866f..364ffbc1b9 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -102,6 +102,7 @@
 #define CONFIG_ENV_OVERWRITE
 
 /* enable preboot to be loaded before CONFIG_BOOTDELAY */
+#define CONFIG_USE_PREBOOT
 #define CONFIG_PREBOOT
 
 /* Boot configuration */
-- 
2.39.5