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>

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 7640d7610d670f14c9d6d0d9c5ca882b5c13a278..b37f3a8727263456581b14af0a56f40ac36ddd9b 100644 (file)
--- 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 0da34d05afcb4d603f9dc6d8cf0f000e307740c1..0c2df7ec03399b67f51ed783ab9de50d68098252 100644 (file)
--- 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 cacd799aa212f3edb82eb3689c42d0c01da3716a..e9a9da3aedc86c89d2cb46a20089a76be1e21620 100644 (file)
--- 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 c2c5c1f668f2b1e409f451a897007ccc57999837..1b9dafa1a5a4c012977427a34ea5fc668be2794d 100644 (file)
--- 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 b7a7ec5ee0c71fb716b3088fb878ecd76c643eba..d7af4f91bcb2649a170308ec0b0a3985a12ca0c5 100644 (file)
--- 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 841f3616482b19e741c7b38ab0dd13b03b015633..0485e7a6d81c367a3ce8ba570007cf772b13aeb7 100644 (file)
--- 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 cc289244ff207f24970254f826322a2ae88a49ad..648a4db8f174f23ff2f589eefb414481d6aabe8a 100644 (file)
--- 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 05ebb7d9c5cf44a9bcc52275ca5221de6c42a6eb..76dc38766d481c3a658c28ff758adfeeb877bc45 100644 (file)
--- 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 0f293849ab01058e4d7ad20f556b5ef20a0c578f..0a8d41b8f6ddc40967f9e06ee066d61ff53f91a9 100644 (file)
--- 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 2e8dda8ab855761b05ba0cc6f5f85672fc881987..7b9640fb26e5f16817fbb8ace505243a4eedbc3c 100644 (file)
--- 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 94aa2736abddeb98c174eb2bbf4d88569264a4d5..1978074617fb47c93a9b3869569ae794081dd770 100644 (file)
--- 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 3affdb0f684a8ecaa4e1d33689dc7114d81807fd..f0f460aac9b6b066d49e2d8295afa32f05fe2ac5 100644 (file)
--- 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 f7bad8e1e9307f8713db6a6c15bbf7428eb6dfa7..d3a4a61c6c10edb9f14e3d947f4b83cb414c62fc 100644 (file)
--- 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 7269c42a5f6255e9800b61280bfd9df40a9ec786..2b44437ed3761f2e78a9cc056a4c30de2288cca4 100644 (file)
--- 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 02ceb4c8fc8b027866cf90095d4d6997502af02a..aec5d61c563675a8b601162104787c6878befd4b 100644 (file)
--- 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 6e6c1714ce99966ea4414935064f639a8cd804ca..31ce410448b597d4ebfca82d9c2ab58fd27d53ec 100644 (file)
--- 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 b1d01c58f977aa0db7c38162f1d60083f03431df..8bc8e00f98c944736b44103ee518e04521c2a4bf 100644 (file)
--- 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 e98dbfbb7ee1857eff0b721fea2bbd118ca1171b..0fe83be527ecdc6cc2947e138abeddfa45c2c1fc 100644 (file)
--- 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 a1fd5f61950b344ee4c2d72873d2e8b83d7108b7..6cf8c672eb6ad86b0cecdc941b10e8257d03ed42 100644 (file)
--- 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 d82a674270c033c832b5f98282de4090919fb7ef..7ced66774f6bc21848164cdb81582f437e306ea1 100644 (file)
--- 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 d1ab40ec13dd95ddddc2da5a96e5594ca6f4f5a7..f99bd71167d89f2d7f2394bf3b72319d74d5d09e 100644 (file)
--- 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 a8030931635186289842beb116b03aeb5e2fe8f5..6ee0443f1127d47883a74d3fee7a4b7620161e1a 100644 (file)
--- 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 10b94f438f1168df61534454fd837b52790da989..dbedad1a97bd45d0dd772c5b0ca4129efbb7018c 100644 (file)
--- 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 b28f3b94085ab695413d98759c062de11696a74c..29310147446fd130dadde68e3f31a772ebb46054 100644 (file)
--- 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 f5fd01de220aa2b45671db74f6c3e16563079b47..8e66a2bf679d4d22bbdeeb51e417c8b47a98fb52 100644 (file)
--- 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 ab61a07f963f25de8fb12d2572717cb9f0510ec1..fb57a2113c1afdbfbb1b3fde10e292ce68bbef85 100644 (file)
--- 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 4f179081a8a12fc4d50d56c7684b1ad739ad843a..6eca8b60278c8cdd1f8d69fe72e8429382d6d5de 100644 (file)
--- 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 7b4ae2102eb2d686727f2a1e5a67a62b2bf062cf..cde8fa210bc181bbe600a0e5ef57f20e503c68de 100644 (file)
--- 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 afaa90840629002369f8fab51856528de6326738..3709fa653790e08ee84c70ad0718b0f939c092cd 100644 (file)
--- 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 d9f4bdc1d64ff5907931298d2ca2d76ab0f84b91..43dfeeac32212af04df8486a0645ea3b569acf87 100644 (file)
--- 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 a2a6be7cf8db170b0630057f3ed8a0920fa2c9b5..0bf2df22eac84437c0f353c4c02339deed90beb4 100644 (file)
--- 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 1fbd371a5096dbc46083e43991fe2946eb0e2332..8b1773ea07681402c03754177efc9647c2413004 100644 (file)
--- 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 e0c76ff43daa005d34c972782e4ae77d6fba54a5..d7dd77e53575982935366285b17a85a62e8a2d68 100644 (file)
--- 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 925e7ae3dbc5d6d6c9bc8228f45f72828d8aa4c6..307797d0e3ea1292b92e9a7581a6648f21771b71 100644 (file)
--- 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 d1ebaf556159b04420ff62046cb93cdb1b1baa20..ced843f97e435bf71285d013a225740d6306f071 100644 (file)
--- 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 35e3c5ad7a8da0294c7d5e61d60732f251fd7f07..afbf7a828d8b59e0d1d6dce59519ebc795c85b58 100644 (file)
--- 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 73be079b20fe9125ca5da2cdf7db258318f42aad..5f864fd2bae990c80239e0e2d2b4e4a03222f170 100644 (file)
--- 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 92524b06adc663b830cd1dd33ad454b45336ab82..455d284c3f7c4c29322128ce08b17b7379fc7337 100644 (file)
--- 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 9582cdfb645d727039e72144d0f1110b0e8c6327..4489b21f96f0a3dd01c87ecd092cf72008274fd3 100644 (file)
--- 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 da10e291399172575c8633c19bc9771612a9d3f1..0a66b07fba25abd1d164521e76644108f24ca8da 100644 (file)
--- 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 f76c7d18ef068e4747d3def3dc5bbda04940fbed..0a612a642dd179cc7d6d5e9e6bb566eb9638b235 100644 (file)
--- 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 c07814f91b0f1a1c7763544f327536a7992cab8b..f1ce7a0117c2f56fac6a45e87b4605bd5b208fe6 100644 (file)
--- 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 fc1db2442eeabade2df877bb9e3a0c1227647e70..9e0d5d45f50c46b1178dcb1fa55ed6b8f7e6fe72 100644 (file)
--- 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 5416c4b170085ce1ab696f94312d053bdea1835b..7fc1a95e8e88400c42b1b11dac14e0686a09f7c1 100644 (file)
--- 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 7d266d1bcd52cbeba4780c318df71a539824ae79..ee3cf87327cfec36d582b204e4f8138c136a0b67 100644 (file)
--- 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 8b942e3446af5dd7a28b2f93113f1f7d20293d17..525b548344b0c72d4eeafed39b7c2af08421165b 100644 (file)
--- 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 7be94ee7d148ee7f295bb0beb9e3b2d79fd67646..7d92c2177ffe61dc8b18a2e117d04b7e8a70e516 100644 (file)
--- 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 a753d41835485e3ffa9749163d3d2fc9460c4b38..c935577f5d58b34ceb51707854fa0c93ec8c451c 100644 (file)
--- 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 9685ee5059abede014ee3089c76c65e769159685..f19218799d5c3a0d5e44a9f7f5a9849ae291b5b3 100644 (file)
--- 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 e0a033bec1c71711d61eedadfaa7bf5ad68d293c..ac7ee2eda5309b26a9899d9d27c4b437d7b54512 100644 (file)
--- 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 6d41d184932176b78d13f6f4e710531a16c534bd..d28978467b64f3d83df3a59302a31ef7c6de1e27 100644 (file)
--- 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 69aa79bafc88b9141682c169b4e7097b22325edf..3d48ab2352a792c5f581b37e5059bf1c23aa00d5 100644 (file)
--- 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 0de40eddcb5b1ec6545a06fff373c99874addd24..fc0fe1504ce98654b74c809b02f80807ff1ce218 100644 (file)
--- 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 1ef803b02040234579c2f9b2203e70c180756bfd..710bcaeb1ace4f455c0f56f2a8ccd12d61e3b822 100644 (file)
--- 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 5737cfee950cdde21aab0e485af593f9566385ff..ee22042a815ae2f621277267b6067d4f9efa4c1b 100644 (file)
--- 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 0a87f226f8d47d0bbcd965b64012ab22137b1ddb..c33a6e018a2cd5f694ceb47113127ef4f061284f 100644 (file)
--- 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 03898746091fefa67437663d93d6df57b56a4b9e..f42987cf701dbf07a4693b0b5c3f8b51e5015f8e 100644 (file)
--- 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 c8b6161a299f78e125d4047bf8cd6f2d3eb73708..bc9419225f92473e39d5c1c62716aeab0f2cff06 100644 (file)
--- 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 62fbf8866f0bfe2138e1f63ad411f969940cffce..364ffbc1b9643bc1cbbc8d097a48b8f86ae283c4 100644 (file)
--- 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 */