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>
2024-11-24 21:54:01 +00:00 · 2019-07-20 20:51:13 -06:00 · 2019-07-20 20:51:13 -06:00 · b06da06dd4
commit b06da06dd4
parent 9f53146f39
59 changed files with 60 additions and 1 deletions
--- 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"
--- 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"
--- 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 */

--- 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 */

--- 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;"

 /*
--- 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
--- 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};"	\
--- 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 */
--- 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 */
--- 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) \
--- 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 */
--- 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						\
--- 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 */
--- 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"

--- 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 */
--- 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					\
--- 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"
--- 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"

--- 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 */

 /*
--- 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"
--- 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" \
--- 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

 /*
--- 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, \
--- 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, \
--- 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
--- 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 */
--- 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
--- 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; "		       \
--- 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
--- 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;" \
--- 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 \
--- 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;"
--- 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"

--- 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 */
--- 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 */
--- 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" \
--- 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
--- 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
--- 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
--- 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
--- 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 */
--- 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};" \
--- 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
--- 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}) => \" ; "	\
--- 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"
--- 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					\
--- 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

--- 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 " \
--- 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 ""
--- 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" \
--- 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 */
--- 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
--- 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, \
--- 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 */

--- 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 */
--- 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 */

--- 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 */

--- 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  ""


--- 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 */