* [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code
@ 2019-07-21 2:51 Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 01/18] main: Use conditional run_preboot_environment_command() Simon Glass
` (19 more replies)
0 siblings, 20 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
This series cleans up autoboot.c a bit to:
- Convert options to Kconfig
- Use C code instead of C preprocessor where possible
- Add a few comments
Changes in v2:
- Rebase to master
Simon Glass (18):
main: Use conditional run_preboot_environment_command()
Convert CONFIG_SHOW_BOOT_PROGRESS to Kconfig
Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT
Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig
autoboot: Use CONFIG_AUTOBOOT_STOP_STR_SHA256 indirectly
autoboot: Drop #ifdef for CONFIG_AUTOBOOT_ENCRYPTION
autoboot: Improve docs for CONFIG_AUTOBOOT_ENCRYPTION
autoboot: Use if() for CONFIG_SILENT_CONSOLE
autoboot: Drop #ifdef CONFIG_AUTOBOOT_KEYED
autoboot: Drop unused CONFIG_MENUPROMPT
autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY
snow: Define CONFIG_AUTOBOOT_MENUKEY
autoboot: Tidy up use of menukey
autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOT
Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig
autoboot: Add comments for menu_show()
autoboot: Move a few more options from #ifdef to if()
autoboot: Adjust the implementation in autoboot_command()
README | 167 +-----------------
cmd/Kconfig | 34 +++-
cmd/bootmenu.c | 2 +-
common/Kconfig | 162 +++++++++++++++++
common/autoboot.c | 121 +++++++------
common/main.c | 5 +-
configs/A10-OLinuXino-Lime_defconfig | 1 +
configs/A10s-OLinuXino-M_defconfig | 1 +
configs/A13-OLinuXinoM_defconfig | 1 +
configs/A13-OLinuXino_defconfig | 1 +
configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
configs/A20-OLinuXino-Lime2_defconfig | 1 +
configs/A20-OLinuXino-Lime_defconfig | 1 +
configs/A20-OLinuXino_MICRO-eMMC_defconfig | 1 +
configs/A20-OLinuXino_MICRO_defconfig | 1 +
configs/A20-Olimex-SOM-EVB_defconfig | 1 +
configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 +
configs/A20-Olimex-SOM204-EVB_defconfig | 1 +
configs/A33-OLinuXino_defconfig | 1 +
configs/Ainol_AW1_defconfig | 1 +
configs/Ampe_A76_defconfig | 1 +
configs/Auxtek-T003_defconfig | 1 +
configs/Auxtek-T004_defconfig | 1 +
configs/Bananapi_M2_Ultra_defconfig | 1 +
configs/Bananapi_defconfig | 1 +
configs/Bananapi_m2m_defconfig | 1 +
configs/Bananapro_defconfig | 1 +
configs/CHIP_defconfig | 1 +
configs/CHIP_pro_defconfig | 1 +
configs/CSQ_CS908_defconfig | 1 +
configs/Chuwi_V7_CW0825_defconfig | 1 +
configs/Colombus_defconfig | 1 +
configs/Cubieboard2_defconfig | 1 +
configs/Cubieboard4_defconfig | 1 +
configs/Cubieboard_defconfig | 1 +
configs/Cubietruck_defconfig | 1 +
configs/Cubietruck_plus_defconfig | 1 +
configs/Empire_electronix_d709_defconfig | 1 +
configs/Empire_electronix_m712_defconfig | 1 +
configs/Hummingbird_A31_defconfig | 1 +
configs/Hyundai_A7HD_defconfig | 1 +
configs/Itead_Ibox_A20_defconfig | 1 +
configs/Lamobo_R1_defconfig | 1 +
configs/LicheePi_Zero_defconfig | 1 +
configs/Linksprite_pcDuino3_Nano_defconfig | 1 +
configs/Linksprite_pcDuino3_defconfig | 1 +
configs/Linksprite_pcDuino_defconfig | 1 +
configs/MK808C_defconfig | 1 +
configs/MPC8349EMDS_PCI64_defconfig | 2 +
configs/MPC8349EMDS_SLAVE_defconfig | 2 +
configs/MPC8349EMDS_defconfig | 2 +
configs/MSI_Primo73_defconfig | 1 +
configs/MSI_Primo81_defconfig | 1 +
configs/Marsboard_A10_defconfig | 1 +
configs/Mele_A1000G_quad_defconfig | 1 +
configs/Mele_A1000_defconfig | 1 +
configs/Mele_I7_defconfig | 1 +
configs/Mele_M3_defconfig | 1 +
configs/Mele_M5_defconfig | 1 +
configs/Mele_M9_defconfig | 1 +
configs/Merrii_A80_Optimus_defconfig | 1 +
configs/Mini-X_defconfig | 1 +
.../Nintendo_NES_Classic_Edition_defconfig | 1 +
configs/Orangepi_defconfig | 1 +
configs/Orangepi_mini_defconfig | 1 +
configs/Sinlinx_SinA31s_defconfig | 1 +
configs/Sinlinx_SinA33_defconfig | 1 +
configs/Sinovoip_BPI_M2_defconfig | 1 +
configs/Sinovoip_BPI_M3_defconfig | 1 +
configs/Sunchip_CX-A99_defconfig | 1 +
configs/TQM834x_defconfig | 2 +
configs/UTOO_P66_defconfig | 1 +
configs/Wexler_TAB7200_defconfig | 1 +
configs/Wits_Pro_A20_DKT_defconfig | 1 +
configs/Wobo_i5_defconfig | 1 +
configs/Yones_Toptech_BD1078_defconfig | 1 +
configs/Yones_Toptech_BS1078_V2_defconfig | 1 +
configs/a64-olinuxino_defconfig | 1 +
configs/am335x_shc_defconfig | 1 +
configs/am335x_shc_ict_defconfig | 1 +
configs/am335x_shc_netboot_defconfig | 1 +
configs/am335x_shc_sdboot_defconfig | 1 +
configs/amarula_a64_relic_defconfig | 1 +
configs/apf27_defconfig | 2 +
configs/arndale_defconfig | 1 +
configs/aspenite_defconfig | 1 +
configs/ba10_tv_box_defconfig | 1 +
configs/bananapi_m1_plus_defconfig | 1 +
configs/bananapi_m2_berry_defconfig | 1 +
configs/bananapi_m2_plus_h3_defconfig | 1 +
configs/bananapi_m2_plus_h5_defconfig | 1 +
configs/bananapi_m2_zero_defconfig | 1 +
configs/bananapi_m64_defconfig | 1 +
configs/bayleybay_defconfig | 1 +
configs/bcm7260_defconfig | 2 +
configs/bcm7445_defconfig | 2 +
configs/beelink_gs1_defconfig | 1 +
configs/beelink_x2_defconfig | 5 +-
configs/bitmain_antminer_s9_defconfig | 1 +
configs/bk4r1_defconfig | 1 +
configs/brppt1_mmc_defconfig | 2 +
configs/brppt1_nand_defconfig | 2 +
configs/brppt1_spi_defconfig | 4 +-
configs/brxre1_defconfig | 2 +
configs/cherryhill_defconfig | 1 +
configs/chromebit_mickey_defconfig | 2 +-
configs/chromebook_jerry_defconfig | 2 +-
configs/chromebook_link64_defconfig | 1 +
configs/chromebook_link_defconfig | 1 +
configs/chromebook_minnie_defconfig | 2 +-
configs/chromebook_samus_defconfig | 1 +
configs/chromebook_samus_tpl_defconfig | 1 +
configs/chromebook_speedy_defconfig | 2 +-
configs/chromebox_panther_defconfig | 1 +
configs/clearfog_defconfig | 1 +
configs/clearfog_gt_8k_defconfig | 1 +
configs/cm_fx6_defconfig | 2 +
configs/colorfly_e708_q1_defconfig | 1 +
...-qeval20-qa3-e3845-internal-uart_defconfig | 2 +
configs/conga-qeval20-qa3-e3845_defconfig | 2 +
configs/controlcenterdc_defconfig | 1 +
configs/coreboot_defconfig | 1 +
configs/cougarcanyon2_defconfig | 1 +
configs/crownbay_defconfig | 1 +
configs/crs305-1g-4s_defconfig | 3 +-
configs/d2net_v2_defconfig | 1 +
configs/db-88f6720_defconfig | 1 +
configs/db-88f6820-amc_defconfig | 1 +
configs/db-88f6820-gp_defconfig | 1 +
configs/db-mv784mp-gp_defconfig | 1 +
configs/db-xc3-24g4xg_defconfig | 1 +
configs/dfi-bt700-q7x-151_defconfig | 2 +
configs/difrnce_dit4350_defconfig | 1 +
configs/dns325_defconfig | 1 +
configs/dockstar_defconfig | 1 +
configs/draco_defconfig | 1 +
configs/dreamplug_defconfig | 1 +
configs/ds109_defconfig | 1 +
configs/ds414_defconfig | 2 +
configs/dserve_dsrv9703c_defconfig | 1 +
configs/efi-x86_app_defconfig | 1 +
configs/efi-x86_payload32_defconfig | 1 +
configs/efi-x86_payload64_defconfig | 1 +
configs/emlid_neutis_n5_devboard_defconfig | 1 +
configs/etamin_defconfig | 1 +
configs/evb-rk3036_defconfig | 1 +
configs/evb-rk3229_defconfig | 3 +-
configs/evb-rk3288_defconfig | 2 +-
configs/fennec-rk3288_defconfig | 2 +-
configs/firefly-rk3288_defconfig | 2 +-
configs/ga10h_v1_1_defconfig | 1 +
configs/galileo_defconfig | 1 +
configs/goflexhome_defconfig | 1 +
configs/gplugd_defconfig | 1 +
configs/gt90h_v4_defconfig | 1 +
configs/guruplug_defconfig | 1 +
configs/gwventana_emmc_defconfig | 1 +
configs/gwventana_gw5904_defconfig | 1 +
configs/gwventana_nand_defconfig | 1 +
configs/h8_homlet_v2_defconfig | 1 +
configs/helios4_defconfig | 1 +
configs/hrcon_defconfig | 1 +
configs/hrcon_dh_defconfig | 1 +
configs/i12-tvbox_defconfig | 1 +
configs/iNet_3F_defconfig | 1 +
configs/iNet_3W_defconfig | 1 +
configs/iNet_86VS_defconfig | 1 +
configs/iNet_D978_rev2_defconfig | 1 +
configs/ib62x0_defconfig | 1 +
configs/icnova-a20-swac_defconfig | 1 +
configs/iconnect_defconfig | 1 +
configs/ids8313_defconfig | 2 +
configs/inet1_defconfig | 1 +
configs/inet86dz_defconfig | 1 +
configs/inet97fv2_defconfig | 1 +
configs/inet98v_rev2_defconfig | 1 +
configs/inet9f_rev03_defconfig | 1 +
configs/inet_q972_defconfig | 1 +
configs/inetspace_v2_defconfig | 1 +
configs/jesurun_q5_defconfig | 1 +
configs/kylin-rk3036_defconfig | 1 +
configs/libretech-ac_defconfig | 2 +
configs/libretech_all_h3_cc_h2_plus_defconfig | 1 +
configs/libretech_all_h3_cc_h3_defconfig | 1 +
configs/libretech_all_h3_cc_h5_defconfig | 1 +
configs/lschlv2_defconfig | 2 +
configs/lsxhl_defconfig | 2 +
configs/m53menlo_defconfig | 2 +
configs/maxbcm_defconfig | 1 +
configs/meesc_dataflash_defconfig | 3 +-
configs/meesc_defconfig | 1 +
configs/microblaze-generic_defconfig | 2 +
configs/minnowmax_defconfig | 1 +
configs/miqi-rk3288_defconfig | 2 +-
configs/mixtile_loftq_defconfig | 1 +
configs/mk802_a10s_defconfig | 1 +
configs/mk802_defconfig | 1 +
configs/mk802ii_defconfig | 1 +
configs/mvebu_db-88f3720_defconfig | 1 +
configs/mvebu_db_armada8k_defconfig | 1 +
configs/mvebu_espressobin-88f3720_defconfig | 1 +
configs/mvebu_mcbin-88f8040_defconfig | 1 +
configs/mx51evk_defconfig | 1 +
configs/mx53cx9020_defconfig | 1 +
configs/mx53loco_defconfig | 1 +
configs/mx6cuboxi_defconfig | 2 +
configs/mx6qsabrelite_defconfig | 1 +
configs/nanopi_a64_defconfig | 1 +
configs/nanopi_m1_defconfig | 1 +
configs/nanopi_m1_plus_defconfig | 1 +
configs/nanopi_neo2_defconfig | 1 +
configs/nanopi_neo_air_defconfig | 1 +
configs/nanopi_neo_defconfig | 1 +
configs/nanopi_neo_plus2_defconfig | 1 +
configs/nas220_defconfig | 1 +
configs/net2big_v2_defconfig | 1 +
configs/netspace_lite_v2_defconfig | 1 +
configs/netspace_max_v2_defconfig | 1 +
configs/netspace_mini_v2_defconfig | 1 +
configs/netspace_v2_defconfig | 1 +
configs/nitrogen6dl2g_defconfig | 1 +
configs/nitrogen6dl_defconfig | 1 +
configs/nitrogen6q2g_defconfig | 1 +
configs/nitrogen6q_defconfig | 1 +
configs/nitrogen6s1g_defconfig | 1 +
configs/nitrogen6s_defconfig | 1 +
configs/nokia_rx51_defconfig | 3 +
configs/nsa310s_defconfig | 1 +
configs/oceanic_5205_5inmfd_defconfig | 1 +
configs/omap35_logic_defconfig | 2 +
configs/omap35_logic_somlv_defconfig | 2 +
configs/omap3_beagle_defconfig | 2 +
configs/omap3_evm_defconfig | 1 +
configs/omap3_logic_defconfig | 2 +
configs/omap3_logic_somlv_defconfig | 2 +
configs/openrd_base_defconfig | 1 +
configs/openrd_client_defconfig | 1 +
configs/openrd_ultimate_defconfig | 1 +
configs/opos6uldev_defconfig | 2 +
configs/orangepi_2_defconfig | 1 +
configs/orangepi_lite2_defconfig | 1 +
configs/orangepi_lite_defconfig | 1 +
configs/orangepi_one_defconfig | 1 +
configs/orangepi_one_plus_defconfig | 1 +
configs/orangepi_pc2_defconfig | 1 +
configs/orangepi_pc_defconfig | 1 +
configs/orangepi_pc_plus_defconfig | 1 +
configs/orangepi_plus2e_defconfig | 1 +
configs/orangepi_plus_defconfig | 1 +
configs/orangepi_prime_defconfig | 1 +
configs/orangepi_r1_defconfig | 1 +
configs/orangepi_win_defconfig | 1 +
configs/orangepi_zero_defconfig | 1 +
configs/orangepi_zero_plus2_defconfig | 1 +
configs/orangepi_zero_plus_defconfig | 1 +
configs/ot1200_defconfig | 1 +
configs/ot1200_spl_defconfig | 1 +
configs/parrot_r16_defconfig | 1 +
configs/phycore-rk3288_defconfig | 2 +-
configs/pine64-lts_defconfig | 1 +
configs/pine64_plus_defconfig | 1 +
configs/pine_h64_defconfig | 3 +-
configs/pinebook_defconfig | 1 +
configs/platinum_picon_defconfig | 1 +
configs/platinum_titanium_defconfig | 1 +
configs/pogo_e02_defconfig | 1 +
configs/polaroid_mid2407pxe03_defconfig | 1 +
configs/polaroid_mid2809pxe04_defconfig | 1 +
configs/popmetal-rk3288_defconfig | 2 +-
configs/pov_protab2_ips9_defconfig | 1 +
configs/pxm2_defconfig | 1 +
configs/q8_a13_tablet_defconfig | 1 +
configs/q8_a23_tablet_800x480_defconfig | 1 +
configs/q8_a33_tablet_1024x600_defconfig | 1 +
configs/q8_a33_tablet_800x480_defconfig | 1 +
configs/qemu-x86_64_defconfig | 1 +
configs/qemu-x86_defconfig | 1 +
configs/qemu_arm64_defconfig | 2 +
configs/qemu_arm_defconfig | 2 +
configs/r7-tv-dongle_defconfig | 1 +
configs/rastaban_defconfig | 1 +
configs/rock2_defconfig | 2 +-
configs/rock_defconfig | 1 +
configs/rpi_0_w_defconfig | 2 +
configs/rpi_2_defconfig | 2 +
configs/rpi_3_32b_defconfig | 2 +
configs/rpi_3_b_plus_defconfig | 4 +-
configs/rpi_3_defconfig | 2 +
configs/rpi_defconfig | 2 +
configs/rut_defconfig | 1 +
configs/seaboard_defconfig | 2 +
configs/sheevaplug_defconfig | 1 +
configs/snow_defconfig | 2 +
configs/socfpga_dbm_soc1_defconfig | 2 +
configs/socfpga_vining_fpga_defconfig | 2 +
configs/socrates_defconfig | 2 +
configs/som-db5800-som-6867_defconfig | 1 +
configs/sopine_baseboard_defconfig | 1 +
configs/strider_con_defconfig | 1 +
configs/strider_con_dp_defconfig | 1 +
configs/strider_cpu_defconfig | 1 +
configs/strider_cpu_dp_defconfig | 1 +
configs/sun8i_a23_evb_defconfig | 1 +
configs/sunxi_Gemei_G9_defconfig | 1 +
configs/syzygy_hub_defconfig | 1 +
configs/tbs2910_defconfig | 2 +
configs/tbs_a711_defconfig | 1 +
configs/teres_i_defconfig | 1 +
...able-x86-conga-qa3-e3845-pcie-x4_defconfig | 2 +
.../theadorable-x86-conga-qa3-e3845_defconfig | 2 +
configs/theadorable-x86-dfi-bt700_defconfig | 2 +
configs/theadorable_debug_defconfig | 1 +
configs/thuban_defconfig | 1 +
configs/tinker-rk3288_defconfig | 2 +-
configs/topic_miami_defconfig | 1 +
configs/topic_miamilite_defconfig | 1 +
configs/topic_miamiplus_defconfig | 1 +
configs/turris_mox_defconfig | 1 +
configs/turris_omnia_defconfig | 1 +
configs/uDPU_defconfig | 1 +
configs/ventana_defconfig | 2 +
configs/vyasa-rk3288_defconfig | 2 +-
configs/xpedite517x_defconfig | 1 +
configs/xpedite520x_defconfig | 1 +
configs/xpedite537x_defconfig | 1 +
configs/xpedite550x_defconfig | 1 +
configs/xtfpga_defconfig | 1 +
configs/zmx25_defconfig | 1 +
configs/zynq_cc108_defconfig | 1 +
configs/zynq_cse_nand_defconfig | 1 +
configs/zynq_cse_nor_defconfig | 1 +
configs/zynq_cse_qspi_defconfig | 1 +
configs/zynq_dlc20_rev1_0_defconfig | 1 +
configs/zynq_microzed_defconfig | 1 +
configs/zynq_minized_defconfig | 1 +
configs/zynq_picozed_defconfig | 1 +
configs/zynq_z_turn_defconfig | 1 +
configs/zynq_zc702_defconfig | 1 +
configs/zynq_zc706_defconfig | 1 +
configs/zynq_zc770_xm010_defconfig | 1 +
configs/zynq_zc770_xm011_defconfig | 1 +
configs/zynq_zc770_xm011_x16_defconfig | 1 +
configs/zynq_zc770_xm012_defconfig | 1 +
configs/zynq_zc770_xm013_defconfig | 1 +
configs/zynq_zed_defconfig | 1 +
configs/zynq_zybo_defconfig | 1 +
configs/zynq_zybo_z7_defconfig | 1 +
doc/README.autoboot | 23 +++
doc/README.bootmenu | 2 +-
doc/README.menu | 2 +-
include/autoboot.h | 2 +-
include/configs/MPC8349EMDS.h | 4 -
include/configs/MPC8349EMDS_SDRAM.h | 4 -
include/configs/MigoR.h | 1 -
include/configs/TQM834x.h | 4 -
include/configs/am335x_shc.h | 2 -
include/configs/am3517_crane.h | 9 -
include/configs/am3517_evm.h | 12 --
include/configs/apf27.h | 1 -
include/configs/armadillo-800eva.h | 2 -
include/configs/arndale.h | 2 -
include/configs/bcmstb.h | 4 -
include/configs/bk4r1.h | 1 -
include/configs/bur_cfg_common.h | 2 -
include/configs/cm_fx6.h | 2 -
include/configs/conga-qeval20-qa3-e3845.h | 2 -
include/configs/controlcenterdc.h | 2 -
include/configs/dfi-bt700.h | 2 -
include/configs/ds414.h | 2 -
include/configs/gazerbeam.h | 2 -
include/configs/gw_ventana.h | 1 -
include/configs/hrcon.h | 2 -
include/configs/ids8313.h | 3 -
include/configs/kzm9g.h | 2 -
include/configs/lsxl.h | 1 -
include/configs/m53menlo.h | 1 -
include/configs/meesc.h | 2 -
include/configs/meson64.h | 1 -
include/configs/microblaze-generic.h | 2 -
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 | 11 --
include/configs/nitrogen6x.h | 2 -
include/configs/nokia_rx51.h | 26 ---
include/configs/omap3_beagle.h | 2 -
include/configs/omap3_logic.h | 4 -
include/configs/opos6uldev.h | 1 -
include/configs/ot1200.h | 2 -
include/configs/platinum.h | 1 -
include/configs/qemu-arm.h | 1 -
include/configs/qemu-riscv.h | 4 -
include/configs/rcar-gen2-common.h | 2 -
include/configs/rcar-gen3-common.h | 2 -
include/configs/rk3036_common.h | 2 -
include/configs/rk3188_common.h | 2 -
include/configs/rk322x_common.h | 2 -
include/configs/rk3288_common.h | 2 -
include/configs/rpi.h | 1 -
include/configs/sbc8548.h | 2 -
include/configs/sh7752evb.h | 1 -
include/configs/sh7753evb.h | 1 -
include/configs/sh7757lcr.h | 1 -
include/configs/sh7763rdp.h | 1 -
include/configs/siemens-am33x-common.h | 1 -
include/configs/socfpga_dbm_soc1.h | 1 -
include/configs/socfpga_mcvevk.h | 1 -
include/configs/socfpga_vining_fpga.h | 10 --
include/configs/socrates.h | 5 -
include/configs/strider.h | 2 -
include/configs/sunxi-common.h | 4 -
include/configs/tbs2910.h | 9 -
include/configs/tegra-common-post.h | 1 -
include/configs/theadorable-x86-common.h | 2 -
include/configs/theadorable.h | 2 -
include/configs/topic_miami.h | 2 -
include/configs/turris_mox.h | 1 -
include/configs/vexpress_aemv8a.h | 2 -
include/configs/x86-common.h | 1 -
include/configs/xpedite517x.h | 1 -
include/configs/xpedite520x.h | 1 -
include/configs/xpedite537x.h | 1 -
include/configs/xpedite550x.h | 1 -
include/configs/xtfpga.h | 1 -
include/configs/zmx25.h | 2 -
include/configs/zynq-common.h | 1 -
include/menu.h | 17 +-
scripts/config_whitelist.txt | 5 +-
431 files changed, 709 insertions(+), 458 deletions(-)
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 01/18] main: Use conditional run_preboot_environment_command()
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 02/18] Convert CONFIG_SHOW_BOOT_PROGRESS to Kconfig Simon Glass
` (18 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
The function name indicates that it does something, but its entire
operation is actually condition on a CONFIG. Move the condition outside
the function so this is clearer, and use if() instead of #ifdef, like the
reset of the file.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
common/main.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/common/main.c b/common/main.c
index 07b34bf2b0..ce39c8d189 100644
--- a/common/main.c
+++ b/common/main.c
@@ -19,7 +19,6 @@ __weak void show_boot_progress(int val) {}
static void run_preboot_environment_command(void)
{
-#ifdef CONFIG_PREBOOT
char *p;
p = env_get("preboot");
@@ -34,7 +33,6 @@ static void run_preboot_environment_command(void)
if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
disable_ctrlc(prev); /* restore Ctrl-C checking */
}
-#endif /* CONFIG_PREBOOT */
}
/* We come here after U-Boot is initialised and ready to process commands */
@@ -49,7 +47,8 @@ void main_loop(void)
cli_init();
- run_preboot_environment_command();
+ if (IS_ENABLED(CONFIG_USE_PREBOOT))
+ run_preboot_environment_command();
if (IS_ENABLED(CONFIG_UPDATE_TFTP))
update_tftp(0UL, NULL, NULL);
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 02/18] Convert CONFIG_SHOW_BOOT_PROGRESS to Kconfig
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 01/18] main: Use conditional run_preboot_environment_command() Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 03/18] Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT Simon Glass
` (17 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_SHOW_BOOT_PROGRESS
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
README | 165 ------------------
common/Kconfig | 162 +++++++++++++++++
configs/am335x_shc_defconfig | 1 +
configs/am335x_shc_ict_defconfig | 1 +
configs/am335x_shc_netboot_defconfig | 1 +
configs/am335x_shc_sdboot_defconfig | 1 +
configs/bayleybay_defconfig | 1 +
configs/cherryhill_defconfig | 1 +
configs/chromebook_link64_defconfig | 1 +
configs/chromebook_link_defconfig | 1 +
configs/chromebook_samus_defconfig | 1 +
configs/chromebook_samus_tpl_defconfig | 1 +
configs/chromebox_panther_defconfig | 1 +
...-qeval20-qa3-e3845-internal-uart_defconfig | 1 +
configs/conga-qeval20-qa3-e3845_defconfig | 1 +
configs/coreboot_defconfig | 1 +
configs/cougarcanyon2_defconfig | 1 +
configs/crownbay_defconfig | 1 +
configs/dfi-bt700-q7x-151_defconfig | 1 +
configs/efi-x86_app_defconfig | 1 +
configs/efi-x86_payload32_defconfig | 1 +
configs/efi-x86_payload64_defconfig | 1 +
configs/galileo_defconfig | 1 +
configs/lschlv2_defconfig | 1 +
configs/lsxhl_defconfig | 1 +
configs/minnowmax_defconfig | 1 +
configs/qemu-x86_64_defconfig | 1 +
configs/qemu-x86_defconfig | 1 +
configs/som-db5800-som-6867_defconfig | 1 +
...able-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 +
.../theadorable-x86-conga-qa3-e3845_defconfig | 1 +
configs/theadorable-x86-dfi-bt700_defconfig | 1 +
configs/xtfpga_defconfig | 1 +
include/configs/MigoR.h | 1 -
include/configs/am335x_shc.h | 2 -
include/configs/armadillo-800eva.h | 2 -
include/configs/kzm9g.h | 2 -
include/configs/lsxl.h | 1 -
include/configs/rcar-gen2-common.h | 2 -
include/configs/rcar-gen3-common.h | 2 -
include/configs/sbc8548.h | 2 -
include/configs/sh7752evb.h | 1 -
include/configs/sh7753evb.h | 1 -
include/configs/sh7757lcr.h | 1 -
include/configs/sh7763rdp.h | 1 -
include/configs/x86-common.h | 1 -
include/configs/xtfpga.h | 1 -
scripts/config_whitelist.txt | 1 -
48 files changed, 193 insertions(+), 186 deletions(-)
diff --git a/README b/README
index 8f816ad2af..f513af0b67 100644
--- a/README
+++ b/README
@@ -2138,171 +2138,6 @@ The following options need to be configured:
A better solution is to properly configure the firewall,
but sometimes that is not allowed.
-- Show boot progress:
- CONFIG_SHOW_BOOT_PROGRESS
-
- Defining this option allows to add some board-
- specific code (calling a user-provided function
- "show_boot_progress(int)") that enables you to show
- the system's boot progress on some display (for
- example, some LED's) on your board. At the moment,
- the following checkpoints are implemented:
-
-
-Legacy uImage format:
-
- Arg Where When
- 1 common/cmd_bootm.c before attempting to boot an image
- -1 common/cmd_bootm.c Image header has bad magic number
- 2 common/cmd_bootm.c Image header has correct magic number
- -2 common/cmd_bootm.c Image header has bad checksum
- 3 common/cmd_bootm.c Image header has correct checksum
- -3 common/cmd_bootm.c Image data has bad checksum
- 4 common/cmd_bootm.c Image data has correct checksum
- -4 common/cmd_bootm.c Image is for unsupported architecture
- 5 common/cmd_bootm.c Architecture check OK
- -5 common/cmd_bootm.c Wrong Image Type (not kernel, multi)
- 6 common/cmd_bootm.c Image Type check OK
- -6 common/cmd_bootm.c gunzip uncompression error
- -7 common/cmd_bootm.c Unimplemented compression type
- 7 common/cmd_bootm.c Uncompression OK
- 8 common/cmd_bootm.c No uncompress/copy overwrite error
- -9 common/cmd_bootm.c Unsupported OS (not Linux, BSD, VxWorks, QNX)
-
- 9 common/image.c Start initial ramdisk verification
- -10 common/image.c Ramdisk header has bad magic number
- -11 common/image.c Ramdisk header has bad checksum
- 10 common/image.c Ramdisk header is OK
- -12 common/image.c Ramdisk data has bad checksum
- 11 common/image.c Ramdisk data has correct checksum
- 12 common/image.c Ramdisk verification complete, start loading
- -13 common/image.c Wrong Image Type (not PPC Linux ramdisk)
- 13 common/image.c Start multifile image verification
- 14 common/image.c No initial ramdisk, no multifile, continue.
-
- 15 arch/<arch>/lib/bootm.c All preparation done, transferring control to OS
-
- -30 arch/powerpc/lib/board.c Fatal error, hang the system
- -31 post/post.c POST test failed, detected by post_output_backlog()
- -32 post/post.c POST test failed, detected by post_run_single()
-
- 34 common/cmd_doc.c before loading a Image from a DOC device
- -35 common/cmd_doc.c Bad usage of "doc" command
- 35 common/cmd_doc.c correct usage of "doc" command
- -36 common/cmd_doc.c No boot device
- 36 common/cmd_doc.c correct boot device
- -37 common/cmd_doc.c Unknown Chip ID on boot device
- 37 common/cmd_doc.c correct chip ID found, device available
- -38 common/cmd_doc.c Read Error on boot device
- 38 common/cmd_doc.c reading Image header from DOC device OK
- -39 common/cmd_doc.c Image header has bad magic number
- 39 common/cmd_doc.c Image header has correct magic number
- -40 common/cmd_doc.c Error reading Image from DOC device
- 40 common/cmd_doc.c Image header has correct magic number
- 41 common/cmd_ide.c before loading a Image from a IDE device
- -42 common/cmd_ide.c Bad usage of "ide" command
- 42 common/cmd_ide.c correct usage of "ide" command
- -43 common/cmd_ide.c No boot device
- 43 common/cmd_ide.c boot device found
- -44 common/cmd_ide.c Device not available
- 44 common/cmd_ide.c Device available
- -45 common/cmd_ide.c wrong partition selected
- 45 common/cmd_ide.c partition selected
- -46 common/cmd_ide.c Unknown partition table
- 46 common/cmd_ide.c valid partition table found
- -47 common/cmd_ide.c Invalid partition type
- 47 common/cmd_ide.c correct partition type
- -48 common/cmd_ide.c Error reading Image Header on boot device
- 48 common/cmd_ide.c reading Image Header from IDE device OK
- -49 common/cmd_ide.c Image header has bad magic number
- 49 common/cmd_ide.c Image header has correct magic number
- -50 common/cmd_ide.c Image header has bad checksum
- 50 common/cmd_ide.c Image header has correct checksum
- -51 common/cmd_ide.c Error reading Image from IDE device
- 51 common/cmd_ide.c reading Image from IDE device OK
- 52 common/cmd_nand.c before loading a Image from a NAND device
- -53 common/cmd_nand.c Bad usage of "nand" command
- 53 common/cmd_nand.c correct usage of "nand" command
- -54 common/cmd_nand.c No boot device
- 54 common/cmd_nand.c boot device found
- -55 common/cmd_nand.c Unknown Chip ID on boot device
- 55 common/cmd_nand.c correct chip ID found, device available
- -56 common/cmd_nand.c Error reading Image Header on boot device
- 56 common/cmd_nand.c reading Image Header from NAND device OK
- -57 common/cmd_nand.c Image header has bad magic number
- 57 common/cmd_nand.c Image header has correct magic number
- -58 common/cmd_nand.c Error reading Image from NAND device
- 58 common/cmd_nand.c reading Image from NAND device OK
-
- -60 common/env_common.c Environment has a bad CRC, using default
-
- 64 net/eth.c starting with Ethernet configuration.
- -64 net/eth.c no Ethernet found.
- 65 net/eth.c Ethernet found.
-
- -80 common/cmd_net.c usage wrong
- 80 common/cmd_net.c before calling net_loop()
- -81 common/cmd_net.c some error in net_loop() occurred
- 81 common/cmd_net.c net_loop() back without error
- -82 common/cmd_net.c size == 0 (File with size 0 loaded)
- 82 common/cmd_net.c trying automatic boot
- 83 common/cmd_net.c running "source" command
- -83 common/cmd_net.c some error in automatic boot or "source" command
- 84 common/cmd_net.c end without errors
-
-FIT uImage format:
-
- Arg Where When
- 100 common/cmd_bootm.c Kernel FIT Image has correct format
- -100 common/cmd_bootm.c Kernel FIT Image has incorrect format
- 101 common/cmd_bootm.c No Kernel subimage unit name, using configuration
- -101 common/cmd_bootm.c Can't get configuration for kernel subimage
- 102 common/cmd_bootm.c Kernel unit name specified
- -103 common/cmd_bootm.c Can't get kernel subimage node offset
- 103 common/cmd_bootm.c Found configuration node
- 104 common/cmd_bootm.c Got kernel subimage node offset
- -104 common/cmd_bootm.c Kernel subimage hash verification failed
- 105 common/cmd_bootm.c Kernel subimage hash verification OK
- -105 common/cmd_bootm.c Kernel subimage is for unsupported architecture
- 106 common/cmd_bootm.c Architecture check OK
- -106 common/cmd_bootm.c Kernel subimage has wrong type
- 107 common/cmd_bootm.c Kernel subimage type OK
- -107 common/cmd_bootm.c Can't get kernel subimage data/size
- 108 common/cmd_bootm.c Got kernel subimage data/size
- -108 common/cmd_bootm.c Wrong image type (not legacy, FIT)
- -109 common/cmd_bootm.c Can't get kernel subimage type
- -110 common/cmd_bootm.c Can't get kernel subimage comp
- -111 common/cmd_bootm.c Can't get kernel subimage os
- -112 common/cmd_bootm.c Can't get kernel subimage load address
- -113 common/cmd_bootm.c Image uncompress/copy overwrite error
-
- 120 common/image.c Start initial ramdisk verification
- -120 common/image.c Ramdisk FIT image has incorrect format
- 121 common/image.c Ramdisk FIT image has correct format
- 122 common/image.c No ramdisk subimage unit name, using configuration
- -122 common/image.c Can't get configuration for ramdisk subimage
- 123 common/image.c Ramdisk unit name specified
- -124 common/image.c Can't get ramdisk subimage node offset
- 125 common/image.c Got ramdisk subimage node offset
- -125 common/image.c Ramdisk subimage hash verification failed
- 126 common/image.c Ramdisk subimage hash verification OK
- -126 common/image.c Ramdisk subimage for unsupported architecture
- 127 common/image.c Architecture check OK
- -127 common/image.c Can't get ramdisk subimage data/size
- 128 common/image.c Got ramdisk subimage data/size
- 129 common/image.c Can't get ramdisk load address
- -129 common/image.c Got ramdisk load address
-
- -130 common/cmd_doc.c Incorrect FIT image format
- 131 common/cmd_doc.c FIT image format OK
-
- -140 common/cmd_ide.c Incorrect FIT image format
- 141 common/cmd_ide.c FIT image format OK
-
- -150 common/cmd_nand.c Incorrect FIT image format
- 151 common/cmd_nand.c FIT image format OK
-
-- Standalone program support:
CONFIG_STANDALONE_LOAD_ADDR
This option defines a board specific value for the
diff --git a/common/Kconfig b/common/Kconfig
index 4865a4dfc8..df50b1d46c 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -125,6 +125,168 @@ config BOOTSTAGE_STASH_SIZE
This should be large enough to hold the bootstage stash. A value of
4096 (4KiB) is normally plenty.
+config SHOW_BOOT_PROGRESS
+ bool "Show boot progress in a board-specific manner"
+ help
+ Defining this option allows to add some board-specific code (calling
+ a user-provided function show_boot_progress(int) that enables you to
+ show the system's boot progress on some display (for example, some
+ LEDs) on your board. At the moment, the following checkpoints are
+ implemented:
+
+ Legacy uImage format:
+
+ Arg Where When
+ 1 common/cmd_bootm.c before attempting to boot an image
+ -1 common/cmd_bootm.c Image header has bad magic number
+ 2 common/cmd_bootm.c Image header has correct magic number
+ -2 common/cmd_bootm.c Image header has bad checksum
+ 3 common/cmd_bootm.c Image header has correct checksum
+ -3 common/cmd_bootm.c Image data has bad checksum
+ 4 common/cmd_bootm.c Image data has correct checksum
+ -4 common/cmd_bootm.c Image is for unsupported architecture
+ 5 common/cmd_bootm.c Architecture check OK
+ -5 common/cmd_bootm.c Wrong Image Type (not kernel, multi)
+ 6 common/cmd_bootm.c Image Type check OK
+ -6 common/cmd_bootm.c gunzip uncompression error
+ -7 common/cmd_bootm.c Unimplemented compression type
+ 7 common/cmd_bootm.c Uncompression OK
+ 8 common/cmd_bootm.c No uncompress/copy overwrite error
+ -9 common/cmd_bootm.c Unsupported OS (not Linux, BSD, VxWorks, QNX)
+
+ 9 common/image.c Start initial ramdisk verification
+ -10 common/image.c Ramdisk header has bad magic number
+ -11 common/image.c Ramdisk header has bad checksum
+ 10 common/image.c Ramdisk header is OK
+ -12 common/image.c Ramdisk data has bad checksum
+ 11 common/image.c Ramdisk data has correct checksum
+ 12 common/image.c Ramdisk verification complete, start loading
+ -13 common/image.c Wrong Image Type (not PPC Linux ramdisk)
+ 13 common/image.c Start multifile image verification
+ 14 common/image.c No initial ramdisk, no multifile, continue.
+
+ 15 arch/<arch>/lib/bootm.c All preparation done, transferring control to OS
+
+ -30 arch/powerpc/lib/board.c Fatal error, hang the system
+ -31 post/post.c POST test failed, detected by post_output_backlog()
+ -32 post/post.c POST test failed, detected by post_run_single()
+
+ 34 common/cmd_doc.c before loading a Image from a DOC device
+ -35 common/cmd_doc.c Bad usage of "doc" command
+ 35 common/cmd_doc.c correct usage of "doc" command
+ -36 common/cmd_doc.c No boot device
+ 36 common/cmd_doc.c correct boot device
+ -37 common/cmd_doc.c Unknown Chip ID on boot device
+ 37 common/cmd_doc.c correct chip ID found, device available
+ -38 common/cmd_doc.c Read Error on boot device
+ 38 common/cmd_doc.c reading Image header from DOC device OK
+ -39 common/cmd_doc.c Image header has bad magic number
+ 39 common/cmd_doc.c Image header has correct magic number
+ -40 common/cmd_doc.c Error reading Image from DOC device
+ 40 common/cmd_doc.c Image header has correct magic number
+ 41 common/cmd_ide.c before loading a Image from a IDE device
+ -42 common/cmd_ide.c Bad usage of "ide" command
+ 42 common/cmd_ide.c correct usage of "ide" command
+ -43 common/cmd_ide.c No boot device
+ 43 common/cmd_ide.c boot device found
+ -44 common/cmd_ide.c Device not available
+ 44 common/cmd_ide.c Device available
+ -45 common/cmd_ide.c wrong partition selected
+ 45 common/cmd_ide.c partition selected
+ -46 common/cmd_ide.c Unknown partition table
+ 46 common/cmd_ide.c valid partition table found
+ -47 common/cmd_ide.c Invalid partition type
+ 47 common/cmd_ide.c correct partition type
+ -48 common/cmd_ide.c Error reading Image Header on boot device
+ 48 common/cmd_ide.c reading Image Header from IDE device OK
+ -49 common/cmd_ide.c Image header has bad magic number
+ 49 common/cmd_ide.c Image header has correct magic number
+ -50 common/cmd_ide.c Image header has bad checksum
+ 50 common/cmd_ide.c Image header has correct checksum
+ -51 common/cmd_ide.c Error reading Image from IDE device
+ 51 common/cmd_ide.c reading Image from IDE device OK
+ 52 common/cmd_nand.c before loading a Image from a NAND device
+ -53 common/cmd_nand.c Bad usage of "nand" command
+ 53 common/cmd_nand.c correct usage of "nand" command
+ -54 common/cmd_nand.c No boot device
+ 54 common/cmd_nand.c boot device found
+ -55 common/cmd_nand.c Unknown Chip ID on boot device
+ 55 common/cmd_nand.c correct chip ID found, device available
+ -56 common/cmd_nand.c Error reading Image Header on boot device
+ 56 common/cmd_nand.c reading Image Header from NAND device OK
+ -57 common/cmd_nand.c Image header has bad magic number
+ 57 common/cmd_nand.c Image header has correct magic number
+ -58 common/cmd_nand.c Error reading Image from NAND device
+ 58 common/cmd_nand.c reading Image from NAND device OK
+
+ -60 common/env_common.c Environment has a bad CRC, using default
+
+ 64 net/eth.c starting with Ethernet configuration.
+ -64 net/eth.c no Ethernet found.
+ 65 net/eth.c Ethernet found.
+
+ -80 common/cmd_net.c usage wrong
+ 80 common/cmd_net.c before calling net_loop()
+ -81 common/cmd_net.c some error in net_loop() occurred
+ 81 common/cmd_net.c net_loop() back without error
+ -82 common/cmd_net.c size == 0 (File with size 0 loaded)
+ 82 common/cmd_net.c trying automatic boot
+ 83 common/cmd_net.c running "source" command
+ -83 common/cmd_net.c some error in automatic boot or "source" command
+ 84 common/cmd_net.c end without errors
+
+ FIT uImage format:
+
+ Arg Where When
+ 100 common/cmd_bootm.c Kernel FIT Image has correct format
+ -100 common/cmd_bootm.c Kernel FIT Image has incorrect format
+ 101 common/cmd_bootm.c No Kernel subimage unit name, using configuration
+ -101 common/cmd_bootm.c Can't get configuration for kernel subimage
+ 102 common/cmd_bootm.c Kernel unit name specified
+ -103 common/cmd_bootm.c Can't get kernel subimage node offset
+ 103 common/cmd_bootm.c Found configuration node
+ 104 common/cmd_bootm.c Got kernel subimage node offset
+ -104 common/cmd_bootm.c Kernel subimage hash verification failed
+ 105 common/cmd_bootm.c Kernel subimage hash verification OK
+ -105 common/cmd_bootm.c Kernel subimage is for unsupported architecture
+ 106 common/cmd_bootm.c Architecture check OK
+ -106 common/cmd_bootm.c Kernel subimage has wrong type
+ 107 common/cmd_bootm.c Kernel subimage type OK
+ -107 common/cmd_bootm.c Can't get kernel subimage data/size
+ 108 common/cmd_bootm.c Got kernel subimage data/size
+ -108 common/cmd_bootm.c Wrong image type (not legacy, FIT)
+ -109 common/cmd_bootm.c Can't get kernel subimage type
+ -110 common/cmd_bootm.c Can't get kernel subimage comp
+ -111 common/cmd_bootm.c Can't get kernel subimage os
+ -112 common/cmd_bootm.c Can't get kernel subimage load address
+ -113 common/cmd_bootm.c Image uncompress/copy overwrite error
+
+ 120 common/image.c Start initial ramdisk verification
+ -120 common/image.c Ramdisk FIT image has incorrect format
+ 121 common/image.c Ramdisk FIT image has correct format
+ 122 common/image.c No ramdisk subimage unit name, using configuration
+ -122 common/image.c Can't get configuration for ramdisk subimage
+ 123 common/image.c Ramdisk unit name specified
+ -124 common/image.c Can't get ramdisk subimage node offset
+ 125 common/image.c Got ramdisk subimage node offset
+ -125 common/image.c Ramdisk subimage hash verification failed
+ 126 common/image.c Ramdisk subimage hash verification OK
+ -126 common/image.c Ramdisk subimage for unsupported architecture
+ 127 common/image.c Architecture check OK
+ -127 common/image.c Can't get ramdisk subimage data/size
+ 128 common/image.c Got ramdisk subimage data/size
+ 129 common/image.c Can't get ramdisk load address
+ -129 common/image.c Got ramdisk load address
+
+ -130 common/cmd_doc.c Incorrect FIT image format
+ 131 common/cmd_doc.c FIT image format OK
+
+ -140 common/cmd_ide.c Incorrect FIT image format
+ 141 common/cmd_ide.c FIT image format OK
+
+ -150 common/cmd_nand.c Incorrect FIT image format
+ 151 common/cmd_nand.c FIT image format OK
+
endmenu
menu "Boot media"
diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig
index aa4caf6534..972fc0ad22 100644
--- a/configs/am335x_shc_defconfig
+++ b/configs/am335x_shc_defconfig
@@ -14,6 +14,7 @@ CONFIG_SPL_FS_FAT=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SERIES=y
CONFIG_DISTRO_DEFAULTS=y
+CONFIG_SHOW_BOOT_PROGRESS=y
# CONFIG_USE_BOOTCOMMAND is not set
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="am335x-shc"
diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig
index 2083857b8d..9a68ae47b0 100644
--- a/configs/am335x_shc_ict_defconfig
+++ b/configs/am335x_shc_ict_defconfig
@@ -15,6 +15,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SHC_ICT=y
CONFIG_SERIES=y
CONFIG_DISTRO_DEFAULTS=y
+CONFIG_SHOW_BOOT_PROGRESS=y
# CONFIG_USE_BOOTCOMMAND is not set
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="am335x-shc"
diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig
index fdb22afb9e..c526cd568c 100644
--- a/configs/am335x_shc_netboot_defconfig
+++ b/configs/am335x_shc_netboot_defconfig
@@ -15,6 +15,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SHC_NETBOOT=y
CONFIG_SERIES=y
CONFIG_DISTRO_DEFAULTS=y
+CONFIG_SHOW_BOOT_PROGRESS=y
# CONFIG_USE_BOOTCOMMAND is not set
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="am335x-shc"
diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig
index 1bbd85fd0f..b412ecaf46 100644
--- a/configs/am335x_shc_sdboot_defconfig
+++ b/configs/am335x_shc_sdboot_defconfig
@@ -15,6 +15,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SHC_SDBOOT=y
CONFIG_SERIES=y
CONFIG_DISTRO_DEFAULTS=y
+CONFIG_SHOW_BOOT_PROGRESS=y
# CONFIG_USE_BOOTCOMMAND is not set
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="am335x-shc"
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index 5292ef96ee..a125f78fa5 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -14,6 +14,7 @@ CONFIG_SEABIOS=y
CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/cherryhill_defconfig b/configs/cherryhill_defconfig
index 3cbc949a01..6ab336fe6e 100644
--- a/configs/cherryhill_defconfig
+++ b/configs/cherryhill_defconfig
@@ -8,6 +8,7 @@ CONFIG_TARGET_CHERRYHILL=y
CONFIG_DEBUG_UART=y
CONFIG_SMP=y
CONFIG_GENERATE_MP_TABLE=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig
index 67526e87c0..4bbd7a67dc 100644
--- a/configs/chromebook_link64_defconfig
+++ b/configs/chromebook_link64_defconfig
@@ -15,6 +15,7 @@ CONFIG_FIT=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index c3c29d38e5..340ab1509d 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -14,6 +14,7 @@ CONFIG_HAVE_VGA_BIOS=y
CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig
index 522e60bbb5..43264abacc 100644
--- a/configs/chromebook_samus_defconfig
+++ b/configs/chromebook_samus_defconfig
@@ -14,6 +14,7 @@ CONFIG_SMP=y
CONFIG_HAVE_VGA_BIOS=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/chromebook_samus_tpl_defconfig b/configs/chromebook_samus_tpl_defconfig
index 3b2cbdcd44..973460082d 100644
--- a/configs/chromebook_samus_tpl_defconfig
+++ b/configs/chromebook_samus_tpl_defconfig
@@ -14,6 +14,7 @@ CONFIG_SMP=y
CONFIG_HAVE_VGA_BIOS=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index a42d726b71..a37661bf4a 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -8,6 +8,7 @@ CONFIG_HAVE_VGA_BIOS=y
CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index 338317203e..7229893c24 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -19,6 +19,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sda2 ro quiet"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index 4fdee998be..dd10170cf7 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -15,6 +15,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sda2 ro quiet"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig
index 7fba44f007..6eeb7c519b 100644
--- a/configs/coreboot_defconfig
+++ b/configs/coreboot_defconfig
@@ -5,6 +5,7 @@ CONFIG_VENDOR_COREBOOT=y
CONFIG_TARGET_COREBOOT=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_PRE_CONSOLE_BUFFER=y
diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig
index b05da76ef1..2fd2b8954e 100644
--- a/configs/cougarcanyon2_defconfig
+++ b/configs/cougarcanyon2_defconfig
@@ -8,6 +8,7 @@ CONFIG_TARGET_COUGARCANYON2=y
CONFIG_SMP=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index e575040a47..7beb1cad81 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -9,6 +9,7 @@ CONFIG_HAVE_VGA_BIOS=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_FIT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index 111011c854..de701b59f7 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sda1 ro quiet"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/efi-x86_app_defconfig b/configs/efi-x86_app_defconfig
index ea3743dd12..e732ec0733 100644
--- a/configs/efi-x86_app_defconfig
+++ b/configs/efi-x86_app_defconfig
@@ -6,6 +6,7 @@ CONFIG_VENDOR_EFI=y
CONFIG_TARGET_EFI_APP=y
CONFIG_DEBUG_UART=y
CONFIG_FIT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/efi-x86_payload32_defconfig b/configs/efi-x86_payload32_defconfig
index 01fe5c8b5f..b304dd7e59 100644
--- a/configs/efi-x86_payload32_defconfig
+++ b/configs/efi-x86_payload32_defconfig
@@ -4,6 +4,7 @@ CONFIG_VENDOR_EFI=y
CONFIG_TARGET_EFI_PAYLOAD=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_PRE_CONSOLE_BUFFER=y
diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig
index c4071eccf8..ecd8d3ea80 100644
--- a/configs/efi-x86_payload64_defconfig
+++ b/configs/efi-x86_payload64_defconfig
@@ -4,6 +4,7 @@ CONFIG_VENDOR_EFI=y
CONFIG_TARGET_EFI_PAYLOAD=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_PRE_CONSOLE_BUFFER=y
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index ba5a501963..f8d12e1179 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -7,6 +7,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_ACPI_TABLE=y
CONFIG_FIT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index f02776da24..cb1538a3ea 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -8,6 +8,7 @@ CONFIG_IDENT_STRING=" LS-CHLv2"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
CONFIG_API=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2"
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index daeecb5e51..9d12ef9bd6 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -8,6 +8,7 @@ CONFIG_IDENT_STRING=" LS-XHL"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
CONFIG_API=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2"
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 446c2f2c03..0b317bc563 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -19,6 +19,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig
index d89cd44144..532611f4a9 100644
--- a/configs/qemu-x86_64_defconfig
+++ b/configs/qemu-x86_64_defconfig
@@ -17,6 +17,7 @@ CONFIG_FIT=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 898d656ac3..ef85c52592 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -10,6 +10,7 @@ CONFIG_BUILD_ROM=y
CONFIG_FIT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index fe1aa8236b..5d13e55d6e 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -16,6 +16,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
index 2653f71f78..1327edd6b9 100644
--- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
+++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
@@ -17,6 +17,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig
index ee9189aeae..651c0ce40a 100644
--- a/configs/theadorable-x86-conga-qa3-e3845_defconfig
+++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig
@@ -16,6 +16,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 7da1beaa99..9ac8379007 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -15,6 +15,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig
index e95b6649a3..deb979944a 100644
--- a/configs/xtfpga_defconfig
+++ b/configs/xtfpga_defconfig
@@ -1,6 +1,7 @@
CONFIG_XTENSA=y
CONFIG_SYS_CPU="dc233c"
CONFIG_XTFPGA_KC705=y
+CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_BOOTDELAY=10
CONFIG_MISC_INIT_R=y
CONFIG_VERSION_VARIABLE=y
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index e4ebd339de..64172f3619 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -11,7 +11,6 @@
#define CONFIG_CPU_SH7722 1
#define CONFIG_DISPLAY_BOARDINFO
-#undef CONFIG_SHOW_BOOT_PROGRESS
/* SMC9111 */
#define CONFIG_SMC91111
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 6368872e5b..f4a000f020 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -258,6 +258,4 @@
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
#define CONFIG_SYS_I2C_SPEED 400000
#define CONFIG_SYS_I2C_SLAVE 1
-
-#define CONFIG_SHOW_BOOT_PROGRESS
#endif /* ! __CONFIG_AM335X_SHC_H */
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 0cb40e721c..0d170ec993 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -14,8 +14,6 @@
#define BOARD_LATE_INIT
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_TMU_TIMER
#define CONFIG_SYS_TIMER_COUNTS_DOWN
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 071d9289ef..a2c8224da7 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -18,8 +18,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
/* MEMORY */
#define KZM_SDRAM_BASE (0x40000000)
#define PHYS_SDRAM KZM_SDRAM_BASE
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 55c4e63325..3ba5548f25 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -29,7 +29,6 @@
#define CONFIG_KW88F6281 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
-#define CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_KIRKWOOD_GPIO
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 7f72ff2e11..146a30b4c2 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -18,8 +18,6 @@
#define CONFIG_SPL_TARGET "spl/u-boot-spl.srec"
#endif
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
#define CONFIG_ARCH_CPU_INIT
#ifndef CONFIG_PINCTRL_PFC
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 203b0a78f2..11bf16b054 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -23,8 +23,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
#define CONFIG_ARCH_CPU_INIT
/* Generic Interrupt Controller Definitions */
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index ba613672eb..6aa40caa7c 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -48,8 +48,6 @@
#define CONFIG_FSL_PCI_INIT /* Use common FSL init code */
#define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */
#endif
-#ifdef CONFIG_PCIE1
-#endif
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index c90d8e0e9a..cd7f51c7ce 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -11,7 +11,6 @@
#define CONFIG_CPU_SH7752 1
#define CONFIG_DISPLAY_BOARDINFO
-#undef CONFIG_SHOW_BOOT_PROGRESS
/* MEMORY */
#define SH7752EVB_SDRAM_BASE (0x40000000)
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 83d123f33a..6b00bd7d90 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -11,7 +11,6 @@
#define CONFIG_CPU_SH7753 1
#define CONFIG_DISPLAY_BOARDINFO
-#undef CONFIG_SHOW_BOOT_PROGRESS
/* MEMORY */
#define SH7753EVB_SDRAM_BASE (0x40000000)
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index f92f066494..f1955a16b9 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -12,7 +12,6 @@
#define CONFIG_SH7757LCR_DDR_ECC 1
#define CONFIG_DISPLAY_BOARDINFO
-#undef CONFIG_SHOW_BOOT_PROGRESS
/* MEMORY */
#define SH7757LCR_SDRAM_BASE (0x80000000)
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index d857fcbd9a..10961b14ba 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -15,7 +15,6 @@
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_DISPLAY_BOARDINFO
-#undef CONFIG_SHOW_BOOT_PROGRESS
/* SCIF */
#define CONFIG_CONS_SCIF2 1
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 7fcf76a6bf..c4deef80af 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -14,7 +14,6 @@
* High Level Configuration Options
* (easy to change)
*/
-#define CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_PHYSMEM
#define CONFIG_LMB
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 33255a3fe9..b8de931d2c 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -120,7 +120,6 @@
/*==============================*/
#define CONFIG_MX_CYCLIC
-#define CONFIG_SHOW_BOOT_PROGRESS
/*=========================================*/
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bd167959b3..7e6c9e3016 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1622,7 +1622,6 @@ CONFIG_SHARP_LQ035Q7DH06
CONFIG_SHEEVA_88SV131
CONFIG_SHEEVA_88SV331xV5
CONFIG_SHOW_ACTIVITY
-CONFIG_SHOW_BOOT_PROGRESS
CONFIG_SH_CMT_CLK_FREQ
CONFIG_SH_DSP
CONFIG_SH_ETHER_ALIGNE_SIZE
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 03/18] Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 01/18] main: Use conditional run_preboot_environment_command() Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 02/18] Convert CONFIG_SHOW_BOOT_PROGRESS to Kconfig Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 04/18] Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig Simon Glass
` (16 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
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>
---
Changes in v2: None
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 e0521abe90..841e750b00 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 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 7b68c1c0a1..ba0e75b5ee 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 6b7104db5f..e2c3ce1200 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 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 f5d09d18e5..9ad10e6c75 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 1d41702846..d93f8cc5c8 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 15bb8d63b8..d2394a9d1a 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 7c79ed6138..50d6859d9b 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 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 b36d7e56fb..56876d3db5 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 29a92b9146..05369e7225 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 3f84fabdb6..3e26476dea 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/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 b51914d1e0..388bb498ca 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 */
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 04/18] Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (2 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 03/18] Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-23 17:23 ` David Abdurachmanov
2019-07-21 2:51 ` [U-Boot] [PATCH v2 05/18] autoboot: Use CONFIG_AUTOBOOT_STOP_STR_SHA256 indirectly Simon Glass
` (15 subsequent siblings)
19 siblings, 1 reply; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_USE_PREBOOT
CONFIG_PREBOOT
Both are together in one commit, since otherwise the former causes kconfig
to define the latter, which gives duplicate symbol errors.
Includes a manual fixup for CONFIG_PREBOOT in ids8313_defconfig since the
backslash lands in the wrong place. Similarly with socfpga_vining_fpga.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
configs/A10-OLinuXino-Lime_defconfig | 1 +
configs/A10s-OLinuXino-M_defconfig | 1 +
configs/A13-OLinuXinoM_defconfig | 1 +
configs/A13-OLinuXino_defconfig | 1 +
configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
configs/A20-OLinuXino-Lime2_defconfig | 1 +
configs/A20-OLinuXino-Lime_defconfig | 1 +
configs/A20-OLinuXino_MICRO-eMMC_defconfig | 1 +
configs/A20-OLinuXino_MICRO_defconfig | 1 +
configs/A20-Olimex-SOM-EVB_defconfig | 1 +
configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 +
configs/A20-Olimex-SOM204-EVB_defconfig | 1 +
configs/A33-OLinuXino_defconfig | 1 +
configs/Ainol_AW1_defconfig | 1 +
configs/Ampe_A76_defconfig | 1 +
configs/Auxtek-T003_defconfig | 1 +
configs/Auxtek-T004_defconfig | 1 +
configs/Bananapi_M2_Ultra_defconfig | 1 +
configs/Bananapi_defconfig | 1 +
configs/Bananapi_m2m_defconfig | 1 +
configs/Bananapro_defconfig | 1 +
configs/CHIP_defconfig | 1 +
configs/CHIP_pro_defconfig | 1 +
configs/CSQ_CS908_defconfig | 1 +
configs/Chuwi_V7_CW0825_defconfig | 1 +
configs/Colombus_defconfig | 1 +
configs/Cubieboard2_defconfig | 1 +
configs/Cubieboard4_defconfig | 1 +
configs/Cubieboard_defconfig | 1 +
configs/Cubietruck_defconfig | 1 +
configs/Cubietruck_plus_defconfig | 1 +
configs/Empire_electronix_d709_defconfig | 1 +
configs/Empire_electronix_m712_defconfig | 1 +
configs/Hummingbird_A31_defconfig | 1 +
configs/Hyundai_A7HD_defconfig | 1 +
configs/Itead_Ibox_A20_defconfig | 1 +
configs/Lamobo_R1_defconfig | 1 +
configs/LicheePi_Zero_defconfig | 1 +
configs/Linksprite_pcDuino3_Nano_defconfig | 1 +
configs/Linksprite_pcDuino3_defconfig | 1 +
configs/Linksprite_pcDuino_defconfig | 1 +
configs/MK808C_defconfig | 1 +
configs/MPC8349EMDS_PCI64_defconfig | 2 ++
configs/MPC8349EMDS_SLAVE_defconfig | 2 ++
configs/MPC8349EMDS_defconfig | 2 ++
configs/MSI_Primo73_defconfig | 1 +
configs/MSI_Primo81_defconfig | 1 +
configs/Marsboard_A10_defconfig | 1 +
configs/Mele_A1000G_quad_defconfig | 1 +
configs/Mele_A1000_defconfig | 1 +
configs/Mele_I7_defconfig | 1 +
configs/Mele_M3_defconfig | 1 +
configs/Mele_M5_defconfig | 1 +
configs/Mele_M9_defconfig | 1 +
configs/Merrii_A80_Optimus_defconfig | 1 +
configs/Mini-X_defconfig | 1 +
.../Nintendo_NES_Classic_Edition_defconfig | 1 +
configs/Orangepi_defconfig | 1 +
configs/Orangepi_mini_defconfig | 1 +
configs/Sinlinx_SinA31s_defconfig | 1 +
configs/Sinlinx_SinA33_defconfig | 1 +
configs/Sinovoip_BPI_M2_defconfig | 1 +
configs/Sinovoip_BPI_M3_defconfig | 1 +
configs/Sunchip_CX-A99_defconfig | 1 +
configs/TQM834x_defconfig | 2 ++
configs/UTOO_P66_defconfig | 1 +
configs/Wexler_TAB7200_defconfig | 1 +
configs/Wits_Pro_A20_DKT_defconfig | 1 +
configs/Wobo_i5_defconfig | 1 +
configs/Yones_Toptech_BD1078_defconfig | 1 +
configs/Yones_Toptech_BS1078_V2_defconfig | 1 +
configs/a64-olinuxino_defconfig | 1 +
configs/amarula_a64_relic_defconfig | 1 +
configs/apf27_defconfig | 2 ++
configs/arndale_defconfig | 1 +
configs/aspenite_defconfig | 1 +
configs/ba10_tv_box_defconfig | 1 +
configs/bananapi_m1_plus_defconfig | 1 +
configs/bananapi_m2_berry_defconfig | 1 +
configs/bananapi_m2_plus_h3_defconfig | 1 +
configs/bananapi_m2_plus_h5_defconfig | 1 +
configs/bananapi_m2_zero_defconfig | 1 +
configs/bananapi_m64_defconfig | 1 +
configs/bcm7260_defconfig | 2 ++
configs/bcm7445_defconfig | 2 ++
configs/beelink_gs1_defconfig | 1 +
configs/beelink_x2_defconfig | 5 ++--
configs/bitmain_antminer_s9_defconfig | 1 +
configs/bk4r1_defconfig | 1 +
configs/brppt1_mmc_defconfig | 2 ++
configs/brppt1_nand_defconfig | 2 ++
configs/brppt1_spi_defconfig | 4 ++-
configs/brxre1_defconfig | 2 ++
configs/chromebit_mickey_defconfig | 2 +-
configs/chromebook_jerry_defconfig | 2 +-
configs/chromebook_minnie_defconfig | 2 +-
configs/chromebook_speedy_defconfig | 2 +-
configs/clearfog_defconfig | 1 +
configs/clearfog_gt_8k_defconfig | 1 +
configs/cm_fx6_defconfig | 2 ++
configs/colorfly_e708_q1_defconfig | 1 +
...-qeval20-qa3-e3845-internal-uart_defconfig | 1 +
configs/conga-qeval20-qa3-e3845_defconfig | 1 +
configs/controlcenterdc_defconfig | 1 +
configs/crs305-1g-4s_defconfig | 3 ++-
configs/d2net_v2_defconfig | 1 +
configs/db-88f6720_defconfig | 1 +
configs/db-88f6820-amc_defconfig | 1 +
configs/db-88f6820-gp_defconfig | 1 +
configs/db-mv784mp-gp_defconfig | 1 +
configs/db-xc3-24g4xg_defconfig | 1 +
configs/dfi-bt700-q7x-151_defconfig | 1 +
configs/difrnce_dit4350_defconfig | 1 +
configs/dns325_defconfig | 1 +
configs/dockstar_defconfig | 1 +
configs/draco_defconfig | 1 +
configs/dreamplug_defconfig | 1 +
configs/ds109_defconfig | 1 +
configs/ds414_defconfig | 2 ++
configs/dserve_dsrv9703c_defconfig | 1 +
configs/emlid_neutis_n5_devboard_defconfig | 1 +
configs/etamin_defconfig | 1 +
configs/evb-rk3036_defconfig | 1 +
configs/evb-rk3229_defconfig | 3 +--
configs/evb-rk3288_defconfig | 2 +-
configs/fennec-rk3288_defconfig | 2 +-
configs/firefly-rk3288_defconfig | 2 +-
configs/ga10h_v1_1_defconfig | 1 +
configs/goflexhome_defconfig | 1 +
configs/gplugd_defconfig | 1 +
configs/gt90h_v4_defconfig | 1 +
configs/guruplug_defconfig | 1 +
configs/gwventana_emmc_defconfig | 1 +
configs/gwventana_gw5904_defconfig | 1 +
configs/gwventana_nand_defconfig | 1 +
configs/h8_homlet_v2_defconfig | 1 +
configs/helios4_defconfig | 1 +
configs/hrcon_defconfig | 1 +
configs/hrcon_dh_defconfig | 1 +
configs/i12-tvbox_defconfig | 1 +
configs/iNet_3F_defconfig | 1 +
configs/iNet_3W_defconfig | 1 +
configs/iNet_86VS_defconfig | 1 +
configs/iNet_D978_rev2_defconfig | 1 +
configs/ib62x0_defconfig | 1 +
configs/icnova-a20-swac_defconfig | 1 +
configs/iconnect_defconfig | 1 +
configs/ids8313_defconfig | 2 ++
configs/inet1_defconfig | 1 +
configs/inet86dz_defconfig | 1 +
configs/inet97fv2_defconfig | 1 +
configs/inet98v_rev2_defconfig | 1 +
configs/inet9f_rev03_defconfig | 1 +
configs/inet_q972_defconfig | 1 +
configs/inetspace_v2_defconfig | 1 +
configs/jesurun_q5_defconfig | 1 +
configs/kylin-rk3036_defconfig | 1 +
configs/libretech-ac_defconfig | 2 ++
configs/libretech_all_h3_cc_h2_plus_defconfig | 1 +
configs/libretech_all_h3_cc_h3_defconfig | 1 +
configs/libretech_all_h3_cc_h5_defconfig | 1 +
configs/lschlv2_defconfig | 1 +
configs/lsxhl_defconfig | 1 +
configs/m53menlo_defconfig | 2 ++
configs/maxbcm_defconfig | 1 +
configs/meesc_dataflash_defconfig | 3 ++-
configs/meesc_defconfig | 1 +
configs/microblaze-generic_defconfig | 2 ++
configs/miqi-rk3288_defconfig | 2 +-
configs/mixtile_loftq_defconfig | 1 +
configs/mk802_a10s_defconfig | 1 +
configs/mk802_defconfig | 1 +
configs/mk802ii_defconfig | 1 +
configs/mvebu_db-88f3720_defconfig | 1 +
configs/mvebu_db_armada8k_defconfig | 1 +
configs/mvebu_espressobin-88f3720_defconfig | 1 +
configs/mvebu_mcbin-88f8040_defconfig | 1 +
configs/mx51evk_defconfig | 1 +
configs/mx53cx9020_defconfig | 1 +
configs/mx53loco_defconfig | 1 +
configs/mx6cuboxi_defconfig | 2 ++
configs/mx6qsabrelite_defconfig | 1 +
configs/nanopi_a64_defconfig | 1 +
configs/nanopi_m1_defconfig | 1 +
configs/nanopi_m1_plus_defconfig | 1 +
configs/nanopi_neo2_defconfig | 1 +
configs/nanopi_neo_air_defconfig | 1 +
configs/nanopi_neo_defconfig | 1 +
configs/nanopi_neo_plus2_defconfig | 1 +
configs/nas220_defconfig | 1 +
configs/net2big_v2_defconfig | 1 +
configs/netspace_lite_v2_defconfig | 1 +
configs/netspace_max_v2_defconfig | 1 +
configs/netspace_mini_v2_defconfig | 1 +
configs/netspace_v2_defconfig | 1 +
configs/nitrogen6dl2g_defconfig | 1 +
configs/nitrogen6dl_defconfig | 1 +
configs/nitrogen6q2g_defconfig | 1 +
configs/nitrogen6q_defconfig | 1 +
configs/nitrogen6s1g_defconfig | 1 +
configs/nitrogen6s_defconfig | 1 +
configs/nokia_rx51_defconfig | 2 ++
configs/nsa310s_defconfig | 1 +
configs/oceanic_5205_5inmfd_defconfig | 1 +
configs/omap35_logic_defconfig | 2 ++
configs/omap35_logic_somlv_defconfig | 2 ++
configs/omap3_beagle_defconfig | 2 ++
configs/omap3_evm_defconfig | 1 +
configs/omap3_logic_defconfig | 2 ++
configs/omap3_logic_somlv_defconfig | 2 ++
configs/openrd_base_defconfig | 1 +
configs/openrd_client_defconfig | 1 +
configs/openrd_ultimate_defconfig | 1 +
configs/opos6uldev_defconfig | 2 ++
configs/orangepi_2_defconfig | 1 +
configs/orangepi_lite2_defconfig | 1 +
configs/orangepi_lite_defconfig | 1 +
configs/orangepi_one_defconfig | 1 +
configs/orangepi_one_plus_defconfig | 1 +
configs/orangepi_pc2_defconfig | 1 +
configs/orangepi_pc_defconfig | 1 +
configs/orangepi_pc_plus_defconfig | 1 +
configs/orangepi_plus2e_defconfig | 1 +
configs/orangepi_plus_defconfig | 1 +
configs/orangepi_prime_defconfig | 1 +
configs/orangepi_r1_defconfig | 1 +
configs/orangepi_win_defconfig | 1 +
configs/orangepi_zero_defconfig | 1 +
configs/orangepi_zero_plus2_defconfig | 1 +
configs/orangepi_zero_plus_defconfig | 1 +
configs/ot1200_defconfig | 1 +
configs/ot1200_spl_defconfig | 1 +
configs/parrot_r16_defconfig | 1 +
configs/phycore-rk3288_defconfig | 2 +-
configs/pine64-lts_defconfig | 1 +
configs/pine64_plus_defconfig | 1 +
configs/pine_h64_defconfig | 3 ++-
configs/pinebook_defconfig | 1 +
configs/platinum_picon_defconfig | 1 +
configs/platinum_titanium_defconfig | 1 +
configs/pogo_e02_defconfig | 1 +
configs/polaroid_mid2407pxe03_defconfig | 1 +
configs/polaroid_mid2809pxe04_defconfig | 1 +
configs/popmetal-rk3288_defconfig | 2 +-
configs/pov_protab2_ips9_defconfig | 1 +
configs/pxm2_defconfig | 1 +
configs/q8_a13_tablet_defconfig | 1 +
configs/q8_a23_tablet_800x480_defconfig | 1 +
configs/q8_a33_tablet_1024x600_defconfig | 1 +
configs/q8_a33_tablet_800x480_defconfig | 1 +
configs/qemu_arm64_defconfig | 2 ++
configs/qemu_arm_defconfig | 2 ++
configs/r7-tv-dongle_defconfig | 1 +
configs/rastaban_defconfig | 1 +
configs/rock2_defconfig | 2 +-
configs/rock_defconfig | 1 +
configs/rpi_0_w_defconfig | 2 ++
configs/rpi_2_defconfig | 2 ++
configs/rpi_3_32b_defconfig | 2 ++
configs/rpi_3_b_plus_defconfig | 4 ++-
configs/rpi_3_defconfig | 2 ++
configs/rpi_defconfig | 2 ++
configs/rut_defconfig | 1 +
configs/seaboard_defconfig | 2 ++
configs/sheevaplug_defconfig | 1 +
configs/socfpga_dbm_soc1_defconfig | 2 ++
configs/socfpga_vining_fpga_defconfig | 2 ++
configs/socrates_defconfig | 2 ++
configs/sopine_baseboard_defconfig | 1 +
configs/strider_con_defconfig | 1 +
configs/strider_con_dp_defconfig | 1 +
configs/strider_cpu_defconfig | 1 +
configs/strider_cpu_dp_defconfig | 1 +
configs/sun8i_a23_evb_defconfig | 1 +
configs/sunxi_Gemei_G9_defconfig | 1 +
configs/syzygy_hub_defconfig | 1 +
configs/tbs2910_defconfig | 2 ++
configs/tbs_a711_defconfig | 1 +
configs/teres_i_defconfig | 1 +
...able-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 +
.../theadorable-x86-conga-qa3-e3845_defconfig | 1 +
configs/theadorable-x86-dfi-bt700_defconfig | 1 +
configs/theadorable_debug_defconfig | 1 +
configs/thuban_defconfig | 1 +
configs/tinker-rk3288_defconfig | 2 +-
configs/topic_miami_defconfig | 1 +
configs/topic_miamilite_defconfig | 1 +
configs/topic_miamiplus_defconfig | 1 +
configs/turris_mox_defconfig | 1 +
configs/turris_omnia_defconfig | 1 +
configs/uDPU_defconfig | 1 +
configs/ventana_defconfig | 2 ++
configs/vyasa-rk3288_defconfig | 2 +-
configs/xpedite517x_defconfig | 1 +
configs/xpedite520x_defconfig | 1 +
configs/xpedite537x_defconfig | 1 +
configs/xpedite550x_defconfig | 1 +
configs/zmx25_defconfig | 1 +
configs/zynq_cc108_defconfig | 1 +
configs/zynq_cse_nand_defconfig | 1 +
configs/zynq_cse_nor_defconfig | 1 +
configs/zynq_cse_qspi_defconfig | 1 +
configs/zynq_dlc20_rev1_0_defconfig | 1 +
configs/zynq_microzed_defconfig | 1 +
configs/zynq_minized_defconfig | 1 +
configs/zynq_picozed_defconfig | 1 +
configs/zynq_z_turn_defconfig | 1 +
configs/zynq_zc702_defconfig | 1 +
configs/zynq_zc706_defconfig | 1 +
configs/zynq_zc770_xm010_defconfig | 1 +
configs/zynq_zc770_xm011_defconfig | 1 +
configs/zynq_zc770_xm011_x16_defconfig | 1 +
configs/zynq_zc770_xm012_defconfig | 1 +
configs/zynq_zc770_xm013_defconfig | 1 +
configs/zynq_zed_defconfig | 1 +
configs/zynq_zybo_defconfig | 1 +
configs/zynq_zybo_z7_defconfig | 1 +
include/configs/MPC8349EMDS.h | 5 ----
include/configs/MPC8349EMDS_SDRAM.h | 4 ---
include/configs/TQM834x.h | 5 ----
include/configs/am3517_crane.h | 10 --------
include/configs/am3517_evm.h | 13 ----------
include/configs/apf27.h | 2 --
include/configs/arndale.h | 3 ---
include/configs/bcmstb.h | 5 ----
include/configs/bk4r1.h | 2 --
include/configs/bur_cfg_common.h | 3 ---
include/configs/cm_fx6.h | 3 ---
include/configs/conga-qeval20-qa3-e3845.h | 3 ---
include/configs/controlcenterdc.h | 3 ---
include/configs/dfi-bt700.h | 3 ---
include/configs/ds414.h | 3 ---
include/configs/gazerbeam.h | 2 --
include/configs/gw_ventana.h | 2 --
include/configs/hrcon.h | 3 ---
include/configs/ids8313.h | 4 ---
include/configs/m53menlo.h | 2 --
include/configs/meesc.h | 3 ---
include/configs/meson64.h | 2 --
include/configs/microblaze-generic.h | 3 ---
include/configs/mv-common.h | 2 --
include/configs/mvebu_armada-37xx.h | 2 --
include/configs/mvebu_armada-8k.h | 2 --
include/configs/mx51evk.h | 2 --
include/configs/mx53cx9020.h | 2 --
include/configs/mx53loco.h | 2 --
include/configs/mx6cuboxi.h | 12 ---------
include/configs/nitrogen6x.h | 3 ---
include/configs/nokia_rx51.h | 25 -------------------
include/configs/omap3_beagle.h | 3 ---
include/configs/omap3_logic.h | 5 ----
include/configs/opos6uldev.h | 2 --
include/configs/ot1200.h | 3 ---
include/configs/platinum.h | 2 --
include/configs/qemu-arm.h | 2 --
include/configs/qemu-riscv.h | 4 ---
include/configs/rk3036_common.h | 3 ---
include/configs/rk3188_common.h | 3 ---
include/configs/rk322x_common.h | 3 ---
include/configs/rk3288_common.h | 3 ---
include/configs/rpi.h | 2 --
include/configs/siemens-am33x-common.h | 2 --
include/configs/socfpga_dbm_soc1.h | 2 --
include/configs/socfpga_mcvevk.h | 1 -
include/configs/socfpga_vining_fpga.h | 11 --------
include/configs/socrates.h | 6 -----
include/configs/strider.h | 3 ---
include/configs/sunxi-common.h | 5 ----
include/configs/tbs2910.h | 10 --------
include/configs/tegra-common-post.h | 2 --
include/configs/theadorable-x86-common.h | 3 ---
include/configs/theadorable.h | 3 ---
include/configs/topic_miami.h | 3 ---
include/configs/turris_mox.h | 2 --
include/configs/xpedite517x.h | 2 --
include/configs/xpedite520x.h | 2 --
include/configs/xpedite537x.h | 2 --
include/configs/xpedite550x.h | 2 --
include/configs/zmx25.h | 3 ---
include/configs/zynq-common.h | 2 --
380 files changed, 362 insertions(+), 264 deletions(-)
diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index a986bf880e..9eea922d10 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -11,6 +11,7 @@ CONFIG_I2C1_ENABLE=y
CONFIG_SATAPWR="PC3"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index 26c927ffde..d92a70e4d0 100644
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -9,6 +9,7 @@ CONFIG_MMC1_CD_PIN="PG13"
CONFIG_MMC_SUNXI_SLOT_EXTRA=1
CONFIG_USB1_VBUS_PIN="PB10"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index 1d48214aa4..da80d35054 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -13,6 +13,7 @@ CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y
CONFIG_VIDEO_LCD_POWER="PB10"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index 63c8a2a895..dfd439a52e 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -15,6 +15,7 @@ CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y
CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
index b00fcf34fd..298c9f2072 100644
--- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
@@ -13,6 +13,7 @@ CONFIG_SATAPWR="PC3"
CONFIG_SPL_SPI_SUNXI=y
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index db1c25c6f8..084dab0ceb 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -11,6 +11,7 @@ CONFIG_I2C1_ENABLE=y
CONFIG_SATAPWR="PC3"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index e1e72ed3a3..ffeeda414e 100644
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -9,6 +9,7 @@ CONFIG_I2C1_ENABLE=y
CONFIG_SATAPWR="PC3"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/A20-OLinuXino_MICRO-eMMC_defconfig b/configs/A20-OLinuXino_MICRO-eMMC_defconfig
index 62d878f404..f4c6c54cfd 100644
--- a/configs/A20-OLinuXino_MICRO-eMMC_defconfig
+++ b/configs/A20-OLinuXino_MICRO-eMMC_defconfig
@@ -11,6 +11,7 @@ CONFIG_VIDEO_VGA=y
CONFIG_SATAPWR="PB8"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index 29efaf6bc4..440eebbeec 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -12,6 +12,7 @@ CONFIG_VIDEO_VGA=y
CONFIG_SATAPWR="PB8"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig
index 59dfdcc407..48c4c3e53a 100644
--- a/configs/A20-Olimex-SOM-EVB_defconfig
+++ b/configs/A20-Olimex-SOM-EVB_defconfig
@@ -13,6 +13,7 @@ CONFIG_USB0_VBUS_DET="PH5"
CONFIG_SATAPWR="PC3"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig b/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig
index c41e4356a4..193e20aa8b 100644
--- a/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig
+++ b/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig
@@ -13,6 +13,7 @@ CONFIG_SATAPWR="PC3"
CONFIG_GMAC_TX_DELAY=4
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/A20-Olimex-SOM204-EVB_defconfig b/configs/A20-Olimex-SOM204-EVB_defconfig
index 38cc65bd5c..42a73c8057 100644
--- a/configs/A20-Olimex-SOM204-EVB_defconfig
+++ b/configs/A20-Olimex-SOM204-EVB_defconfig
@@ -12,6 +12,7 @@ CONFIG_SATAPWR="PC3"
CONFIG_GMAC_TX_DELAY=4
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/A33-OLinuXino_defconfig b/configs/A33-OLinuXino_defconfig
index 4389856987..6ea4238342 100644
--- a/configs/A33-OLinuXino_defconfig
+++ b/configs/A33-OLinuXino_defconfig
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
CONFIG_VIDEO_LCD_BL_EN="PB2"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
index c44050f899..9b7f19736c 100644
--- a/configs/Ainol_AW1_defconfig
+++ b/configs/Ainol_AW1_defconfig
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig
index 0a2774761e..1810d48a0b 100644
--- a/configs/Ampe_A76_defconfig
+++ b/configs/Ampe_A76_defconfig
@@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Auxtek-T003_defconfig b/configs/Auxtek-T003_defconfig
index c0fb54749e..2dc6c8d8e2 100644
--- a/configs/Auxtek-T003_defconfig
+++ b/configs/Auxtek-T003_defconfig
@@ -8,6 +8,7 @@ CONFIG_DRAM_EMR1=0
CONFIG_USB1_VBUS_PIN="PB10"
CONFIG_VIDEO_COMPOSITE=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
index ae320b7033..4395d5b724 100644
--- a/configs/Auxtek-T004_defconfig
+++ b/configs/Auxtek-T004_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN5I=y
CONFIG_DRAM_CLK=432
CONFIG_USB1_VBUS_PIN="PG13"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Bananapi_M2_Ultra_defconfig b/configs/Bananapi_M2_Ultra_defconfig
index 384820d939..40b60599d5 100644
--- a/configs/Bananapi_M2_Ultra_defconfig
+++ b/configs/Bananapi_M2_Ultra_defconfig
@@ -9,6 +9,7 @@ CONFIG_MMC0_CD_PIN="PH13"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
CONFIG_DEFAULT_DEVICE_TREE="sun8i-r40-bananapi-m2-ultra"
diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index 86cc3a2f04..abd7d3d125 100644
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -9,6 +9,7 @@ CONFIG_VIDEO_COMPOSITE=y
CONFIG_GMAC_TX_DELAY=3
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Bananapi_m2m_defconfig b/configs/Bananapi_m2m_defconfig
index 87e2d34e4d..b4f3794153 100644
--- a/configs/Bananapi_m2m_defconfig
+++ b/configs/Bananapi_m2m_defconfig
@@ -10,6 +10,7 @@ CONFIG_MMC0_CD_PIN="PB4"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_USB0_ID_DET="PH8"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_PARTITION_UUIDS is not set
diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
index 8636eab238..c5d33a2e14 100644
--- a/configs/Bananapro_defconfig
+++ b/configs/Bananapro_defconfig
@@ -11,6 +11,7 @@ CONFIG_VIDEO_COMPOSITE=y
CONFIG_GMAC_TX_DELAY=3
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
index 95c564c407..78681084ba 100644
--- a/configs/CHIP_defconfig
+++ b/configs/CHIP_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN5I=y
CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
CONFIG_USB0_VBUS_PIN="PB10"
CONFIG_VIDEO_COMPOSITE=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
CONFIG_CMD_DFU=y
CONFIG_CMD_USB_MASS_STORAGE=y
diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
index 6cd500f3be..82994212a2 100644
--- a/configs/CHIP_pro_defconfig
+++ b/configs/CHIP_pro_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL=y
CONFIG_MACH_SUN5I=y
CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
CONFIG_USB0_VBUS_PIN="PB10"
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MTDPARTS=y
diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
index d1ba5c87b7..65b6777e0e 100644
--- a/configs/CSQ_CS908_defconfig
+++ b/configs/CSQ_CS908_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=432
CONFIG_USB1_VBUS_PIN=""
CONFIG_USB2_VBUS_PIN=""
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
index acd931c910..39caa75ff3 100644
--- a/configs/Chuwi_V7_CW0825_defconfig
+++ b/configs/Chuwi_V7_CW0825_defconfig
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_VIDEO_LCD_PANEL_HITACHI_TX18D42VM=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index 5e52388e7e..9065792149 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -17,6 +17,7 @@ CONFIG_VIDEO_LCD_PANEL_I2C_SDA="PA23"
CONFIG_VIDEO_LCD_PANEL_I2C_SCL="PA24"
CONFIG_VIDEO_LCD_PANEL_EDP_4_LANE_1620M_VIA_ANX9804=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index d1ff8fd116..ee5412cdb8 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -8,6 +8,7 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_SATAPWR="PB8"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Cubieboard4_defconfig b/configs/Cubieboard4_defconfig
index 013482094f..e44d79e0c2 100644
--- a/configs/Cubieboard4_defconfig
+++ b/configs/Cubieboard4_defconfig
@@ -12,6 +12,7 @@ CONFIG_USB0_ID_DET="PH16"
CONFIG_USB1_VBUS_PIN="PH14"
CONFIG_USB3_VBUS_PIN="PH15"
CONFIG_AXP_GPIO=y
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index 1ff72708dd..593dbe86a1 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -8,6 +8,7 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_SATAPWR="PB8"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index ed8fbe9f2a..fe92f64644 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -13,6 +13,7 @@ CONFIG_SATAPWR="PH12"
CONFIG_GMAC_TX_DELAY=1
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/Cubietruck_plus_defconfig b/configs/Cubietruck_plus_defconfig
index 0573c1f2fa..9748805dca 100644
--- a/configs/Cubietruck_plus_defconfig
+++ b/configs/Cubietruck_plus_defconfig
@@ -15,6 +15,7 @@ CONFIG_USB2_VBUS_PIN="PL6"
CONFIG_I2C0_ENABLE=y
CONFIG_AXP_GPIO=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Empire_electronix_d709_defconfig b/configs/Empire_electronix_d709_defconfig
index f5dd96d6e8..ff6562df5c 100644
--- a/configs/Empire_electronix_d709_defconfig
+++ b/configs/Empire_electronix_d709_defconfig
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Empire_electronix_m712_defconfig b/configs/Empire_electronix_m712_defconfig
index b8c3c56a91..767d497b3c 100644
--- a/configs/Empire_electronix_m712_defconfig
+++ b/configs/Empire_electronix_m712_defconfig
@@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
index f7a7b736b2..44a66028bd 100644
--- a/configs/Hummingbird_A31_defconfig
+++ b/configs/Hummingbird_A31_defconfig
@@ -9,6 +9,7 @@ CONFIG_USB2_VBUS_PIN=""
CONFIG_VIDEO_VGA_VIA_LCD=y
CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN="PH25"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig
index 2b1b1ccfbb..0fe7c11300 100644
--- a/configs/Hyundai_A7HD_defconfig
+++ b/configs/Hyundai_A7HD_defconfig
@@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Itead_Ibox_A20_defconfig b/configs/Itead_Ibox_A20_defconfig
index f44fc9e935..01f259f45d 100644
--- a/configs/Itead_Ibox_A20_defconfig
+++ b/configs/Itead_Ibox_A20_defconfig
@@ -8,6 +8,7 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_SATAPWR="PB8"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
index 0ce8c1110a..974ff1c76b 100644
--- a/configs/Lamobo_R1_defconfig
+++ b/configs/Lamobo_R1_defconfig
@@ -10,6 +10,7 @@ CONFIG_SATAPWR="PB3"
CONFIG_GMAC_TX_DELAY=4
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/LicheePi_Zero_defconfig b/configs/LicheePi_Zero_defconfig
index 760cb1b068..ca0bcc0cf2 100644
--- a/configs/LicheePi_Zero_defconfig
+++ b/configs/LicheePi_Zero_defconfig
@@ -4,6 +4,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y
CONFIG_MACH_SUN8I_V3S=y
CONFIG_DRAM_CLK=360
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
index 3277461b92..23651ec985 100644
--- a/configs/Linksprite_pcDuino3_Nano_defconfig
+++ b/configs/Linksprite_pcDuino3_Nano_defconfig
@@ -10,6 +10,7 @@ CONFIG_SATAPWR="PH2"
CONFIG_GMAC_TX_DELAY=3
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index ce07a8c7ec..6cb36637a3 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -8,6 +8,7 @@ CONFIG_DRAM_ZQ=122
CONFIG_SATAPWR="PH2"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig
index 9685757e30..dd2b2802e4 100644
--- a/configs/Linksprite_pcDuino_defconfig
+++ b/configs/Linksprite_pcDuino_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN4I=y
CONFIG_USB1_VBUS_PIN=""
CONFIG_USB2_VBUS_PIN=""
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig
index 2da7a857a2..7f23f9e608 100644
--- a/configs/MK808C_defconfig
+++ b/configs/MK808C_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL=y
CONFIG_MACH_SUN7I=y
CONFIG_DRAM_CLK=384
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/MPC8349EMDS_PCI64_defconfig b/configs/MPC8349EMDS_PCI64_defconfig
index f99aaecfb0..00dc72d81c 100644
--- a/configs/MPC8349EMDS_PCI64_defconfig
+++ b/configs/MPC8349EMDS_PCI64_defconfig
@@ -84,6 +84,8 @@ CONFIG_LCRR_CLKDIV_4=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=6
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
CONFIG_HUSH_PARSER=y
CONFIG_CMD_IMLS=y
CONFIG_CMD_I2C=y
diff --git a/configs/MPC8349EMDS_SLAVE_defconfig b/configs/MPC8349EMDS_SLAVE_defconfig
index 3a1268a5ae..7550aa30c7 100644
--- a/configs/MPC8349EMDS_SLAVE_defconfig
+++ b/configs/MPC8349EMDS_SLAVE_defconfig
@@ -84,6 +84,8 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE"
CONFIG_BOOTDELAY=6
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
CONFIG_HUSH_PARSER=y
CONFIG_CMD_IMLS=y
CONFIG_CMD_I2C=y
diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig
index a446bb9f2c..ba00a275cd 100644
--- a/configs/MPC8349EMDS_defconfig
+++ b/configs/MPC8349EMDS_defconfig
@@ -85,6 +85,8 @@ CONFIG_PCI_ONE_PCI1=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=6
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
CONFIG_HUSH_PARSER=y
CONFIG_CMD_IMLS=y
CONFIG_CMD_I2C=y
diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig
index 746e5686ab..a4d137cd23 100644
--- a/configs/MSI_Primo73_defconfig
+++ b/configs/MSI_Primo73_defconfig
@@ -10,6 +10,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index 5eaf24aa89..12f8bd91b5 100644
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_BL_EN="PA25"
CONFIG_VIDEO_LCD_BL_PWM="PH13"
CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
index 2666f1b601..d4cdcb7907 100644
--- a/configs/Marsboard_A10_defconfig
+++ b/configs/Marsboard_A10_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL=y
CONFIG_MACH_SUN4I=y
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Mele_A1000G_quad_defconfig b/configs/Mele_A1000G_quad_defconfig
index 4d900c1950..08d847989d 100644
--- a/configs/Mele_A1000G_quad_defconfig
+++ b/configs/Mele_A1000G_quad_defconfig
@@ -8,6 +8,7 @@ CONFIG_INITIAL_USB_SCAN_DELAY=2000
CONFIG_USB1_VBUS_PIN="PC27"
CONFIG_USB2_VBUS_PIN=""
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index fe6c0fa165..d1cd98db90 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -8,6 +8,7 @@ CONFIG_VIDEO_VGA=y
CONFIG_VIDEO_COMPOSITE=y
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
index 10c151f4e0..3b3b35d6d5 100644
--- a/configs/Mele_I7_defconfig
+++ b/configs/Mele_I7_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=120
CONFIG_USB1_VBUS_PIN="PC27"
CONFIG_USB2_VBUS_PIN=""
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
index b3b38a5288..8f03d1e96a 100644
--- a/configs/Mele_M3_defconfig
+++ b/configs/Mele_M3_defconfig
@@ -9,6 +9,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_VIDEO_VGA=y
CONFIG_VIDEO_COMPOSITE=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
index 57b25bac02..d455a56315 100644
--- a/configs/Mele_M5_defconfig
+++ b/configs/Mele_M5_defconfig
@@ -9,6 +9,7 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_VIDEO_COMPOSITE=y
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index 70facee385..9865e83f06 100644
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=120
CONFIG_USB1_VBUS_PIN="PC27"
CONFIG_USB2_VBUS_PIN=""
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig
index 288b5e6be8..b45b6cde1c 100644
--- a/configs/Merrii_A80_Optimus_defconfig
+++ b/configs/Merrii_A80_Optimus_defconfig
@@ -12,6 +12,7 @@ CONFIG_USB0_ID_DET="PH3"
CONFIG_USB1_VBUS_PIN="PH4"
CONFIG_USB3_VBUS_PIN="PH5"
CONFIG_AXP_GPIO=y
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index 6000e397f2..7d440d1813 100644
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN4I=y
CONFIG_USB0_VBUS_PIN="PB9"
CONFIG_VIDEO_COMPOSITE=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
index d0a788987c..2a75804105 100644
--- a/configs/Nintendo_NES_Classic_Edition_defconfig
+++ b/configs/Nintendo_NES_Classic_Edition_defconfig
@@ -9,6 +9,7 @@ CONFIG_DRAM_ODT_EN=y
CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
CONFIG_AXP_GPIO=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MTDPARTS=y
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
index 2a7bfffc95..1ff40a09ef 100644
--- a/configs/Orangepi_defconfig
+++ b/configs/Orangepi_defconfig
@@ -12,6 +12,7 @@ CONFIG_VIDEO_COMPOSITE=y
CONFIG_GMAC_TX_DELAY=3
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index 9f41fabddb..af98dc8396 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -14,6 +14,7 @@ CONFIG_VIDEO_COMPOSITE=y
CONFIG_GMAC_TX_DELAY=3
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Sinlinx_SinA31s_defconfig b/configs/Sinlinx_SinA31s_defconfig
index 0714430403..3588a2c9dd 100644
--- a/configs/Sinlinx_SinA31s_defconfig
+++ b/configs/Sinlinx_SinA31s_defconfig
@@ -11,6 +11,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=3
CONFIG_USB1_VBUS_PIN=""
CONFIG_USB2_VBUS_PIN=""
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
index 978e856d79..a7383f1eda 100644
--- a/configs/Sinlinx_SinA33_defconfig
+++ b/configs/Sinlinx_SinA33_defconfig
@@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_CMD_DFU=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Sinovoip_BPI_M2_defconfig b/configs/Sinovoip_BPI_M2_defconfig
index 46ef97d7eb..691fd85f47 100644
--- a/configs/Sinovoip_BPI_M2_defconfig
+++ b/configs/Sinovoip_BPI_M2_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=432
CONFIG_USB1_VBUS_PIN=""
CONFIG_USB2_VBUS_PIN=""
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/Sinovoip_BPI_M3_defconfig b/configs/Sinovoip_BPI_M3_defconfig
index 914fc9d506..6ded24e294 100644
--- a/configs/Sinovoip_BPI_M3_defconfig
+++ b/configs/Sinovoip_BPI_M3_defconfig
@@ -16,6 +16,7 @@ CONFIG_USB1_VBUS_PIN="PD24"
CONFIG_AXP_GPIO=y
CONFIG_SATAPWR="PD25"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Sunchip_CX-A99_defconfig b/configs/Sunchip_CX-A99_defconfig
index c884d8f955..8bc353112b 100644
--- a/configs/Sunchip_CX-A99_defconfig
+++ b/configs/Sunchip_CX-A99_defconfig
@@ -12,6 +12,7 @@ CONFIG_USB0_VBUS_PIN="PH15"
CONFIG_USB1_VBUS_PIN="PL7"
CONFIG_USB3_VBUS_PIN="PL8"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig
index 65ab07ee4d..d2e85c9408 100644
--- a/configs/TQM834x_defconfig
+++ b/configs/TQM834x_defconfig
@@ -119,6 +119,8 @@ CONFIG_LCRR_CLKDIV_8=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=6
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_IMLS=y
diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig
index 5be41f1880..2b10629cbf 100644
--- a/configs/UTOO_P66_defconfig
+++ b/configs/UTOO_P66_defconfig
@@ -20,6 +20,7 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_VIDEO_LCD_TL059WV5C0=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig
index b721118418..6413fabf84 100644
--- a/configs/Wexler_TAB7200_defconfig
+++ b/configs/Wexler_TAB7200_defconfig
@@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
index 954a6b777b..437c86795b 100644
--- a/configs/Wits_Pro_A20_DKT_defconfig
+++ b/configs/Wits_Pro_A20_DKT_defconfig
@@ -12,6 +12,7 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_VIDEO_LCD_PANEL_LVDS=y
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Wobo_i5_defconfig b/configs/Wobo_i5_defconfig
index 3a2c2877a8..e21e4e0ab4 100644
--- a/configs/Wobo_i5_defconfig
+++ b/configs/Wobo_i5_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=432
CONFIG_MMC0_CD_PIN="PB3"
CONFIG_USB1_VBUS_PIN="PG12"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig
index 9a4743ff6a..0f8c8afc29 100644
--- a/configs/Yones_Toptech_BD1078_defconfig
+++ b/configs/Yones_Toptech_BD1078_defconfig
@@ -19,6 +19,7 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/Yones_Toptech_BS1078_V2_defconfig b/configs/Yones_Toptech_BS1078_V2_defconfig
index cd2b6744b8..9c8107c50d 100644
--- a/configs/Yones_Toptech_BS1078_V2_defconfig
+++ b/configs/Yones_Toptech_BS1078_V2_defconfig
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_BL_EN="PA25"
CONFIG_VIDEO_LCD_BL_PWM="PH13"
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/a64-olinuxino_defconfig b/configs/a64-olinuxino_defconfig
index 65430c32fc..8a3561bed5 100644
--- a/configs/a64-olinuxino_defconfig
+++ b/configs/a64-olinuxino_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN50I=y
CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig
index d41eb34691..9eda731a77 100644
--- a/configs/amarula_a64_relic_defconfig
+++ b/configs/amarula_a64_relic_defconfig
@@ -7,6 +7,7 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_VIDEO_DE2 is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index 0f5123abb0..29e9e3b9a9 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -10,6 +10,8 @@ CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_BOOTDELAY=5
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttySMX0,115200 mtdparts=mxc_nand.0:1M(u-boot)ro,512K(env),512K(env2),512K(firmware),512K(dtb),5M(kernel),-(rootfs) ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="run check_flash check_env;"
CONFIG_VERSION_VARIABLE=y
# CONFIG_SPL_FRAMEWORK is not set
CONFIG_SPL_TEXT_BASE=0xA0000000
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index c1b727e0df..6f586bae68 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -9,6 +9,7 @@ CONFIG_IDENT_STRING=" for ARNDALE"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y
CONFIG_FIT_BEST_MATCH=y
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_CONSOLE_MUX=y
# CONFIG_SPL_FRAMEWORK is not set
diff --git a/configs/aspenite_defconfig b/configs/aspenite_defconfig
index 68b68f89d1..fed2de5c37 100644
--- a/configs/aspenite_defconfig
+++ b/configs/aspenite_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nMarvell-Aspenite DB"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index dc47292ce0..a384399b41 100644
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -9,6 +9,7 @@ CONFIG_USB0_VBUS_PIN="PB9"
CONFIG_USB2_VBUS_PIN="PH12"
CONFIG_VIDEO_COMPOSITE=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/bananapi_m1_plus_defconfig b/configs/bananapi_m1_plus_defconfig
index c534a548d8..549d13ee48 100644
--- a/configs/bananapi_m1_plus_defconfig
+++ b/configs/bananapi_m1_plus_defconfig
@@ -9,6 +9,7 @@ CONFIG_VIDEO_COMPOSITE=y
CONFIG_GMAC_TX_DELAY=3
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/bananapi_m2_berry_defconfig b/configs/bananapi_m2_berry_defconfig
index 27999555b6..75fd0b173a 100644
--- a/configs/bananapi_m2_berry_defconfig
+++ b/configs/bananapi_m2_berry_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=576
CONFIG_MMC0_CD_PIN="PH13"
CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
CONFIG_DEFAULT_DEVICE_TREE="sun8i-v40-bananapi-m2-berry"
diff --git a/configs/bananapi_m2_plus_h3_defconfig b/configs/bananapi_m2_plus_h3_defconfig
index 87fa0a9b45..fbfa273069 100644
--- a/configs/bananapi_m2_plus_h3_defconfig
+++ b/configs/bananapi_m2_plus_h3_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=672
CONFIG_MACPWR="PD6"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/bananapi_m2_plus_h5_defconfig b/configs/bananapi_m2_plus_h5_defconfig
index bff6f37e28..3bc83134b3 100644
--- a/configs/bananapi_m2_plus_h5_defconfig
+++ b/configs/bananapi_m2_plus_h5_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=672
CONFIG_MACPWR="PD6"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/bananapi_m2_zero_defconfig b/configs/bananapi_m2_zero_defconfig
index 8546674b23..933ec4db43 100644
--- a/configs/bananapi_m2_zero_defconfig
+++ b/configs/bananapi_m2_zero_defconfig
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=408
CONFIG_MMC0_CD_PIN=""
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig
index 0f5d531136..498b6601a5 100644
--- a/configs/bananapi_m64_defconfig
+++ b/configs/bananapi_m64_defconfig
@@ -7,6 +7,7 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
CONFIG_MMC0_CD_PIN="PH13"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig
index 6e0266be45..2c18d36afc 100644
--- a/configs/bcm7260_defconfig
+++ b/configs/bcm7260_defconfig
@@ -6,6 +6,8 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTDELAY=1
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};"
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot>"
CONFIG_EFI_PARTITION=y
diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig
index f22b06e9ce..c79de19919 100644
--- a/configs/bcm7445_defconfig
+++ b/configs/bcm7445_defconfig
@@ -6,6 +6,8 @@ CONFIG_NR_DRAM_BANKS=3
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTDELAY=1
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};"
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot>"
CONFIG_CMD_SF=y
diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig
index f142cde779..c89fba5b83 100644
--- a/configs/beelink_gs1_defconfig
+++ b/configs/beelink_gs1_defconfig
@@ -8,6 +8,7 @@ CONFIG_MMC0_CD_PIN="PF6"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_PSCI_RESET is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/beelink_x2_defconfig b/configs/beelink_x2_defconfig
index be946956fa..7c62944e98 100644
--- a/configs/beelink_x2_defconfig
+++ b/configs/beelink_x2_defconfig
@@ -3,14 +3,13 @@ CONFIG_ARCH_SUNXI=y
CONFIG_SPL=y
CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=567
-CONFIG_DRAM_ZQ=3881979
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-beelink-x2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_CONSOLE_MUX=y
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-beelink-x2"
CONFIG_SUN8I_EMAC=y
CONFIG_USB_EHCI_HCD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig
index 7f432e5720..14f8d769bb 100644
--- a/configs/bitmain_antminer_s9_defconfig
+++ b/configs/bitmain_antminer_s9_defconfig
@@ -18,6 +18,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL_STACK_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig
index d9e337a8a9..5d47395f5e 100644
--- a/configs/bk4r1_defconfig
+++ b/configs/bk4r1_defconfig
@@ -10,6 +10,7 @@ CONFIG_TARGET_BK4R1=y
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
# CONFIG_CMD_ELF is not set
diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index 5487e5517c..94b9babf5e 100644
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -19,6 +19,8 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTDELAY=0
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run b_default"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="run cfgscr; run brdefaultip"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index 5ab3f929b2..75fc6b7dcd 100644
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -18,6 +18,8 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTDELAY=0
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run b_default"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="run cfgscr; run brdefaultip"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index ce7c8522b1..9d629f69c5 100644
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -11,6 +11,7 @@ CONFIG_ENV_SIZE=0x10000
CONFIG_ENV_OFFSET=0x20000
CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y
+CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_TPL_SYS_MALLOC_F_LEN=0x0
@@ -21,6 +22,8 @@ CONFIG_SPI_BOOT=y
CONFIG_BOOTDELAY=0
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run b_default"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="run cfgscr; run brdefaultip"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
@@ -70,7 +73,6 @@ CONFIG_SPL_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="am335x-brppt1-spi"
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clocks clock-names interrupt-parent interrupt-controller interrupt-cells dma-names dmas "
CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y
CONFIG_SPL_DM=y
diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index f2f10ba4bc..a4b0c45ee3 100644
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -20,6 +20,8 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTDELAY=0
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="mmc dev 1; run b_default"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="run cfgscr; run brdefaultip"
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
index 1a343093c8..04bd2df282 100644
--- a/configs/chromebit_mickey_defconfig
+++ b/configs/chromebit_mickey_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-mickey.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -88,6 +89,5 @@ CONFIG_DM_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 7c7986e6ae..babeae6b12 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_LOG=y
CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-jerry.dtb"
@@ -97,6 +98,5 @@ CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_EDP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
# CONFIG_USE_PRIVATE_LIBGCC is not set
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
index 17c1ea6453..bf43f01a9a 100644
--- a/configs/chromebook_minnie_defconfig
+++ b/configs/chromebook_minnie_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-minnie.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
@@ -95,6 +96,5 @@ CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_EDP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
CONFIG_CONSOLE_SCROLL_LINES=10
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/chromebook_speedy_defconfig b/configs/chromebook_speedy_defconfig
index 0cc1eb6a0b..f6e7c59b90 100644
--- a/configs/chromebook_speedy_defconfig
+++ b/configs/chromebook_speedy_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-speedy.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
@@ -94,7 +95,6 @@ CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_EDP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
# CONFIG_USE_PRIVATE_LIBGCC is not set
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
# CONFIG_SPL_OF_LIBFDT is not set
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index b7b886be4f..280c981a36 100644
--- a/configs/clearfog_defconfig
+++ b/configs/clearfog_defconfig
@@ -18,6 +18,7 @@ CONFIG_DEBUG_UART=y
CONFIG_AHCI=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig
index 2f919b597d..a4f6f096fb 100644
--- a/configs/clearfog_gt_8k_defconfig
+++ b/configs/clearfog_gt_8k_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART=y
CONFIG_AHCI=y
CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 002db24b04..6f4fe45760 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -18,6 +18,8 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
CONFIG_BOOTDELAY=3
CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run legacy_bootcmd"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start;sf probe"
CONFIG_MISC_INIT_R=y
CONFIG_BOUNCE_BUFFER=y
CONFIG_SPL_TEXT_BASE=0x00908000
diff --git a/configs/colorfly_e708_q1_defconfig b/configs/colorfly_e708_q1_defconfig
index c9d5d4d510..45653089f1 100644
--- a/configs/colorfly_e708_q1_defconfig
+++ b/configs/colorfly_e708_q1_defconfig
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_BL_EN="PA25"
CONFIG_VIDEO_LCD_BL_PWM="PH13"
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index 7229893c24..3e193edef3 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -22,6 +22,7 @@ CONFIG_BOOTSTAGE_REPORT=y
CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sda2 ro quiet"
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index dd10170cf7..2e71156b84 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -18,6 +18,7 @@ CONFIG_BOOTSTAGE_REPORT=y
CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sda2 ro quiet"
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig
index 326668d742..93abad2a81 100644
--- a/configs/controlcenterdc_defconfig
+++ b/configs/controlcenterdc_defconfig
@@ -16,6 +16,7 @@ CONFIG_AHCI=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig
index df77cb89ca..c5e2d890cd 100644
--- a/configs/crs305-1g-4s_defconfig
+++ b/configs/crs305-1g-4s_defconfig
@@ -4,10 +4,11 @@ CONFIG_SYS_TEXT_BASE=0x00800000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_CRS305_1G_4S=y
CONFIG_BUILD_TARGET="u-boot.kwb"
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_CMD_BOOTZ=y
CONFIG_CMD_MEMTEST=y
CONFIG_SYS_ALT_MEMTEST=y
-CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_I2C=y
CONFIG_CMD_SF=y
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 845565d620..2723c56068 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig
index c1a430cf3b..a2d27efd80 100644
--- a/configs/db-88f6720_defconfig
+++ b/configs/db-88f6720_defconfig
@@ -15,6 +15,7 @@ CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEBUG_UART=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig
index d55dfc095f..38d519237f 100644
--- a/configs/db-88f6820-amc_defconfig
+++ b/configs/db-88f6820-amc_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEBUG_UART=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
index b8f036e317..f54538ab11 100644
--- a/configs/db-88f6820-gp_defconfig
+++ b/configs/db-88f6820-gp_defconfig
@@ -15,6 +15,7 @@ CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEBUG_UART=y
CONFIG_AHCI=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index 65995b2b5c..5654fd7b44 100644
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -15,6 +15,7 @@ CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEBUG_UART=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/db-xc3-24g4xg_defconfig b/configs/db-xc3-24g4xg_defconfig
index 071a889cd3..3a311ebdf2 100644
--- a/configs/db-xc3-24g4xg_defconfig
+++ b/configs/db-xc3-24g4xg_defconfig
@@ -7,6 +7,7 @@ CONFIG_BUILD_TARGET="u-boot.kwb"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_BEST_MATCH=y
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_CMD_MEMTEST=y
CONFIG_SYS_ALT_MEMTEST=y
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index de701b59f7..13c58831f4 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -17,6 +17,7 @@ CONFIG_BOOTSTAGE_REPORT=y
CONFIG_SHOW_BOOT_PROGRESS=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/sda1 ro quiet"
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/difrnce_dit4350_defconfig b/configs/difrnce_dit4350_defconfig
index 3600863eca..7e28dec718 100644
--- a/configs/difrnce_dit4350_defconfig
+++ b/configs/difrnce_dit4350_defconfig
@@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index aca8abbe9c..6dec69d73a 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nD-Link DNS-325"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 679c18236f..70fbb3660a 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_DOCKSTAR=y
CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="DockStar> "
# CONFIG_CMD_FLASH is not set
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index d23ca8a4c6..d6b2b4a42b 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -19,6 +19,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_ARCH_MISC_INIT=y
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index e148208f99..5762c70a4a 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nMarvell-DreamPlug"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
index 671572b976..a22c067a3e 100644
--- a/configs/ds109_defconfig
+++ b/configs/ds109_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_DS109=y
CONFIG_NR_DRAM_BANKS=2
# CONFIG_SYS_MALLOC_F is not set
+CONFIG_USE_PREBOOT=y
CONFIG_HUSH_PARSER=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_IDE=y
diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig
index 9abfae5b6b..3f8c1773c4 100644
--- a/configs/ds414_defconfig
+++ b/configs/ds414_defconfig
@@ -16,6 +16,8 @@ CONFIG_DEBUG_UART=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start; sf probe"
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_TEXT_BASE=0x40004030
diff --git a/configs/dserve_dsrv9703c_defconfig b/configs/dserve_dsrv9703c_defconfig
index 0a192a090a..c664bf5684 100644
--- a/configs/dserve_dsrv9703c_defconfig
+++ b/configs/dserve_dsrv9703c_defconfig
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/emlid_neutis_n5_devboard_defconfig b/configs/emlid_neutis_n5_devboard_defconfig
index c1307aa1c5..e85287e3ec 100644
--- a/configs/emlid_neutis_n5_devboard_defconfig
+++ b/configs/emlid_neutis_n5_devboard_defconfig
@@ -8,6 +8,7 @@ CONFIG_DRAM_ZQ=3881977
# CONFIG_DRAM_ODT_EN is not set
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index aded18fb77..cec52592ef 100644
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -20,6 +20,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_ARCH_MISC_INIT=y
diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
index 5e6bb54551..167cdd9758 100644
--- a/configs/evb-rk3036_defconfig
+++ b/configs/evb-rk3036_defconfig
@@ -13,6 +13,7 @@ CONFIG_DEBUG_UART_BASE=0x20068000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_DEFAULT_FDT_FILE="rk3036-evb.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
index 31c1b1719c..f910be6348 100644
--- a/configs/evb-rk3229_defconfig
+++ b/configs/evb-rk3229_defconfig
@@ -17,12 +17,12 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_FIT_SOURCE="arch/arm/mach-rockchip/fit_spl_optee.its"
+CONFIG_USE_PREBOOT=y
CONFIG_DEFAULT_FDT_FILE="rk3229-evb.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_TEXT_BASE=0x60000000
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
CONFIG_SPL_OPTEE=y
@@ -71,6 +71,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x2207
CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_FUNCTION_MASS_STORAGE=y
-CONFIG_USE_TINY_PRINTF=y
CONFIG_TPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
index 843c59d30d..144634d386 100644
--- a/configs/evb-rk3288_defconfig
+++ b/configs/evb-rk3288_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_DEFAULT_FDT_FILE="rk3288-evb-rk808.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
@@ -83,6 +84,5 @@ CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_VIDEO_ROCKCHIP_MAX_YRES=1200
CONFIG_DISPLAY_ROCKCHIP_MIPI=y
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
index 6dfaff50ff..536b3eab84 100644
--- a/configs/fennec-rk3288_defconfig
+++ b/configs/fennec-rk3288_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_CONSOLE_MUX=y
CONFIG_DEFAULT_FDT_FILE="rk3288-fennec.dtb"
@@ -80,6 +81,5 @@ CONFIG_USB_FUNCTION_MASS_STORAGE=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index 4cedb28d22..cb8e90ae51 100644
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_DEFAULT_FDT_FILE="rk3288-firefly.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
@@ -90,6 +91,5 @@ CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
CONFIG_CONSOLE_SCROLL_LINES=10
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig
index d8eceac37a..b82325dfe8 100644
--- a/configs/ga10h_v1_1_defconfig
+++ b/configs/ga10h_v1_1_defconfig
@@ -17,6 +17,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index b5d31db322..5984bee1ae 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nSeagate GoFlex Home"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="GoFlexHome> "
diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig
index fe2e00a0b6..d0c1abf080 100644
--- a/configs/gplugd_defconfig
+++ b/configs/gplugd_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x00f00000
CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nMarvell-gplugD"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/gt90h_v4_defconfig b/configs/gt90h_v4_defconfig
index 1cbee126e7..b317d4d1d7 100644
--- a/configs/gt90h_v4_defconfig
+++ b/configs/gt90h_v4_defconfig
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index 787ba6c87a..c1827a16f2 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nMarvell-GuruPlug"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index 19aa73f765..70b663a526 100644
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -18,6 +18,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 1461cb175a..96acfff385 100644
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -18,6 +18,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index f440363d6f..e511fd3cb3 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -18,6 +18,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/h8_homlet_v2_defconfig b/configs/h8_homlet_v2_defconfig
index c1144c4094..70c566da6a 100644
--- a/configs/h8_homlet_v2_defconfig
+++ b/configs/h8_homlet_v2_defconfig
@@ -10,6 +10,7 @@ CONFIG_USB0_VBUS_PIN="PL5"
CONFIG_USB1_VBUS_PIN="PL6"
CONFIG_AXP_GPIO=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
index 3b1737b385..9710c3af72 100644
--- a/configs/helios4_defconfig
+++ b/configs/helios4_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEBUG_UART=y
CONFIG_AHCI=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig
index abb409d23e..6afd64733d 100644
--- a/configs/hrcon_defconfig
+++ b/configs/hrcon_defconfig
@@ -100,6 +100,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=5
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig
index 6f221a3366..544a98c504 100644
--- a/configs/hrcon_dh_defconfig
+++ b/configs/hrcon_dh_defconfig
@@ -101,6 +101,7 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="HRCON_DH"
CONFIG_BOOTDELAY=5
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index 629aea90eb..c512d36ba0 100644
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=384
CONFIG_MACPWR="PH21"
CONFIG_VIDEO_COMPOSITE=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig
index f7b2e4ff0d..6c047ca98b 100644
--- a/configs/iNet_3F_defconfig
+++ b/configs/iNet_3F_defconfig
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig
index 38d80482e9..3b4ffe494b 100644
--- a/configs/iNet_3W_defconfig
+++ b/configs/iNet_3W_defconfig
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig
index 71442226a3..5fff4ad585 100644
--- a/configs/iNet_86VS_defconfig
+++ b/configs/iNet_86VS_defconfig
@@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/iNet_D978_rev2_defconfig b/configs/iNet_D978_rev2_defconfig
index c3fc0b290c..d36c3eec7d 100644
--- a/configs/iNet_D978_rev2_defconfig
+++ b/configs/iNet_D978_rev2_defconfig
@@ -17,6 +17,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index 979f724d85..4998db3669 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_IB62X0=y
CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ib62x0 => "
diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig
index b745dac738..1372c7606c 100644
--- a/configs/icnova-a20-swac_defconfig
+++ b/configs/icnova-a20-swac_defconfig
@@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:209,up:22,lo
CONFIG_VIDEO_LCD_POWER="PH22"
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
CONFIG_CMD_UNZIP=y
# CONFIG_CMD_FLASH is not set
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index eb0e8a9c88..53ba459965 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_ICONNECT=y
CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING=" Iomega iConnect"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="iconnect => "
# CONFIG_CMD_FLASH is not set
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 31ed63c000..418a4b3706 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -121,6 +121,8 @@ CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=1
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="echo;echo Type \"run nfsboot\" to mount root filesystem over NFS;echo"
CONFIG_MISC_INIT_R=y
CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/inet1_defconfig b/configs/inet1_defconfig
index 831b5d0041..3cb6664157 100644
--- a/configs/inet1_defconfig
+++ b/configs/inet1_defconfig
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/inet86dz_defconfig b/configs/inet86dz_defconfig
index 77da929584..9038811eac 100644
--- a/configs/inet86dz_defconfig
+++ b/configs/inet86dz_defconfig
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/inet97fv2_defconfig b/configs/inet97fv2_defconfig
index a5e4c6a9db..2b43142bc6 100644
--- a/configs/inet97fv2_defconfig
+++ b/configs/inet97fv2_defconfig
@@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/inet98v_rev2_defconfig b/configs/inet98v_rev2_defconfig
index d96250d23f..76baeec5f2 100644
--- a/configs/inet98v_rev2_defconfig
+++ b/configs/inet98v_rev2_defconfig
@@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/inet9f_rev03_defconfig b/configs/inet9f_rev03_defconfig
index c19c10fba7..771dc1fadf 100644
--- a/configs/inet9f_rev03_defconfig
+++ b/configs/inet9f_rev03_defconfig
@@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/inet_q972_defconfig b/configs/inet_q972_defconfig
index 66c7628a0d..4b26a926a6 100644
--- a/configs/inet_q972_defconfig
+++ b/configs/inet_q972_defconfig
@@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
CONFIG_VIDEO_LCD_BL_EN="PA25"
CONFIG_VIDEO_LCD_BL_PWM="PH13"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 53898a15c5..daf6662abf 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig
index 974e63c61d..ab4a2718de 100644
--- a/configs/jesurun_q5_defconfig
+++ b/configs/jesurun_q5_defconfig
@@ -8,6 +8,7 @@ CONFIG_MACPWR="PH19"
CONFIG_USB0_VBUS_PIN="PB9"
CONFIG_VIDEO_COMPOSITE=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
index 921af0d476..c343198fad 100644
--- a/configs/kylin-rk3036_defconfig
+++ b/configs/kylin-rk3036_defconfig
@@ -13,6 +13,7 @@ CONFIG_DEBUG_UART_BASE=0x20068000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_DEFAULT_FDT_FILE="rk3036-kylin.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig
index 55785a3559..f4f7b068a1 100644
--- a/configs/libretech-ac_defconfig
+++ b/configs/libretech-ac_defconfig
@@ -9,6 +9,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_IDENT_STRING=" libretech-ac"
CONFIG_DEBUG_UART=y
CONFIG_OF_BOARD_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/libretech_all_h3_cc_h2_plus_defconfig b/configs/libretech_all_h3_cc_h2_plus_defconfig
index 7d42356993..d9c9b6de47 100644
--- a/configs/libretech_all_h3_cc_h2_plus_defconfig
+++ b/configs/libretech_all_h3_cc_h2_plus_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=672
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/libretech_all_h3_cc_h3_defconfig b/configs/libretech_all_h3_cc_h3_defconfig
index 7ef0000cd5..e99dc5c172 100644
--- a/configs/libretech_all_h3_cc_h3_defconfig
+++ b/configs/libretech_all_h3_cc_h3_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=672
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/libretech_all_h3_cc_h5_defconfig b/configs/libretech_all_h3_cc_h5_defconfig
index 1e22469022..088246d60b 100644
--- a/configs/libretech_all_h3_cc_h5_defconfig
+++ b/configs/libretech_all_h3_cc_h5_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN50I_H5=y
CONFIG_DRAM_CLK=672
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index cb1538a3ea..010beaebdb 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -13,6 +13,7 @@ CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2"
CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}"
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_MISC_INIT_R=y
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index 9d12ef9bd6..1223d7131a 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -13,6 +13,7 @@ CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2"
CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}"
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_MISC_INIT_R=y
diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index 3a5fa26bcd..fa2e67d2a8 100644
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -18,6 +18,8 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/menlo/m53menlo/imximage.cfg"
CONFIG_BOOTDELAY=1
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttymxc0,115200"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="run try_bootscript"
CONFIG_VERSION_VARIABLE=y
CONFIG_BOARD_LATE_INIT=y
CONFIG_SPL_TEXT_BASE=0x70008000
diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index 0d4b6264e9..581e5bf756 100644
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -14,6 +14,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_DEBUG_UART=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig
index 0bef67e8cd..479466286f 100644
--- a/configs/meesc_dataflash_defconfig
+++ b/configs/meesc_dataflash_defconfig
@@ -6,9 +6,11 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SECT_SIZE=0x210
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_MISC_INIT_R=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
@@ -24,7 +26,6 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_USE_ENV_SPI_MAX_HZ=y
CONFIG_ENV_SPI_MAX_HZ=15000000
-CONFIG_ENV_SECT_SIZE=0x210
CONFIG_DM=y
CONFIG_CLK=y
CONFIG_CLK_AT91=y
diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig
index 970e8b8052..74426677d4 100644
--- a/configs/meesc_defconfig
+++ b/configs/meesc_defconfig
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_MISC_INIT_R=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index e8756267b0..94b9c78a6c 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -15,6 +15,8 @@ CONFIG_FIT_VERBOSE=y
CONFIG_BOOTDELAY=-1
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=romfs"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="echo U-BOOT for ${hostname};setenv preboot;echo"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_DISPLAY_BOARDINFO=y
CONFIG_SPL_BOARD_INIT=y
diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
index 936192f547..335b960fba 100644
--- a/configs/miqi-rk3288_defconfig
+++ b/configs/miqi-rk3288_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_DEFAULT_FDT_FILE="rk3288-miqi.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
@@ -85,6 +86,5 @@ CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
CONFIG_CONSOLE_SCROLL_LINES=10
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig
index 4dce096d69..04d2426361 100644
--- a/configs/mixtile_loftq_defconfig
+++ b/configs/mixtile_loftq_defconfig
@@ -9,6 +9,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_USB1_VBUS_PIN="PH24"
CONFIG_USB2_VBUS_PIN=""
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig
index 48659dbb09..396879015e 100644
--- a/configs/mk802_a10s_defconfig
+++ b/configs/mk802_a10s_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=432
CONFIG_DRAM_EMR1=0
CONFIG_USB1_VBUS_PIN="PB10"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig
index 58986e3d9c..416cb9a9c2 100644
--- a/configs/mk802_defconfig
+++ b/configs/mk802_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL=y
CONFIG_MACH_SUN4I=y
CONFIG_USB2_VBUS_PIN="PH12"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig
index 243a19500c..221c2bc88b 100644
--- a/configs/mk802ii_defconfig
+++ b/configs/mk802ii_defconfig
@@ -4,6 +4,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y
CONFIG_MACH_SUN4I=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig
index 209349bf64..900c98de35 100644
--- a/configs/mvebu_db-88f3720_defconfig
+++ b/configs/mvebu_db-88f3720_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEBUG_UART=y
CONFIG_AHCI=y
CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig
index 7697d7552c..875db3b40b 100644
--- a/configs/mvebu_db_armada8k_defconfig
+++ b/configs/mvebu_db_armada8k_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART=y
CONFIG_AHCI=y
CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig
index cdfa091efc..2d834e5170 100644
--- a/configs/mvebu_espressobin-88f3720_defconfig
+++ b/configs/mvebu_espressobin-88f3720_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEBUG_UART=y
CONFIG_AHCI=y
CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig
index 39a49d5bf9..6b05522870 100644
--- a/configs/mvebu_mcbin-88f8040_defconfig
+++ b/configs/mvebu_mcbin-88f8040_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEBUG_UART=y
CONFIG_AHCI=y
CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index 42b37af0dc..d30687a56f 100644
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -5,6 +5,7 @@ CONFIG_TARGET_MX51EVK=y
CONFIG_NR_DRAM_BANKS=1
# CONFIG_CMD_BMODE is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg"
+CONFIG_USE_PREBOOT=y
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig
index e57d0dfc67..4ed38250f3 100644
--- a/configs/mx53cx9020_defconfig
+++ b/configs/mx53cx9020_defconfig
@@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=2
# CONFIG_CMD_BMODE is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beckhoff/mx53cx9020/imximage.cfg"
CONFIG_BOOTDELAY=1
+CONFIG_USE_PREBOOT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
index 2c76b83d5e..b4c3b0e315 100644
--- a/configs/mx53loco_defconfig
+++ b/configs/mx53loco_defconfig
@@ -5,6 +5,7 @@ CONFIG_TARGET_MX53LOCO=y
CONFIG_NR_DRAM_BANKS=2
# CONFIG_CMD_BMODE is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg"
+CONFIG_USE_PREBOOT=y
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index cc2ed9af9c..9fc443c386 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -15,6 +15,8 @@ CONFIG_CMD_HDMIDETECT=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="if hdmidet; then usb start; setenv stdin serial,usbkbd; setenv stdout serial,vga; setenv stderr serial,vga; else setenv stdin serial; setenv stdout serial; setenv stderr serial; fi;"
CONFIG_BOUNCE_BUFFER=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL_TEXT_BASE=0x00908000
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 0d402f2196..65e9c4f117 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -8,6 +8,7 @@ CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
CONFIG_BOOTDELAY=3
# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_MISC_INIT_R=y
CONFIG_BOUNCE_BUFFER=y
diff --git a/configs/nanopi_a64_defconfig b/configs/nanopi_a64_defconfig
index eb031e661f..95a9c965f7 100644
--- a/configs/nanopi_a64_defconfig
+++ b/configs/nanopi_a64_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL=y
CONFIG_MACH_SUN50I=y
CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/nanopi_m1_defconfig b/configs/nanopi_m1_defconfig
index f021d87190..7568fb1b4b 100644
--- a/configs/nanopi_m1_defconfig
+++ b/configs/nanopi_m1_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL=y
CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=408
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/nanopi_m1_plus_defconfig b/configs/nanopi_m1_plus_defconfig
index c676579e54..a359de8069 100644
--- a/configs/nanopi_m1_plus_defconfig
+++ b/configs/nanopi_m1_plus_defconfig
@@ -8,6 +8,7 @@ CONFIG_MACPWR="PD6"
CONFIG_MMC0_CD_PIN="PH13"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/nanopi_neo2_defconfig b/configs/nanopi_neo2_defconfig
index 984d9ddb84..cfda325442 100644
--- a/configs/nanopi_neo2_defconfig
+++ b/configs/nanopi_neo2_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=672
CONFIG_DRAM_ZQ=3881977
# CONFIG_DRAM_ODT_EN is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
index bba31fc1bc..246658b699 100644
--- a/configs/nanopi_neo_air_defconfig
+++ b/configs/nanopi_neo_air_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=408
# CONFIG_VIDEO_DE2 is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/nanopi_neo_defconfig b/configs/nanopi_neo_defconfig
index af36ad43af..fba6ff516d 100644
--- a/configs/nanopi_neo_defconfig
+++ b/configs/nanopi_neo_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=408
# CONFIG_VIDEO_DE2 is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
index 3aa9ceaa6a..5f78a8b63a 100644
--- a/configs/nanopi_neo_plus2_defconfig
+++ b/configs/nanopi_neo_plus2_defconfig
@@ -9,6 +9,7 @@ CONFIG_DRAM_ZQ=3881977
CONFIG_MACPWR="PD6"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 80b122d74f..4672e78c3f 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nNAS 220"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="nas220> "
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 9ae774a0ec..e5dd072347 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 6611046803..3d2a95a0e7 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 41eeab8ad1..5fc9e94a4d 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index fd56ae0dc2..c6460dd324 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index ffb60dabcf..6427c79215 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 015675b377..c50e79aba8 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index ee353f2f29..85a8a8d708 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index ebd9bf8dee..5a2df361fd 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index d324282ea5..fdc0f2b03f 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index b26bce4923..230b12f7e6 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index a2fb07f9b2..72e590a4fe 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index fe2ecf6c94..5cd96017e5 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -5,6 +5,8 @@ CONFIG_SYS_TEXT_BASE=0x80008000
CONFIG_TARGET_NOKIA_RX51=y
CONFIG_NR_DRAM_BANKS=2
CONFIG_BOOTDELAY=30
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="setenv mmcnum 1; setenv mmcpart 1;setenv mmcscriptfile bootmenu.scr;if run switchmmc; then setenv mmcdone true;setenv mmctype fat;if run scriptload; then true; else setenv mmctype ext2;if run scriptload; then true; else setenv mmctype ext4;if run scriptload; then true; else setenv mmcdone false;fi;fi;fi;if ${mmcdone}; then run scriptboot;fi;fi;if run slide; then true; else setenv bootmenu_delay 0;setenv bootdelay 0;fi"
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index a428d76129..d74149e3c5 100644
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
CONFIG_TARGET_NSA310S=y
CONFIG_NR_DRAM_BANKS=2
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="nsa310s => "
diff --git a/configs/oceanic_5205_5inmfd_defconfig b/configs/oceanic_5205_5inmfd_defconfig
index 219de7ae50..23a181335b 100644
--- a/configs/oceanic_5205_5inmfd_defconfig
+++ b/configs/oceanic_5205_5inmfd_defconfig
@@ -10,6 +10,7 @@ CONFIG_DRAM_ZQ=3881949
CONFIG_MMC0_CD_PIN=""
CONFIG_SPL_SPI_SUNXI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
index 3a529e8836..66736d065a 100644
--- a/configs/omap35_logic_defconfig
+++ b/configs/omap35_logic_defconfig
@@ -12,6 +12,8 @@ CONFIG_SPL=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_ANDROID_BOOT_IMAGE=y
# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="setenv preboot;saveenv;"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="logicpd-torpedo-35xx-devkit.dtb"
CONFIG_VERSION_VARIABLE=y
diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
index fb7e7146b2..8ed962c255 100644
--- a/configs/omap35_logic_somlv_defconfig
+++ b/configs/omap35_logic_somlv_defconfig
@@ -12,6 +12,8 @@ CONFIG_SPL=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_ANDROID_BOOT_IMAGE=y
# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="setenv preboot;saveenv;"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="logicpd-som-lv-35xx-devkit.dtb"
CONFIG_VERSION_VARIABLE=y
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index b389d1d3c5..4a2bbdc339 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -10,6 +10,8 @@ CONFIG_SPL=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_TPL_SYS_MALLOC_F_LEN=0x400
CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="omap3-beagle.dtb"
CONFIG_VERSION_VARIABLE=y
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 26d0e65589..8b1719280b 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -9,6 +9,7 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_TPL_SYS_MALLOC_F_LEN=0x400
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb"
CONFIG_VERSION_VARIABLE=y
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 0868e33131..b747f147ab 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -12,6 +12,8 @@ CONFIG_SPL=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_ANDROID_BOOT_IMAGE=y
# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="setenv preboot;saveenv;"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y
CONFIG_SPL_TEXT_BASE=0x40200000
diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
index f8dd7f37df..d93ec395d0 100644
--- a/configs/omap3_logic_somlv_defconfig
+++ b/configs/omap3_logic_somlv_defconfig
@@ -12,6 +12,8 @@ CONFIG_SPL=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_ANDROID_BOOT_IMAGE=y
# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="setenv preboot;saveenv;"
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="logicpd-som-lv-37xx-devkit.dtb"
CONFIG_VERSION_VARIABLE=y
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index 23521b295f..2b9fd16182 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nOpenRD-Base"
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_LOGLEVEL=2
# CONFIG_DISPLAY_BOARDINFO is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index ea53231555..4e9a99f7ba 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nOpenRD-Client"
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_LOGLEVEL=2
# CONFIG_DISPLAY_BOARDINFO is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index 589e248bbd..aeae24b1f5 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nOpenRD-Ultimate"
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_LOGLEVEL=2
# CONFIG_DISPLAY_BOARDINFO is not set
# CONFIG_CMD_FLASH is not set
diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig
index 4f8bc289bd..14e15b03b2 100644
--- a/configs/opos6uldev_defconfig
+++ b/configs/opos6uldev_defconfig
@@ -16,6 +16,8 @@ CONFIG_TPL_SYS_MALLOC_F_LEN=0x400
CONFIG_BOOTDELAY=5
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttymxc0,115200"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="run check_env"
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SUPPORT_RAW_INITRD=y
diff --git a/configs/orangepi_2_defconfig b/configs/orangepi_2_defconfig
index a561a117d4..664b4b3541 100644
--- a/configs/orangepi_2_defconfig
+++ b/configs/orangepi_2_defconfig
@@ -7,6 +7,7 @@ CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=672
CONFIG_USB1_VBUS_PIN="PG13"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/orangepi_lite2_defconfig b/configs/orangepi_lite2_defconfig
index 74c11d8355..0d6101fc68 100644
--- a/configs/orangepi_lite2_defconfig
+++ b/configs/orangepi_lite2_defconfig
@@ -7,6 +7,7 @@ CONFIG_SUNXI_DRAM_H6_LPDDR3=y
CONFIG_MMC0_CD_PIN="PF6"
# CONFIG_PSCI_RESET is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig
index 8b274e651b..5638c4a3a6 100644
--- a/configs/orangepi_lite_defconfig
+++ b/configs/orangepi_lite_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL=y
CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=672
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig
index b56588a42e..4fe81f8ab9 100644
--- a/configs/orangepi_one_defconfig
+++ b/configs/orangepi_one_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL=y
CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=672
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/orangepi_one_plus_defconfig b/configs/orangepi_one_plus_defconfig
index f86bb29e34..890e6abd45 100644
--- a/configs/orangepi_one_plus_defconfig
+++ b/configs/orangepi_one_plus_defconfig
@@ -7,6 +7,7 @@ CONFIG_SUNXI_DRAM_H6_LPDDR3=y
CONFIG_MMC0_CD_PIN="PF6"
# CONFIG_PSCI_RESET is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig
index 15ad3af991..84801a6586 100644
--- a/configs/orangepi_pc2_defconfig
+++ b/configs/orangepi_pc2_defconfig
@@ -9,6 +9,7 @@ CONFIG_DRAM_ZQ=3881977
CONFIG_MACPWR="PD6"
CONFIG_SPL_SPI_SUNXI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig
index 7fe516ecf6..6ac46649c9 100644
--- a/configs/orangepi_pc_defconfig
+++ b/configs/orangepi_pc_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL=y
CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=624
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig
index 8586bfc188..685b577a31 100644
--- a/configs/orangepi_pc_plus_defconfig
+++ b/configs/orangepi_pc_plus_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN8I_H3=y
CONFIG_DRAM_CLK=624
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig
index 59294bc09b..79da5ce235 100644
--- a/configs/orangepi_plus2e_defconfig
+++ b/configs/orangepi_plus2e_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=672
CONFIG_MACPWR="PD6"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
index e63295495b..808f937b1d 100644
--- a/configs/orangepi_plus_defconfig
+++ b/configs/orangepi_plus_defconfig
@@ -9,6 +9,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_USB1_VBUS_PIN="PG13"
CONFIG_SATAPWR="PG11"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig
index 8a8266935f..d7b80040de 100644
--- a/configs/orangepi_prime_defconfig
+++ b/configs/orangepi_prime_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=672
CONFIG_DRAM_ZQ=3881977
# CONFIG_DRAM_ODT_EN is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig
index d80d83a5db..b2aa3eef3f 100644
--- a/configs/orangepi_r1_defconfig
+++ b/configs/orangepi_r1_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=624
# CONFIG_VIDEO_DE2 is not set
CONFIG_SPL_SPI_SUNXI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
# CONFIG_CMD_FLASH is not set
CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-r1"
diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig
index 5b800b59bb..8a9cc40095 100644
--- a/configs/orangepi_win_defconfig
+++ b/configs/orangepi_win_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN50I=y
CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
CONFIG_SPL_SPI_SUNXI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig
index 69471de36b..a7c72f7c80 100644
--- a/configs/orangepi_zero_defconfig
+++ b/configs/orangepi_zero_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=624
# CONFIG_VIDEO_DE2 is not set
CONFIG_SPL_SPI_SUNXI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_CONSOLE_MUX=y
# CONFIG_CMD_FLASH is not set
CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero"
diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig
index ed417dc306..7cfb39dcdf 100644
--- a/configs/orangepi_zero_plus2_defconfig
+++ b/configs/orangepi_zero_plus2_defconfig
@@ -9,6 +9,7 @@ CONFIG_DRAM_ZQ=3881977
CONFIG_MMC0_CD_PIN="PH13"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig
index ad3a6b739f..c63b70f20c 100644
--- a/configs/orangepi_zero_plus_defconfig
+++ b/configs/orangepi_zero_plus_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=624
CONFIG_DRAM_ZQ=3881977
# CONFIG_DRAM_ODT_EN is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig
index 02c6d7126b..b33b0c4028 100644
--- a/configs/ot1200_defconfig
+++ b/configs/ot1200_defconfig
@@ -5,6 +5,7 @@ CONFIG_TARGET_OT1200=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
CONFIG_BOUNCE_BUFFER=y
diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig
index dd745911ea..82ee6d0fc6 100644
--- a/configs/ot1200_spl_defconfig
+++ b/configs/ot1200_spl_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
CONFIG_BOUNCE_BUFFER=y
diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
index 50147457b1..d0ef1b6fa5 100644
--- a/configs/parrot_r16_defconfig
+++ b/configs/parrot_r16_defconfig
@@ -12,6 +12,7 @@ CONFIG_USB0_ID_DET="PD10"
CONFIG_USB1_VBUS_PIN="PD12"
CONFIG_AXP_GPIO=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_PARTITION_UUIDS is not set
diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig
index 2e6a4a7621..4a67b00935 100644
--- a/configs/phycore-rk3288_defconfig
+++ b/configs/phycore-rk3288_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_CONSOLE_MUX=y
CONFIG_DEFAULT_FDT_FILE="rk3288-phycore-rdk.dtb"
@@ -84,6 +85,5 @@ CONFIG_USB_FUNCTION_MASS_STORAGE=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/pine64-lts_defconfig b/configs/pine64-lts_defconfig
index 0da6b70ea8..35c05f7f28 100644
--- a/configs/pine64-lts_defconfig
+++ b/configs/pine64-lts_defconfig
@@ -10,6 +10,7 @@ CONFIG_MMC0_CD_PIN=""
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_SPL_SPI_SUNXI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig
index 65ea32d1ff..a7ea1bcc89 100644
--- a/configs/pine64_plus_defconfig
+++ b/configs/pine64_plus_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN50I=y
CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
CONFIG_PINE64_DT_SELECTION=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/pine_h64_defconfig b/configs/pine_h64_defconfig
index dd1368af39..c840ca0a18 100644
--- a/configs/pine_h64_defconfig
+++ b/configs/pine_h64_defconfig
@@ -6,12 +6,13 @@ CONFIG_MACH_SUN50I_H6=y
CONFIG_SUNXI_DRAM_H6_LPDDR3=y
CONFIG_MMC0_CD_PIN="PF6"
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_USB3_VBUS_PIN="PL5"
# CONFIG_PSCI_RESET is not set
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-pine-h64"
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OHCI_HCD=y
-CONFIG_USB3_VBUS_PIN="PL5"
diff --git a/configs/pinebook_defconfig b/configs/pinebook_defconfig
index 2760f8cc39..1ed907df7a 100644
--- a/configs/pinebook_defconfig
+++ b/configs/pinebook_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=552
CONFIG_DRAM_ZQ=3881949
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_R_I2C_ENABLE=y
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
index 130d8accd3..4cc4954e84 100644
--- a/configs/platinum_picon_defconfig
+++ b/configs/platinum_picon_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
CONFIG_BOUNCE_BUFFER=y
diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
index 71914ad83f..1410bf8c8d 100644
--- a/configs/platinum_titanium_defconfig
+++ b/configs/platinum_titanium_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL=y
CONFIG_SPL_LIBDISK_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_MISC_INIT_R=y
CONFIG_BOUNCE_BUFFER=y
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index 58780607eb..7207eb41bc 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_POGO_E02=y
CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nPogo E02"
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="PogoE02> "
# CONFIG_CMD_FLASH is not set
diff --git a/configs/polaroid_mid2407pxe03_defconfig b/configs/polaroid_mid2407pxe03_defconfig
index 0186a69424..012e1f2434 100644
--- a/configs/polaroid_mid2407pxe03_defconfig
+++ b/configs/polaroid_mid2407pxe03_defconfig
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/polaroid_mid2809pxe04_defconfig b/configs/polaroid_mid2809pxe04_defconfig
index 265e6b85f9..3564ddc9a1 100644
--- a/configs/polaroid_mid2809pxe04_defconfig
+++ b/configs/polaroid_mid2809pxe04_defconfig
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
index 902294bc3c..f0b6313afa 100644
--- a/configs/popmetal-rk3288_defconfig
+++ b/configs/popmetal-rk3288_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_CONSOLE_MUX=y
CONFIG_DEFAULT_FDT_FILE="rk3288-popmetal.dtb"
@@ -80,6 +81,5 @@ CONFIG_USB_FUNCTION_MASS_STORAGE=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/pov_protab2_ips9_defconfig b/configs/pov_protab2_ips9_defconfig
index 80cdacfd4d..0b6bf6dfd8 100644
--- a/configs/pov_protab2_ips9_defconfig
+++ b/configs/pov_protab2_ips9_defconfig
@@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 31f5888184..a34620b6f7 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -19,6 +19,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/q8_a13_tablet_defconfig b/configs/q8_a13_tablet_defconfig
index 8f81b9a7bf..4933e6f861 100644
--- a/configs/q8_a13_tablet_defconfig
+++ b/configs/q8_a13_tablet_defconfig
@@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/q8_a23_tablet_800x480_defconfig b/configs/q8_a23_tablet_800x480_defconfig
index 04132688ef..59683190cc 100644
--- a/configs/q8_a23_tablet_800x480_defconfig
+++ b/configs/q8_a23_tablet_800x480_defconfig
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/q8_a33_tablet_1024x600_defconfig b/configs/q8_a33_tablet_1024x600_defconfig
index 7367306ecf..05a82c41f8 100644
--- a/configs/q8_a33_tablet_1024x600_defconfig
+++ b/configs/q8_a33_tablet_1024x600_defconfig
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/q8_a33_tablet_800x480_defconfig b/configs/q8_a33_tablet_800x480_defconfig
index 03006e382c..94a680ce8b 100644
--- a/configs/q8_a33_tablet_800x480_defconfig
+++ b/configs/q8_a33_tablet_800x480_defconfig
@@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
CONFIG_VIDEO_LCD_BL_EN="PH6"
CONFIG_VIDEO_LCD_BL_PWM="PH0"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig
index b47e256a02..7237819909 100644
--- a/configs/qemu_arm64_defconfig
+++ b/configs/qemu_arm64_defconfig
@@ -4,6 +4,8 @@ CONFIG_TARGET_QEMU_ARM_64BIT=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_AHCI=y
CONFIG_DISTRO_DEFAULTS=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="pci enum"
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_CMD_BOOTEFI_SELFTEST=y
diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig
index 19d572afb4..7c95892d98 100644
--- a/configs/qemu_arm_defconfig
+++ b/configs/qemu_arm_defconfig
@@ -5,6 +5,8 @@ CONFIG_TARGET_QEMU_ARM_32BIT=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_AHCI=y
CONFIG_DISTRO_DEFAULTS=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="pci enum"
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_CMD_BOOTEFI_SELFTEST=y
diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
index 500d5e95e3..b7d738526d 100644
--- a/configs/r7-tv-dongle_defconfig
+++ b/configs/r7-tv-dongle_defconfig
@@ -6,6 +6,7 @@ CONFIG_MACH_SUN5I=y
CONFIG_DRAM_CLK=384
CONFIG_USB1_VBUS_PIN="PG13"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index efd6e49333..fa1d0daa59 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -19,6 +19,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_ARCH_MISC_INIT=y
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index 7639b558cf..72c6b1f756 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_DEFAULT_FDT_FILE="rk3288-rock2-square.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
@@ -83,6 +84,5 @@ CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
CONFIG_CONSOLE_SCROLL_LINES=10
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/rock_defconfig b/configs/rock_defconfig
index 5c29548059..37cd5c55c3 100644
--- a/configs/rock_defconfig
+++ b/configs/rock_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL_STACK_R_ADDR=0x60080000
CONFIG_DEBUG_UART_BASE=0x20064000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
+CONFIG_USE_PREBOOT=y
CONFIG_DEFAULT_FDT_FILE="rk3188-radxarock.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
index 1ab35f1b25..3d56b4ac7c 100644
--- a/configs/rpi_0_w_defconfig
+++ b/configs/rpi_0_w_defconfig
@@ -5,6 +5,8 @@ CONFIG_TARGET_RPI_0_W=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 53aa554cc7..3cb2bb6713 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -5,6 +5,8 @@ CONFIG_TARGET_RPI_2=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index c33ea58438..9d9d12074e 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -6,6 +6,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_NR_DRAM_BANKS=1
CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
index 2ae7b6dcae..7655fe7060 100644
--- a/configs/rpi_3_b_plus_defconfig
+++ b/configs/rpi_3_b_plus_defconfig
@@ -3,9 +3,11 @@ CONFIG_ARCH_BCM283X=y
CONFIG_SYS_TEXT_BASE=0x00080000
CONFIG_TARGET_RPI_3=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_DISTRO_DEFAULTS=y
CONFIG_NR_DRAM_BANKS=1
+CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index 98573bb89a..af8718a1ee 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -6,6 +6,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_NR_DRAM_BANKS=1
CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index bd15c98697..55d70eb68a 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -5,6 +5,8 @@ CONFIG_TARGET_RPI=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 330f7e2371..7669053e6b 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -19,6 +19,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 47c4540656..efc8586e8b 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -5,6 +5,8 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_TEGRA20=y
CONFIG_TARGET_SEABOARD=y
CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
CONFIG_SPL_TEXT_BASE=0x00108000
CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # "
# CONFIG_CMD_IMI is not set
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 74a52e6670..73f567f0c9 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_IDENT_STRING="\nMarvell-Sheevaplug"
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
diff --git a/configs/socfpga_dbm_soc1_defconfig b/configs/socfpga_dbm_soc1_defconfig
index dd14be4219..66f894efd2 100644
--- a/configs/socfpga_dbm_soc1_defconfig
+++ b/configs/socfpga_dbm_soc1_defconfig
@@ -4,6 +4,8 @@ CONFIG_TARGET_SOCFPGA_DEVBOARDS_DBM_SOC1=y
CONFIG_FIT=y
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="run try_bootscript"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
index 958f146e1c..1a9323f822 100644
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -7,6 +7,8 @@ CONFIG_BOOTDELAY=5
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="setenv hostname vining-${unit_serial} ; setenv PS1 "${unit_ident} (${unit_serial}) => " ; if gpio input 78 ; then setenv bootdelay 10 ; setenv boottype rcvr ; else setenv bootdelay 5 ; setenv boottype norm ; fi"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index 2d5e158871..720e3294ac 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -7,6 +7,8 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTDELAY=1
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="echo;echo Welcome on the ABB Socrates Board;echo"
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_BOARD_EARLY_INIT_R=y
diff --git a/configs/sopine_baseboard_defconfig b/configs/sopine_baseboard_defconfig
index e47218cb6a..b78f9e8807 100644
--- a/configs/sopine_baseboard_defconfig
+++ b/configs/sopine_baseboard_defconfig
@@ -11,6 +11,7 @@ CONFIG_MMC0_CD_PIN=""
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_SPL_SPI_SUNXI=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig
index 1bdbe9ebdd..6a561d0cd1 100644
--- a/configs/strider_con_defconfig
+++ b/configs/strider_con_defconfig
@@ -95,6 +95,7 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="STRIDER_CON"
CONFIG_BOOTDELAY=5
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/strider_con_dp_defconfig b/configs/strider_con_dp_defconfig
index 424c915c29..eb4ad77456 100644
--- a/configs/strider_con_dp_defconfig
+++ b/configs/strider_con_dp_defconfig
@@ -95,6 +95,7 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="STRIDER_CON_DP"
CONFIG_BOOTDELAY=5
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/strider_cpu_defconfig b/configs/strider_cpu_defconfig
index 1149b13bef..8a48df25f6 100644
--- a/configs/strider_cpu_defconfig
+++ b/configs/strider_cpu_defconfig
@@ -95,6 +95,7 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="STRIDER_CPU"
CONFIG_BOOTDELAY=5
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/strider_cpu_dp_defconfig b/configs/strider_cpu_dp_defconfig
index ec68d3d3e8..26793dbdd6 100644
--- a/configs/strider_cpu_dp_defconfig
+++ b/configs/strider_cpu_dp_defconfig
@@ -95,6 +95,7 @@ CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="STRIDER_CPU,STRIDER_CPU_DP"
CONFIG_BOOTDELAY=5
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/sun8i_a23_evb_defconfig b/configs/sun8i_a23_evb_defconfig
index 3543e95883..34cbb1e0c1 100644
--- a/configs/sun8i_a23_evb_defconfig
+++ b/configs/sun8i_a23_evb_defconfig
@@ -9,6 +9,7 @@ CONFIG_USB0_VBUS_PIN="axp_drivebus"
CONFIG_USB0_VBUS_DET="axp_vbus_detect"
CONFIG_USB1_VBUS_PIN="PH7"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig
index 62b6838a95..f3d77f1cd1 100644
--- a/configs/sunxi_Gemei_G9_defconfig
+++ b/configs/sunxi_Gemei_G9_defconfig
@@ -11,6 +11,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_VIDEO_LCD_PANEL_LVDS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig
index ac1bac877d..8b72983b23 100644
--- a/configs/syzygy_hub_defconfig
+++ b/configs/syzygy_hub_defconfig
@@ -16,6 +16,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="Zynq> "
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 17c90a7d6c..88fbbf4bc0 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -7,6 +7,8 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y
CONFIG_AHCI=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start; if hdmidet; then run set_con_hdmi; else run set_con_serial; fi"
CONFIG_PRE_CONSOLE_BUFFER=y
CONFIG_PRE_CON_BUF_ADDR=0x7c000000
CONFIG_SUPPORT_RAW_INITRD=y
diff --git a/configs/tbs_a711_defconfig b/configs/tbs_a711_defconfig
index d56bf68468..196c4ce400 100644
--- a/configs/tbs_a711_defconfig
+++ b/configs/tbs_a711_defconfig
@@ -13,6 +13,7 @@ CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
CONFIG_USB0_ID_DET="PH11"
CONFIG_AXP_GPIO=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/teres_i_defconfig b/configs/teres_i_defconfig
index 421a8d3d40..cfd696f8a3 100644
--- a/configs/teres_i_defconfig
+++ b/configs/teres_i_defconfig
@@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=3881949
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
CONFIG_USB1_VBUS_PIN="PL7"
CONFIG_I2C0_ENABLE=y
+CONFIG_USE_PREBOOT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
index 1327edd6b9..770804f893 100644
--- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
+++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
@@ -18,6 +18,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_SHOW_BOOT_PROGRESS=y
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig
index 651c0ce40a..d69c2a91db 100644
--- a/configs/theadorable-x86-conga-qa3-e3845_defconfig
+++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig
@@ -17,6 +17,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_SHOW_BOOT_PROGRESS=y
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 9ac8379007..d53aff0ea0 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_SHOW_BOOT_PROGRESS=y
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_LAST_STAGE_INIT=y
diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index 50f9df0db4..9b003870e5 100644
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEBUG_UART=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_FIT=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index 68ce230704..4c52610271 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -19,6 +19,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_ARCH_MISC_INIT=y
diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
index 482ee7d555..976f8f429d 100644
--- a/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_CONSOLE_MUX=y
CONFIG_DEFAULT_FDT_FILE="rk3288-tinker.dtb"
@@ -80,6 +81,5 @@ CONFIG_USB_FUNCTION_MASS_STORAGE=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig
index 6b126c52c0..daab4b2998 100644
--- a/configs/topic_miami_defconfig
+++ b/configs/topic_miami_defconfig
@@ -14,6 +14,7 @@ CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_CUSTOM_LDSCRIPT=y
CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
CONFIG_BOOTDELAY=0
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_PROMPT="zynq-uboot> "
diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig
index a0b016c004..f92014224a 100644
--- a/configs/topic_miamilite_defconfig
+++ b/configs/topic_miamilite_defconfig
@@ -14,6 +14,7 @@ CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_CUSTOM_LDSCRIPT=y
CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
CONFIG_BOOTDELAY=0
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_PROMPT="zynq-uboot> "
diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
index c34b034072..9ba7282c6f 100644
--- a/configs/topic_miamiplus_defconfig
+++ b/configs/topic_miamiplus_defconfig
@@ -14,6 +14,7 @@ CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_CUSTOM_LDSCRIPT=y
CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
CONFIG_BOOTDELAY=0
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_PROMPT="zynq-uboot> "
diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
index d26cb3cfe0..4d3f7ba8ef 100644
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -9,6 +9,7 @@ CONFIG_DEBUG_UART_CLOCK=25804800
CONFIG_DEBUG_UART=y
CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index e04156311f..e7ece9e4b7 100644
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
@@ -20,6 +20,7 @@ CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/uDPU_defconfig b/configs/uDPU_defconfig
index 2209330048..c312b1af6a 100644
--- a/configs/uDPU_defconfig
+++ b/configs/uDPU_defconfig
@@ -12,6 +12,7 @@ CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_FIT=y
CONFIG_SPI_BOOT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index c33862c26a..c16ddb97c1 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -5,6 +5,8 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_TEGRA20=y
CONFIG_TARGET_VENTANA=y
CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
CONFIG_SPL_TEXT_BASE=0x00108000
CONFIG_SYS_PROMPT="Tegra20 (Ventana) # "
# CONFIG_CMD_IMI is not set
diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig
index 1108c6a907..0f0148a3be 100644
--- a/configs/vyasa-rk3288_defconfig
+++ b/configs/vyasa-rk3288_defconfig
@@ -11,6 +11,7 @@ CONFIG_SPL_STACK_R_ADDR=0x80000
CONFIG_DEBUG_UART_BASE=0xff690000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART=y
+CONFIG_USE_PREBOOT=y
CONFIG_SILENT_CONSOLE=y
CONFIG_DEFAULT_FDT_FILE="rk3288-vyasa.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
@@ -85,6 +86,5 @@ CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
CONFIG_CONSOLE_SCROLL_LINES=10
-CONFIG_USE_TINY_PRINTF=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig
index cad95d338e..86819427fa 100644
--- a/configs/xpedite517x_defconfig
+++ b/configs/xpedite517x_defconfig
@@ -8,6 +8,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_HUSH_PARSER=y
# CONFIG_AUTO_COMPLETE is not set
diff --git a/configs/xpedite520x_defconfig b/configs/xpedite520x_defconfig
index 1c0bd951ee..81689a44d5 100644
--- a/configs/xpedite520x_defconfig
+++ b/configs/xpedite520x_defconfig
@@ -8,6 +8,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_MISC_INIT_R is not set
CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig
index e009aabb55..72a2a424e2 100644
--- a/configs/xpedite537x_defconfig
+++ b/configs/xpedite537x_defconfig
@@ -8,6 +8,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_MISC_INIT_R is not set
CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/xpedite550x_defconfig b/configs/xpedite550x_defconfig
index 5d3569b34d..f86d1bdc2d 100644
--- a/configs/xpedite550x_defconfig
+++ b/configs/xpedite550x_defconfig
@@ -8,6 +8,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=3
+CONFIG_USE_PREBOOT=y
# CONFIG_MISC_INIT_R is not set
CONFIG_BOARD_EARLY_INIT_R=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index 60f0efd46e..3bba1ec74a 100644
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0xA0000000
CONFIG_TARGET_ZMX25=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_BOOTDELAY=5
+CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
diff --git a/configs/zynq_cc108_defconfig b/configs/zynq_cc108_defconfig
index 4d914ea725..76a9a120ca 100644
--- a/configs/zynq_cc108_defconfig
+++ b/configs/zynq_cc108_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_PROMPT="Zynq> "
diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig
index fca0382a90..0910d3bf9d 100644
--- a/configs/zynq_cse_nand_defconfig
+++ b/configs/zynq_cse_nand_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL=y
CONFIG_SYS_MALLOC_LEN=0x1000
CONFIG_SYS_CUSTOM_LDSCRIPT=y
CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
+CONFIG_USE_PREBOOT=y
# CONFIG_BOARD_LATE_INIT is not set
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL_STACK_R=y
diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig
index 21d7dd556e..0a6b172b7e 100644
--- a/configs/zynq_cse_nor_defconfig
+++ b/configs/zynq_cse_nor_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL=y
CONFIG_SYS_MALLOC_LEN=0x1000
CONFIG_SYS_CUSTOM_LDSCRIPT=y
CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
+CONFIG_USE_PREBOOT=y
# CONFIG_BOARD_LATE_INIT is not set
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL_STACK_R=y
diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig
index 8f9ba072ba..e12306f844 100644
--- a/configs/zynq_cse_qspi_defconfig
+++ b/configs/zynq_cse_qspi_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEBUG_UART=y
CONFIG_SYS_CUSTOM_LDSCRIPT=y
CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
+CONFIG_USE_PREBOOT=y
# CONFIG_BOARD_LATE_INIT is not set
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_ARCH_EARLY_INIT_R is not set
diff --git a/configs/zynq_dlc20_rev1_0_defconfig b/configs/zynq_dlc20_rev1_0_defconfig
index 1e15889bda..1b4233ca9a 100644
--- a/configs/zynq_dlc20_rev1_0_defconfig
+++ b/configs/zynq_dlc20_rev1_0_defconfig
@@ -15,6 +15,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 1fceccdc09..3de1928e75 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -11,6 +11,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
diff --git a/configs/zynq_minized_defconfig b/configs/zynq_minized_defconfig
index 60fe72f04e..3c95f0aceb 100644
--- a/configs/zynq_minized_defconfig
+++ b/configs/zynq_minized_defconfig
@@ -13,6 +13,7 @@ CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="Zynq> "
diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
index 453cd549c1..6457876ce4 100644
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL=y
CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_CUSTOM_LDSCRIPT=y
CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="Zynq> "
diff --git a/configs/zynq_z_turn_defconfig b/configs/zynq_z_turn_defconfig
index 0908fc767c..ea24915203 100644
--- a/configs/zynq_z_turn_defconfig
+++ b/configs/zynq_z_turn_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index 2ff263034a..caf97d83f1 100644
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -15,6 +15,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 33f26a6f2a..d4fcf9da04 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -17,6 +17,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_SPL_FIT_PRINT=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_FPGA_SUPPORT=y
CONFIG_SPL_OS_BOOT=y
diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index 55ae55edc4..6458e62e1e 100644
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -15,6 +15,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig
index 7792ba29a0..feedb327bd 100644
--- a/configs/zynq_zc770_xm011_defconfig
+++ b/configs/zynq_zc770_xm011_defconfig
@@ -16,6 +16,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="Zynq> "
diff --git a/configs/zynq_zc770_xm011_x16_defconfig b/configs/zynq_zc770_xm011_x16_defconfig
index 3a3740629b..28d63c9ec5 100644
--- a/configs/zynq_zc770_xm011_x16_defconfig
+++ b/configs/zynq_zc770_xm011_x16_defconfig
@@ -16,6 +16,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="Zynq> "
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index d777ba889e..01e3d5fb84 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -13,6 +13,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SYS_PROMPT="Zynq> "
diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index c5288e56e3..5195ec3d8c 100644
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -13,6 +13,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index e47cce5e07..1254b4efe9 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index ee15d83147..078b436add 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
diff --git a/configs/zynq_zybo_z7_defconfig b/configs/zynq_zybo_z7_defconfig
index 43b746f56c..3c974925c4 100644
--- a/configs/zynq_zybo_z7_defconfig
+++ b/configs/zynq_zybo_z7_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_USE_PREBOOT=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_OS_BOOT=y
CONFIG_SPL_SPI_LOAD=y
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index b37f3a8727..7352e34b9c 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -347,11 +347,6 @@
#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"
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"hostname=mpc8349emds\0" \
diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h
index 493f6df187..2ae1069e4f 100644
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@@ -404,10 +404,6 @@
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
-#define CONFIG_PREBOOT "echo;" \
- "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
- "echo"
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"hostname=mpc8349emds\0" \
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 0c2df7ec03..9bf5d9d3fd 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -236,11 +236,6 @@
/* 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"
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"hostname=tqm834x\0" \
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index e9a9da3aed..5fa393d45d 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -68,16 +68,6 @@
*/
#ifdef CONFIG_USB_AM35X
-
-#ifdef CONFIG_USB_MUSB_HCD
-
-#ifdef CONFIG_USB_KEYBOARD
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT "usb start"
-#endif /* CONFIG_USB_KEYBOARD */
-
-#endif /* CONFIG_USB_MUSB_HCD */
-
#ifdef CONFIG_USB_MUSB_UDC
/* USB device configuration */
#define CONFIG_USB_DEVICE 1
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 841e750b00..99668dc8f4 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -28,19 +28,6 @@
* Enable CONFIG_USB_MUSB_GADGET for Device functionalities.
*/
-#ifdef CONFIG_USB_MUSB_AM35X
-
-#ifdef CONFIG_USB_MUSB_HOST
-
-#ifdef CONFIG_USB_KEYBOARD
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT "usb start"
-#endif /* CONFIG_USB_KEYBOARD */
-
-#endif /* CONFIG_USB_MUSB_HOST */
-
-#endif /* CONFIG_USB_MUSB_AM35X */
-
/* I2C */
/* Ethernet */
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index d7af4f91bc..044ce4467e 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -83,8 +83,6 @@
#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;"
/*
* Boot Linux
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 0485e7a6d8..8aa6e1d0c3 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -29,9 +29,6 @@
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
-
#define CONFIG_S5P_PA_SYSRAM 0x02020000
#define CONFIG_SMP_PEN_ADDR CONFIG_S5P_PA_SYSRAM
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index 648a4db8f1..b8437052a9 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -157,11 +157,6 @@ 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};" \
- "fdt addr ${fdtsaveaddr};"
/*
* Enable in-place RFS with this initrd_high setting.
*/
diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index 76dc38766d..285e28b535 100644
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -37,8 +37,6 @@
"run manage_userdata; "
/* Enable PREBOOT variable */
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
/* Set ARP_TIMEOUT to 500ms */
#define CONFIG_ARP_TIMEOUT 500UL
diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h
index 0a8d41b8f6..dff41239ba 100644
--- a/include/configs/bur_cfg_common.h
+++ b/include/configs/bur_cfg_common.h
@@ -23,9 +23,6 @@
"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 */
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 10
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 7b9640fb26..60bac9adc8 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -144,9 +144,6 @@
"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) \
func(USB, usb, 0) \
func(MMC, mmc, 2) \
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 1978074617..93dcad4b66 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -37,7 +37,4 @@
"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 f0f460aac9..54bbfe3f55 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -124,9 +124,6 @@
#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 \
"netdev=eth1\0" \
"consoledev=ttyS1\0" \
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index d3a4a61c6c..a8e1850f2b 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -42,7 +42,4 @@
"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 2b44437ed3..b175e9d574 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -99,8 +99,5 @@
/* 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"
#endif /* _CONFIG_SYNOLOGY_DS414_H */
diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index 11d367a151..0ff48287ac 100644
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -100,8 +100,6 @@
#define CONFIG_ROOTPATH "/opt/nfsroot"
#define CONFIG_BOOTFILE "uImage"
-#define CONFIG_PREBOOT /* enable preboot variable */
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"consoledev=ttyS1\0" \
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index aec5d61c56..a27627e721 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -138,8 +138,6 @@
/* Miscellaneous configurable options */
#define CONFIG_HWCONFIG
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
/* Memory configuration */
#define CONFIG_SYS_MEMTEST_START 0x10000000
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 31ce410448..8fb321178f 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -403,9 +403,6 @@ 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 \
"netdev=eth0\0" \
"consoledev=ttyS1\0" \
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 8bc8e00f98..43cb14c14e 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -253,10 +253,6 @@
#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"
#define CONFIG_BOOTCOMMAND "run boot_cramfs"
#undef CONFIG_SYS_LOADS_BAUD_CHANGE
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index ba0e75b5ee..03d495a5a8 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -185,8 +185,6 @@
/*
* Extra Environments
*/
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT "run try_bootscript"
#define CONFIG_HOSTNAME "m53menlo"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 6cf8c672eb..aeab2e983b 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -40,9 +40,6 @@
#define CONFIG_REVISION_TAG
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT /* enable preboot variable */
-
/*
* Hardware drivers
*/
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index 7ced66774f..78b1615d5c 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -31,8 +31,6 @@
#ifdef CONFIG_USB_KEYBOARD
#define STDIN_CFG "usbkbd,serial"
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT "usb start"
#else
#define STDIN_CFG "serial"
#endif
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index f99bd71167..814fec5b33 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -140,9 +140,6 @@
/* architecture dependent code */
#define CONFIG_SYS_USR_EXCEP /* user exception */
-#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" \
"nor0=flash-0\0"\
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 6ee0443f11..e6d5c680d7 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -38,8 +38,6 @@
#endif
/* auto boot */
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
/*
* For booting Linux, the board info and command line data
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index dbedad1a97..ff8cc3c770 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -14,8 +14,6 @@
#define CONFIG_SYS_SDRAM_BASE 0x00000000
/* auto boot */
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
115200, 230400, 460800, 921600 }
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 2931014744..f3f8538541 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -15,8 +15,6 @@
#define CONFIG_SYS_SDRAM_BASE 0x00000000
/* auto boot */
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
115200, 230400, 460800, 921600 }
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 8e66a2bf67..fc498b2481 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -66,8 +66,6 @@
#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
#define CONFIG_BMP_16BPP
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index fb57a2113c..bbe0574033 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -160,7 +160,5 @@
/* 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 6eca8b6027..b734b822dd 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -176,8 +176,6 @@
#endif
/* Framebuffer and LCD */
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_BMP_16BPP
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index cde8fa210b..3cf2f1ce28 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -49,18 +49,6 @@
#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; " \
- "setenv stdin serial,usbkbd; "\
- "setenv stdout serial,vga; " \
- "setenv stderr serial,vga; " \
- "else " \
- "setenv stdin serial; " \
- "setenv stdout serial; " \
- "setenv stderr serial; " \
- "fi;"
/* Command definition */
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 3709fa6537..23c370b07c 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -67,9 +67,6 @@
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT ""
-
#ifdef CONFIG_CMD_MMC
#define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
#else
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 43dfeeac32..f47d088303 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -253,31 +253,6 @@ 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;" \
- "if run switchmmc; then " \
- "setenv mmcdone true;" \
- "setenv mmctype fat;" \
- "if run scriptload; then true; else " \
- "setenv mmctype ext2;" \
- "if run scriptload; then true; else " \
- "setenv mmctype ext4;" \
- "if run scriptload; then true; else " \
- "setenv mmcdone false;" \
- "fi;" \
- "fi;" \
- "fi;" \
- "if ${mmcdone}; then " \
- "run scriptboot;" \
- "fi;" \
- "fi;" \
- "if run slide; then true; else " \
- "setenv bootmenu_delay 0;" \
- "setenv bootdelay 0;" \
- "fi"
-
#define CONFIG_POSTBOOTMENU \
"echo;" \
"echo Extra commands:;" \
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 0bf2df22ea..e8c60838b7 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -58,9 +58,6 @@
/* TWL4030 LED Support */
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT "usb start"
-
#define MEM_LAYOUT_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index e2c3ce1200..71e86144dd 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -56,11 +56,6 @@
/* Environment information */
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT \
- "setenv preboot;" \
- "saveenv;"
-
#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index d7dd77e535..309b4717c4 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -76,8 +76,6 @@
#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"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 307797d0e3..7dfcccb82b 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -77,9 +77,6 @@
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
#endif
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT ""
-
/* Thermal support */
#define CONFIG_IMX_THERMAL
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index ced843f97e..1b57e9931f 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -102,8 +102,6 @@
#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 afbf7a828d..c7aaafaad4 100644
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -32,8 +32,6 @@
#include <config_distro_bootcmd.h>
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT "pci enum"
#define CONFIG_EXTRA_ENV_SETTINGS \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index df22f780b0..ecea1d4765 100644
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -48,8 +48,4 @@
"ramdisk_addr_r=0x88300000\0" \
BOOTENV
-#define CONFIG_PREBOOT \
- "setenv fdt_addr ${fdtcontroladdr};" \
- "fdt addr ${fdtcontroladdr};"
-
#endif /* __CONFIG_H */
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 9ad10e6c75..a5369996ff 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -55,7 +55,4 @@
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 d93f8cc5c8..0b22345198 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -62,7 +62,4 @@
#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 d2394a9d1a..67bc465522 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -54,7 +54,4 @@
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 50d6859d9b..004acbcf29 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -63,7 +63,4 @@
BOOTENV
#endif
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
-
#endif
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 0a612a642d..e706bea8cc 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -73,8 +73,6 @@
/* 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 f1ce7a0117..dd63adb6db 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -189,8 +189,6 @@
/* UBI Support */
/* Commen environment */
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
#define COMMON_ENV_DFU_ARGS "dfu_args=run bootargs_defaults;" \
"setenv bootargs ${bootargs};" \
"mtdparts default;" \
diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h
index 56876d3db5..2f60b6b1e7 100644
--- a/include/configs/socfpga_dbm_soc1.h
+++ b/include/configs/socfpga_dbm_soc1.h
@@ -12,8 +12,6 @@
/* 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
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index a2fc1033b3..590a9af274 100644
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -12,7 +12,6 @@
/* Booting Linux */
#define CONFIG_BOOTFILE "fitImage"
-#define CONFIG_PREBOOT "run try_bootscript"
#define CONFIG_BOOTCOMMAND "run mmc_mmc"
#define CONFIG_LOADADDR 0x01000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index 05369e7225..6909e97e99 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -33,17 +33,6 @@
* 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}) => \" ; " \
- "if gpio input 78 ; then " \
- "setenv bootdelay 10 ; " \
- "setenv boottype rcvr ; " \
- "else " \
- "setenv bootdelay 5 ; " \
- "setenv boottype norm ; " \
- "fi"
#define CONFIG_EXTRA_ENV_SETTINGS \
"verify=n\0" \
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 3e26476dea..ff2eb75c3b 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -273,12 +273,6 @@
#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"
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"consdev=ttyS0\0" \
diff --git a/include/configs/strider.h b/include/configs/strider.h
index 525b548344..e3d64e52aa 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -436,9 +436,6 @@ 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 \
"netdev=eth0\0" \
"consoledev=ttyS1\0" \
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 7d92c2177f..d7133a73fc 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -285,11 +285,6 @@ extern int soft_i2c_gpio_scl;
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
#endif
-#ifdef CONFIG_USB_KEYBOARD
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
-#endif
-
#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_ARM64
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index c935577f5d..11f76e777b 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -79,16 +79,6 @@
#ifdef CONFIG_CMD_USB_MASS_STORAGE
#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 " \
- "run set_con_hdmi; " \
- "else " \
- "run set_con_serial; " \
- "fi"
-#endif /* CONFIG_USB_KEYBOARD */
#endif /* CONFIG_CMD_USB */
/* Environment organization */
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index f19218799d..fae0e761fb 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -42,8 +42,6 @@
#ifdef CONFIG_USB_KEYBOARD
#define STDIN_KBD_USB ",usbkbd"
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT "usb start"
#else
#define STDIN_KBD_USB ""
#endif
diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index ac7ee2eda5..0c563e714d 100644
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -13,9 +13,6 @@
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
-
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \
"stdout=serial\0" \
"stderr=serial\0"
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index d28978467b..3562a14261 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -47,9 +47,6 @@
#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 */
#define CONFIG_EXTRA_ENV_SETTINGS \
"fdt_high=0x10000000\0" \
diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index 3d48ab2352..a915c32607 100644
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -79,9 +79,6 @@
# define EXTRA_ENV_USB
#endif
-#define CONFIG_USE_PREBOOT
-#undef CONFIG_PREBOOT
-
#undef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
"kernel_image=uImage\0" \
diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index fc0fe1504c..7d5f5fa409 100644
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -21,8 +21,6 @@
#define CONFIG_SYS_SDRAM_BASE 0x00000000
/* auto boot */
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
115200, 230400, 460800, 921600 }
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 710bcaeb1a..23f0389615 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -472,8 +472,6 @@ 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 ee22042a81..21e91ee1a4 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -271,8 +271,6 @@
*/
#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 c33a6e018a..73e1fa313f 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -322,8 +322,6 @@ 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 f42987cf70..e5a41abd4b 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -320,8 +320,6 @@ 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 bc9419225f..9d683768f4 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -98,9 +98,6 @@
#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 ""
-
/*
* Size of malloc() pool
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 388bb498ca..3ae968642c 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -103,8 +103,6 @@
#define CONFIG_ENV_OVERWRITE
/* enable preboot to be loaded before CONFIG_BOOTDELAY */
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT
/* Boot configuration */
#define CONFIG_SYS_LOAD_ADDR 0 /* default? */
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 05/18] autoboot: Use CONFIG_AUTOBOOT_STOP_STR_SHA256 indirectly
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (3 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 04/18] Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 06/18] autoboot: Drop #ifdef for CONFIG_AUTOBOOT_ENCRYPTION Simon Glass
` (14 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
This CONFIG option is only present if CONFIG_AUTOBOOT_ENCRYPTION is
enabled so it cannot be used in code without that #ifdef. But we want to
reduce the use of #ifdef in this file and in particular to avoid having
two different functions both named passwd_abort() but which do different
things.
In preparation for this, create an intermediate value which is set to an
empty string if there is no value for CONFIG_AUTOBOOT_STOP_STR_SHA256.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
common/autoboot.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index 94133eaeda..e3086e3828 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -28,6 +28,12 @@ DECLARE_GLOBAL_DATA_PTR;
/* Stored value of bootdelay, used by autoboot_command() */
static int stored_bootdelay;
+#ifdef CONFIG_AUTOBOOT_ENCRYPTION
+#define AUTOBOOT_STOP_STR_SHA256 CONFIG_AUTOBOOT_STOP_STR_SHA256
+#else
+#define AUTOBOOT_STOP_STR_SHA256 ""
+#endif
+
#if defined(CONFIG_AUTOBOOT_KEYED)
#if defined(CONFIG_AUTOBOOT_STOP_STR_SHA256)
@@ -61,7 +67,7 @@ static int passwd_abort(uint64_t etime)
int ret;
if (sha_env_str == NULL)
- sha_env_str = CONFIG_AUTOBOOT_STOP_STR_SHA256;
+ sha_env_str = AUTOBOOT_STOP_STR_SHA256;
/*
* Generate the binary value from the environment hash value
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 06/18] autoboot: Drop #ifdef for CONFIG_AUTOBOOT_ENCRYPTION
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (4 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 05/18] autoboot: Use CONFIG_AUTOBOOT_STOP_STR_SHA256 indirectly Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 07/18] autoboot: Improve docs " Simon Glass
` (13 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
Use if() instead for this option, renaming the two different
passwd_abort() functions to indicate their purpose.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
common/autoboot.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index e3086e3828..5a0dac8d79 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -10,6 +10,7 @@
#include <cli.h>
#include <console.h>
#include <fdtdec.h>
+#include <hash.h>
#include <menu.h>
#include <post.h>
#include <u-boot/sha256.h>
@@ -35,7 +36,6 @@ static int stored_bootdelay;
#endif
#if defined(CONFIG_AUTOBOOT_KEYED)
-#if defined(CONFIG_AUTOBOOT_STOP_STR_SHA256)
/*
* Use a "constant-length" time compare function for this
@@ -54,7 +54,7 @@ static int slow_equals(u8 *a, u8 *b, int len)
return diff == 0;
}
-static int passwd_abort(uint64_t etime)
+static int passwd_abort_sha256(uint64_t etime)
{
const char *sha_env_str = env_get("bootstopkeysha256");
u8 sha_env[SHA256_SUM_LEN];
@@ -105,8 +105,8 @@ static int passwd_abort(uint64_t etime)
return abort;
}
-#else
-static int passwd_abort(uint64_t etime)
+
+static int passwd_abort_key(uint64_t etime)
{
int abort = 0;
struct {
@@ -182,7 +182,6 @@ static int passwd_abort(uint64_t etime)
return abort;
}
-#endif
/***************************************************************************
* Watch for 'delay' seconds for autoboot stop or autoboot delay string.
@@ -201,7 +200,10 @@ static int __abortboot(int bootdelay)
printf(CONFIG_AUTOBOOT_PROMPT, bootdelay);
# endif
- abort = passwd_abort(etime);
+ if (IS_ENABLED(CONFIG_AUTOBOOT_ENCRYPTION))
+ abort = passwd_abort_sha256(etime);
+ else
+ abort = passwd_abort_key(etime);
if (!abort)
debug_bootkeys("key timeout\n");
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 07/18] autoboot: Improve docs for CONFIG_AUTOBOOT_ENCRYPTION
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (5 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 06/18] autoboot: Drop #ifdef for CONFIG_AUTOBOOT_ENCRYPTION Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 08/18] autoboot: Use if() for CONFIG_SILENT_CONSOLE Simon Glass
` (12 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
This option is not documented properly at present. Fix it.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
README | 2 ++
cmd/Kconfig | 9 ++++++++-
common/autoboot.c | 16 ++++++++++++++++
doc/README.autoboot | 15 +++++++++++++++
4 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/README b/README
index f513af0b67..a2aaba818d 100644
--- a/README
+++ b/README
@@ -3425,6 +3425,8 @@ List of environment variables (most likely not complete):
allowed for use by the bootm command. See also "bootm_low"
environment variable.
+ bootstopkeysha256, bootdelaykey, bootstopkey - See README.autoboot
+
updatefile - Location of the software update file on a TFTP server, used
by the automatic software update feature. Please refer to
documentation in doc/README.update for more details.
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 175c6ad9e3..37da17ff7f 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -101,7 +101,14 @@ config AUTOBOOT_PROMPT
config AUTOBOOT_ENCRYPTION
bool "Enable encryption in autoboot stopping"
depends on AUTOBOOT_KEYED
- default n
+ help
+ This option allows a string to be entered into U-Boot to stop the
+ autoboot. The string itself is hashed and compared against the hash
+ in the environment variable 'bootstopkeysha256'. If it matches then
+ boot stops and a command-line prompt is presented.
+
+ This provides a way to ship a secure production device which can also
+ be accessed at the U-Boot command line.
config AUTOBOOT_DELAY_STR
string "Delay autobooting via specific input key / string"
diff --git a/common/autoboot.c b/common/autoboot.c
index 5a0dac8d79..f832808b71 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -54,6 +54,14 @@ static int slow_equals(u8 *a, u8 *b, int len)
return diff == 0;
}
+/**
+ * passwd_abort_sha256() - check for a hashed key sequence to abort booting
+ *
+ * This checks for the user entering a SHA256 hash within a given time.
+ *
+ * @etime: Timeout value ticks (stop when get_ticks() reachs this)
+ * @return 0 if autoboot should continue, 1 if it should stop
+ */
static int passwd_abort_sha256(uint64_t etime)
{
const char *sha_env_str = env_get("bootstopkeysha256");
@@ -106,6 +114,14 @@ static int passwd_abort_sha256(uint64_t etime)
return abort;
}
+/**
+ * passwd_abort_key() - check for a key sequence to aborted booting
+ *
+ * This checks for the user entering a string within a given time.
+ *
+ * @etime: Timeout value ticks (stop when get_ticks() reachs this)
+ * @return 0 if autoboot should continue, 1 if it should stop
+ */
static int passwd_abort_key(uint64_t etime)
{
int abort = 0;
diff --git a/doc/README.autoboot b/doc/README.autoboot
index eeb7e4c662..de35f3093d 100644
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -132,6 +132,21 @@ What they do
provides an escape sequence from the limited "password"
strings.
+ CONFIG_AUTOBOOT_ENCRYPTION
+
+ "bootstopkeysha256" environment variable
+
+ - Hash value of the input which unlocks the device and
+ stops autoboot.
+
+ This option allows a string to be entered into U-Boot to stop the
+ autoboot. The string itself is hashed and compared against the hash
+ in the environment variable 'bootstopkeysha256'. If it matches then
+ boot stops and a command-line prompt is presented.
+
+ This provides a way to ship a secure production device which can also
+ be accessed at the U-Boot command line.
+
CONFIG_RESET_TO_RETRY
(Only effective when CONFIG_BOOT_RETRY_TIME is also set)
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 08/18] autoboot: Use if() for CONFIG_SILENT_CONSOLE
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (6 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 07/18] autoboot: Improve docs " Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 09/18] autoboot: Drop #ifdef CONFIG_AUTOBOOT_KEYED Simon Glass
` (11 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
Avoid an #ifdef in this function, to improve readability.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
common/autoboot.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index f832808b71..45df665676 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -286,10 +286,8 @@ static int abortboot(int bootdelay)
if (bootdelay >= 0)
abort = __abortboot(bootdelay);
-#ifdef CONFIG_SILENT_CONSOLE
- if (abort)
+ if (IS_ENABLED(CONFIG_SILENT_CONSOLE) && abort)
gd->flags &= ~GD_FLG_SILENT;
-#endif
return abort;
}
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 09/18] autoboot: Drop #ifdef CONFIG_AUTOBOOT_KEYED
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (7 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 08/18] autoboot: Use if() for CONFIG_SILENT_CONSOLE Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 10/18] autoboot: Drop unused CONFIG_MENUPROMPT Simon Glass
` (10 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
At present we have two functions named __autoboot() which do different
things. This is confusing. Fix it by using if() instead of #ifdef for
selecting the functions, and renaming them to meaningful names.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
common/autoboot.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index 45df665676..012dd5797e 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -35,8 +35,6 @@ static int stored_bootdelay;
#define AUTOBOOT_STOP_STR_SHA256 ""
#endif
-#if defined(CONFIG_AUTOBOOT_KEYED)
-
/*
* Use a "constant-length" time compare function for this
* hash compare:
@@ -203,7 +201,7 @@ static int passwd_abort_key(uint64_t etime)
* Watch for 'delay' seconds for autoboot stop or autoboot delay string.
* returns: 0 - no key string, allow autoboot 1 - got key string, abort
*/
-static int __abortboot(int bootdelay)
+static int abortboot_key_sequence(int bootdelay)
{
int abort;
uint64_t etime = endtick(bootdelay);
@@ -226,13 +224,11 @@ static int __abortboot(int bootdelay)
return abort;
}
-# else /* !defined(CONFIG_AUTOBOOT_KEYED) */
-
#ifdef CONFIG_MENUKEY
static int menukey;
#endif
-static int __abortboot(int bootdelay)
+static int abortboot_single_key(int bootdelay)
{
int abort = 0;
unsigned long ts;
@@ -277,14 +273,17 @@ static int __abortboot(int bootdelay)
return abort;
}
-# endif /* CONFIG_AUTOBOOT_KEYED */
static int abortboot(int bootdelay)
{
int abort = 0;
- if (bootdelay >= 0)
- abort = __abortboot(bootdelay);
+ if (bootdelay >= 0) {
+ if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
+ abort = abortboot_key_sequence(bootdelay);
+ else
+ abort = abortboot_single_key(bootdelay);
+ }
if (IS_ENABLED(CONFIG_SILENT_CONSOLE) && abort)
gd->flags &= ~GD_FLG_SILENT;
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 10/18] autoboot: Drop unused CONFIG_MENUPROMPT
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (8 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 09/18] autoboot: Drop #ifdef CONFIG_AUTOBOOT_KEYED Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 11/18] autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY Simon Glass
` (9 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
This is not defined by any board. We could use CONFIG_AUTOBOOT_PROMPT
instead perhaps, but this depends on CONFIG_AUTOBOOT_KEYED which is not
used for the single-key case.
So let's just remove CONFIG_MENUPROMPT.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
common/autoboot.c | 4 ----
scripts/config_whitelist.txt | 1 -
2 files changed, 5 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index 012dd5797e..a6071ab839 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -233,11 +233,7 @@ static int abortboot_single_key(int bootdelay)
int abort = 0;
unsigned long ts;
-#ifdef CONFIG_MENUPROMPT
- printf(CONFIG_MENUPROMPT);
-#else
printf("Hit any key to stop autoboot: %2d ", bootdelay);
-#endif
/*
* Check if key already pressed
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7e6c9e3016..bd05b9c4da 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1142,7 +1142,6 @@ CONFIG_MEM_HOLE_16M
CONFIG_MEM_INIT_VALUE
CONFIG_MEM_REMAP
CONFIG_MENUKEY
-CONFIG_MENUPROMPT
CONFIG_MENU_SHOW
CONFIG_MFG_ENV_SETTINGS
CONFIG_MIIM_ADDRESS
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 11/18] autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (9 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 10/18] autoboot: Drop unused CONFIG_MENUPROMPT Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 12/18] snow: Define CONFIG_AUTOBOOT_MENUKEY Simon Glass
` (8 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
Since this is part of the autoboot functionality, it makes sense to name
it with an AUTOBOOT prefix. No mainline boards use it so this should be
safe, and downstream boards will need to adjust.
Since this option is just an integer value, it really needs another option
to control whether the feature is enabled or not. Add a new
CONFIG_USE_AUTOBOOT_MENUKEY for that. This fits better with how things are
done with Kconfig, avoiding the need to use a specific value to disable
the feature.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
cmd/Kconfig | 17 +++++++++++++++++
common/autoboot.c | 10 +++++-----
configs/socfpga_vining_fpga_defconfig | 2 +-
doc/README.autoboot | 8 ++++++++
include/autoboot.h | 2 +-
scripts/config_whitelist.txt | 1 -
6 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 37da17ff7f..d0c43c524a 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -153,6 +153,23 @@ config AUTOBOOT_STOP_STR_SHA256
string / password matches a values that is encypted via
a SHA256 hash and saved in the environment.
+config AUTOBOOT_USE_MENUKEY
+ bool "Allow a specify key to run a menu from the environment"
+ depends on !AUTOBOOT_KEYED
+ help
+ If a specific key is pressed to stop autoboot, then the commands in
+ the environment variable 'menucmd' are executed before boot starts.
+
+config AUTOBOOT_MENUKEY
+ int "ASCII value of boot key to show a menu"
+ default 0
+ depends on AUTOBOOT_USE_MENUKEY
+ help
+ If this key is pressed to stop autoboot, then the commands in the
+ environment variable 'menucmd' will be executed before boot starts.
+ For example, 33 means "!" in ASCII, so pressing ! at boot would take
+ this action.
+
endmenu
config BUILD_BIN2C
diff --git a/common/autoboot.c b/common/autoboot.c
index a6071ab839..ad189a8ba2 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -224,7 +224,7 @@ static int abortboot_key_sequence(int bootdelay)
return abort;
}
-#ifdef CONFIG_MENUKEY
+#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
static int menukey;
#endif
@@ -252,7 +252,7 @@ static int abortboot_single_key(int bootdelay)
if (tstc()) { /* we got a key press */
abort = 1; /* don't auto boot */
bootdelay = 0; /* no more delay */
-# ifdef CONFIG_MENUKEY
+# ifdef CONFIG_USE_AUTOBOOT_MENUKEY
menukey = getc();
# else
(void) getc(); /* consume input */
@@ -358,11 +358,11 @@ void autoboot_command(const char *s)
#endif
}
-#ifdef CONFIG_MENUKEY
- if (menukey == CONFIG_MENUKEY) {
+#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
+ if (menukey == CONFIG_AUTOBOOT_MENUKEY) {
s = env_get("menucmd");
if (s)
run_command_list(s, -1, 0);
}
-#endif /* CONFIG_MENUKEY */
+#endif /* CONFIG_USE_AUTOBOOT_MENUKEY */
}
diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
index 1a9323f822..9e86a23704 100644
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -8,7 +8,7 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200"
# CONFIG_USE_BOOTCOMMAND is not set
CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="setenv hostname vining-${unit_serial} ; setenv PS1 "${unit_ident} (${unit_serial}) => " ; if gpio input 78 ; then setenv bootdelay 10 ; setenv boottype rcvr ; else setenv bootdelay 5 ; setenv boottype norm ; fi"
+CONFIG_PREBOOT="setenv hostname vining-${unit_serial} ; setenv PS1 \"${unit_ident} (${unit_serial}) => \" ; if gpio input 78 ; then setenv bootdelay 10 ; setenv boottype rcvr ; else setenv bootdelay 5 ; setenv boottype norm ; fi"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
diff --git a/doc/README.autoboot b/doc/README.autoboot
index de35f3093d..5e9a5e1cf7 100644
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -152,3 +152,11 @@ What they do
(Only effective when CONFIG_BOOT_RETRY_TIME is also set)
After the countdown timed out, the board will be reset to restart
again.
+
+ CONFIG_AUTOBOOT_USE_MENUKEY
+ CONFIG_AUTOBOOT_MENUKEY
+
+ If this key is pressed to stop autoboot, then the commands in the
+ environment variable 'menucmd' will be executed before boot starts.
+ For example, 33 means "!" in ASCII, so pressing ! at boot would take
+ this action.
diff --git a/include/autoboot.h b/include/autoboot.h
index 3ebd6f90e3..ac8157e570 100644
--- a/include/autoboot.h
+++ b/include/autoboot.h
@@ -27,7 +27,7 @@ const char *bootdelay_process(void);
* autoboot_command() - run the autoboot command
*
* If enabled, run the autoboot command returned from bootdelay_process().
- * Also do the CONFIG_MENUKEY processing if enabled.
+ * Also do the CONFIG_AUTOBOOT_MENUKEY processing if enabled.
*
* @cmd: Command to run
*/
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bd05b9c4da..8773169c8b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1141,7 +1141,6 @@ CONFIG_MEMSIZE_MASK
CONFIG_MEM_HOLE_16M
CONFIG_MEM_INIT_VALUE
CONFIG_MEM_REMAP
-CONFIG_MENUKEY
CONFIG_MENU_SHOW
CONFIG_MFG_ENV_SETTINGS
CONFIG_MIIM_ADDRESS
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 12/18] snow: Define CONFIG_AUTOBOOT_MENUKEY
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (10 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 11/18] autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 13/18] autoboot: Tidy up use of menukey Simon Glass
` (7 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
This option is not used by any boards. To avoid needing to remove it as
dead code, add it to 'snow'.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
configs/snow_defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index f474409516..e5c7bdd6cc 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -18,6 +18,8 @@ CONFIG_SILENT_CONSOLE=y
# CONFIG_SPL_FRAMEWORK is not set
CONFIG_SPL_TEXT_BASE=0x02023400
CONFIG_SYS_PROMPT="snow # "
+CONFIG_USE_AUTOBOOT_MENUKEY=y
+CONFIG_AUTOBOOT_MENUKEY=33
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 13/18] autoboot: Tidy up use of menukey
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (11 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 12/18] snow: Define CONFIG_AUTOBOOT_MENUKEY Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2020-05-04 21:26 ` Da Xue
2019-07-21 2:51 ` [U-Boot] [PATCH v2 14/18] autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOT Simon Glass
` (6 subsequent siblings)
19 siblings, 1 reply; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
Move the variable to the top of the file and adjust the code which uses it
to use if() rather than #ifdef, to make it easier to read.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
common/autoboot.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index ad189a8ba2..9752470873 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -28,6 +28,7 @@ DECLARE_GLOBAL_DATA_PTR;
/* Stored value of bootdelay, used by autoboot_command() */
static int stored_bootdelay;
+static int menukey;
#ifdef CONFIG_AUTOBOOT_ENCRYPTION
#define AUTOBOOT_STOP_STR_SHA256 CONFIG_AUTOBOOT_STOP_STR_SHA256
@@ -35,6 +36,12 @@ static int stored_bootdelay;
#define AUTOBOOT_STOP_STR_SHA256 ""
#endif
+#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
+#define AUTOBOOT_MENUKEY CONFIG_USE_AUTOBOOT_MENUKEY
+#else
+#define AUTOBOOT_MENUKEY 0
+#endif
+
/*
* Use a "constant-length" time compare function for this
* hash compare:
@@ -224,10 +231,6 @@ static int abortboot_key_sequence(int bootdelay)
return abort;
}
-#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
-static int menukey;
-#endif
-
static int abortboot_single_key(int bootdelay)
{
int abort = 0;
@@ -250,13 +253,13 @@ static int abortboot_single_key(int bootdelay)
ts = get_timer(0);
do {
if (tstc()) { /* we got a key press */
+ int key;
+
abort = 1; /* don't auto boot */
bootdelay = 0; /* no more delay */
-# ifdef CONFIG_USE_AUTOBOOT_MENUKEY
- menukey = getc();
-# else
- (void) getc(); /* consume input */
-# endif
+ key = getc(); /* consume input */
+ if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY))
+ menukey = key;
break;
}
udelay(10000);
@@ -358,11 +361,10 @@ void autoboot_command(const char *s)
#endif
}
-#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
- if (menukey == CONFIG_AUTOBOOT_MENUKEY) {
+ if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY) &&
+ menukey == AUTOBOOT_MENUKEY) {
s = env_get("menucmd");
if (s)
run_command_list(s, -1, 0);
}
-#endif /* CONFIG_USE_AUTOBOOT_MENUKEY */
}
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 14/18] autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOT
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (12 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 13/18] autoboot: Tidy up use of menukey Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 15/18] Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig Simon Glass
` (5 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
Rename this option to CONFIG_AUTOBOOT_MENU_SHOW this it relates to the
autoboot functionality.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
| 2 +-
common/autoboot.c | 2 +-
| 2 +-
| 2 +-
include/configs/nokia_rx51.h | 2 +-
include/configs/vexpress_aemv8a.h | 2 +-
| 2 +-
scripts/config_whitelist.txt | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
--git a/cmd/bootmenu.c b/cmd/bootmenu.c
index 7f88c1ed63..0ae9d5a681 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -472,7 +472,7 @@ void menu_display_statusline(struct menu *m)
puts(ANSI_CLEAR_LINE);
}
-#ifdef CONFIG_MENU_SHOW
+#ifdef CONFIG_AUTOBOOT_MENU_SHOW
int menu_show(int bootdelay)
{
bootmenu_show(bootdelay);
diff --git a/common/autoboot.c b/common/autoboot.c
index 9752470873..a38527ff96 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -324,7 +324,7 @@ const char *bootdelay_process(void)
debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
-#if defined(CONFIG_MENU_SHOW)
+#if defined(CONFIG_AUTOBOOT_MENU_SHOW)
bootdelay = menu_show(bootdelay);
#endif
bootretry_init_cmd_timeout();
--git a/doc/README.bootmenu b/doc/README.bootmenu
index 34ff8d5ecc..ca5099089e 100644
--- a/doc/README.bootmenu
+++ b/doc/README.bootmenu
@@ -91,7 +91,7 @@ To run the bootmenu at startup add these additional definitions:
#define CONFIG_AUTOBOOT_KEYED
#define CONFIG_BOOTDELAY 30
- #define CONFIG_MENU_SHOW
+ #define CONFIG_AUTOBOOT_MENU_SHOW
When you intend to use the bootmenu on color frame buffer console,
make sure to additionally define CONFIG_CFB_CONSOLE_ANSI in the
--git a/doc/README.menu b/doc/README.menu
index 450c6a83a7..0f3d741605 100644
--- a/doc/README.menu
+++ b/doc/README.menu
@@ -14,7 +14,7 @@ Menus are composed of items. Each item has a key used to identify it in
the menu, and an opaque pointer to data controlled by the consumer.
If you want to show a menu, instead starting the shell, define
-CONFIG_MENU_SHOW. You have to code the int menu_show(int bootdelay)
+CONFIG_AUTOBOOT_MENU_SHOW. You have to code the int menu_show(int bootdelay)
function, which handle your menu. This function returns the remaining
bootdelay.
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index f47d088303..b251061e30 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -270,7 +270,7 @@ int rx51_kp_getc(struct stdio_dev *sdev);
"run attachboot;" \
"echo"
-#define CONFIG_MENU_SHOW
+#define CONFIG_AUTOBOOT_MENU_SHOW
/*
* Miscellaneous configurable options
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 2354f4e958..2b1269de83 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -110,7 +110,7 @@
#define CONFIG_PL011_CLOCK 24000000
#endif
-/*#define CONFIG_MENU_SHOW*/
+/*#define CONFIG_AUTOBOOT_MENU_SHOW*/
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
--git a/include/menu.h b/include/menu.h
index fbff429c89..8fd7b0a1f0 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -19,7 +19,7 @@ int menu_destroy(struct menu *m);
void menu_display_statusline(struct menu *m);
int menu_default_choice(struct menu *m, void **choice);
-#if defined(CONFIG_MENU_SHOW)
+#if defined(CONFIG_AUTOBOOT_MENU_SHOW)
int menu_show(int bootdelay);
#endif
#endif /* __MENU_H__ */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8773169c8b..780520d584 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -96,6 +96,7 @@ CONFIG_ATMEL_LEGACY
CONFIG_ATMEL_MCI_8BIT
CONFIG_ATMEL_SPI0
CONFIG_AT_TRANS
+CONFIG_AUTOBOOT_MENU_SHOW
CONFIG_AUTO_ZRELADDR
CONFIG_BACKSIDE_L2_CACHE
CONFIG_BAT_PAIR
@@ -1141,7 +1142,6 @@ CONFIG_MEMSIZE_MASK
CONFIG_MEM_HOLE_16M
CONFIG_MEM_INIT_VALUE
CONFIG_MEM_REMAP
-CONFIG_MENU_SHOW
CONFIG_MFG_ENV_SETTINGS
CONFIG_MIIM_ADDRESS
CONFIG_MII_DEFAULT_TSEC
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 15/18] Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (13 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 14/18] autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOT Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 16/18] autoboot: Add comments for menu_show() Simon Glass
` (4 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_AUTOBOOT_MENU_SHOW
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
cmd/Kconfig | 8 ++++++++
configs/nokia_rx51_defconfig | 1 +
include/configs/nokia_rx51.h | 2 --
include/configs/vexpress_aemv8a.h | 2 --
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index d0c43c524a..44f99817c2 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -170,6 +170,14 @@ config AUTOBOOT_MENUKEY
For example, 33 means "!" in ASCII, so pressing ! at boot would take
this action.
+config AUTOBOOT_MENU_SHOW
+ bool "Show a menu on boot"
+ help
+ This enables the boot menu, controlled by environment variables
+ defined by the board. The menu starts after running the 'preboot'
+ environmnent variable (if enabled) and before handling the boot delay.
+ See README.bootmenu for more details.
+
endmenu
config BUILD_BIN2C
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 5cd96017e5..ab5bb2de6f 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Nokia RX-51 # "
CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_MENU_SHOW=y
CONFIG_CMD_BOOTMENU=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_SAVEENV is not set
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index b251061e30..fd755bbcea 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -270,8 +270,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
"run attachboot;" \
"echo"
-#define CONFIG_AUTOBOOT_MENU_SHOW
-
/*
* Miscellaneous configurable options
*/
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 2b1269de83..89cd8b550a 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -110,8 +110,6 @@
#define CONFIG_PL011_CLOCK 24000000
#endif
-/*#define CONFIG_AUTOBOOT_MENU_SHOW*/
-
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 16/18] autoboot: Add comments for menu_show()
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (14 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 15/18] Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 17/18] autoboot: Move a few more options from #ifdef to if() Simon Glass
` (3 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
Add comments for this function. Also remove the #ifdef around it so that
it can be called from 'if (IS_ENABLED(...))'.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
| 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
--git a/include/menu.h b/include/menu.h
index 8fd7b0a1f0..2d227c20bd 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -19,7 +19,20 @@ int menu_destroy(struct menu *m);
void menu_display_statusline(struct menu *m);
int menu_default_choice(struct menu *m, void **choice);
-#if defined(CONFIG_AUTOBOOT_MENU_SHOW)
+/**
+ * menu_show() Show a boot menu
+ *
+ * This shows a menu and lets the user select an option. The menu is defined by
+ * environment variables (see README.bootmenu).
+ *
+ * This function doesn't normally return, but if the users requests the command
+ * problem, it will.
+ *
+ * @bootdelay: Delay to wait before running the default menu option (0 to run
+ * the entry immediately)
+ * @return If it returns, it always returns -1 to indicate that the boot should
+ * be aborted and the command prompt should be provided
+ */
int menu_show(int bootdelay);
-#endif
+
#endif /* __MENU_H__ */
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 17/18] autoboot: Move a few more options from #ifdef to if()
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (15 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 16/18] autoboot: Add comments for menu_show() Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 18/18] autoboot: Adjust the implementation in autoboot_command() Simon Glass
` (2 subsequent siblings)
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
Adjust some of the code which can be trivially moved to use IS_ENABLED()
instead of #ifdef.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
common/autoboot.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index a38527ff96..75132f8697 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -292,7 +292,7 @@ static int abortboot(int bootdelay)
static void process_fdt_options(const void *blob)
{
-#if defined(CONFIG_OF_CONTROL) && defined(CONFIG_SYS_TEXT_BASE)
+#ifdef CONFIG_SYS_TEXT_BASE
ulong addr;
/* Add an env variable to point to a kernel payload, if available */
@@ -304,7 +304,7 @@ static void process_fdt_options(const void *blob)
addr = fdtdec_get_config_int(gd->fdt_blob, "rootdisk-offset", 0);
if (addr)
env_set_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr));
-#endif /* CONFIG_OF_CONTROL && CONFIG_SYS_TEXT_BASE */
+#endif /* CONFIG_SYS_TEXT_BASE */
}
const char *bootdelay_process(void)
@@ -317,16 +317,14 @@ const char *bootdelay_process(void)
s = env_get("bootdelay");
bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY;
-#ifdef CONFIG_OF_CONTROL
- bootdelay = fdtdec_get_config_int(gd->fdt_blob, "bootdelay",
- bootdelay);
-#endif
+ if (IS_ENABLED(CONFIG_OF_CONTROL))
+ bootdelay = fdtdec_get_config_int(gd->fdt_blob, "bootdelay",
+ bootdelay);
debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
-#if defined(CONFIG_AUTOBOOT_MENU_SHOW)
- bootdelay = menu_show(bootdelay);
-#endif
+ if (IS_ENABLED(CONFIG_AUTOBOOT_MENU_SHOW))
+ bootdelay = menu_show(bootdelay);
bootretry_init_cmd_timeout();
#ifdef CONFIG_POST
@@ -339,7 +337,8 @@ const char *bootdelay_process(void)
else
s = env_get("bootcmd");
- process_fdt_options(gd->fdt_blob);
+ if (IS_ENABLED(CONFIG_OF_CONTROL))
+ process_fdt_options(gd->fdt_blob);
stored_bootdelay = bootdelay;
return s;
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 18/18] autoboot: Adjust the implementation in autoboot_command()
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (16 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 17/18] autoboot: Move a few more options from #ifdef to if() Simon Glass
@ 2019-07-21 2:51 ` Simon Glass
2019-07-23 22:00 ` [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Lukasz Majewski
2019-08-02 22:06 ` Tom Rini
19 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2019-07-21 2:51 UTC (permalink / raw)
To: u-boot
Avoid use of #ifdef and keep the common condion in a variable. This makes
the code easier to read.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Rebase to master
common/autoboot.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c
index 75132f8697..42fbd7614a 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -349,15 +349,18 @@ void autoboot_command(const char *s)
debug("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");
if (stored_bootdelay != -1 && s && !abortboot(stored_bootdelay)) {
-#if defined(CONFIG_AUTOBOOT_KEYED) && !defined(CONFIG_AUTOBOOT_KEYED_CTRLC)
- int prev = disable_ctrlc(1); /* disable Control C checking */
-#endif
+ bool lock;
+ int prev;
+
+ lock = IS_ENABLED(CONFIG_AUTOBOOT_KEYED) &&
+ !IS_ENABLED(CONFIG_AUTOBOOT_KEYED_CTRLC);
+ if (lock)
+ prev = disable_ctrlc(1); /* disable Ctrl-C checking */
run_command_list(s, -1, 0);
-#if defined(CONFIG_AUTOBOOT_KEYED) && !defined(CONFIG_AUTOBOOT_KEYED_CTRLC)
- disable_ctrlc(prev); /* restore Control C checking */
-#endif
+ if (lock)
+ disable_ctrlc(prev); /* restore Ctrl-C checking */
}
if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY) &&
--
2.22.0.657.g960e92d24f-goog
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 04/18] Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig
2019-07-21 2:51 ` [U-Boot] [PATCH v2 04/18] Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig Simon Glass
@ 2019-07-23 17:23 ` David Abdurachmanov
0 siblings, 0 replies; 25+ messages in thread
From: David Abdurachmanov @ 2019-07-23 17:23 UTC (permalink / raw)
To: u-boot
On Mon, Jul 22, 2019 at 8:56 PM Simon Glass <sjg@chromium.org> wrote:
>
> This converts the following to Kconfig:
> CONFIG_USE_PREBOOT
> CONFIG_PREBOOT
>
> Both are together in one commit, since otherwise the former causes kconfig
> to define the latter, which gives duplicate symbol errors.
>
> Includes a manual fixup for CONFIG_PREBOOT in ids8313_defconfig since the
> backslash lands in the wrong place. Similarly with socfpga_vining_fpga.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
> configs/A10-OLinuXino-Lime_defconfig | 1 +
> configs/A10s-OLinuXino-M_defconfig | 1 +
> configs/A13-OLinuXinoM_defconfig | 1 +
> configs/A13-OLinuXino_defconfig | 1 +
> configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
> configs/A20-OLinuXino-Lime2_defconfig | 1 +
> configs/A20-OLinuXino-Lime_defconfig | 1 +
> configs/A20-OLinuXino_MICRO-eMMC_defconfig | 1 +
> configs/A20-OLinuXino_MICRO_defconfig | 1 +
> configs/A20-Olimex-SOM-EVB_defconfig | 1 +
> configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 +
> configs/A20-Olimex-SOM204-EVB_defconfig | 1 +
> configs/A33-OLinuXino_defconfig | 1 +
> configs/Ainol_AW1_defconfig | 1 +
> configs/Ampe_A76_defconfig | 1 +
> configs/Auxtek-T003_defconfig | 1 +
> configs/Auxtek-T004_defconfig | 1 +
> configs/Bananapi_M2_Ultra_defconfig | 1 +
> configs/Bananapi_defconfig | 1 +
> configs/Bananapi_m2m_defconfig | 1 +
> configs/Bananapro_defconfig | 1 +
> configs/CHIP_defconfig | 1 +
> configs/CHIP_pro_defconfig | 1 +
> configs/CSQ_CS908_defconfig | 1 +
> configs/Chuwi_V7_CW0825_defconfig | 1 +
> configs/Colombus_defconfig | 1 +
> configs/Cubieboard2_defconfig | 1 +
> configs/Cubieboard4_defconfig | 1 +
> configs/Cubieboard_defconfig | 1 +
> configs/Cubietruck_defconfig | 1 +
> configs/Cubietruck_plus_defconfig | 1 +
> configs/Empire_electronix_d709_defconfig | 1 +
> configs/Empire_electronix_m712_defconfig | 1 +
> configs/Hummingbird_A31_defconfig | 1 +
> configs/Hyundai_A7HD_defconfig | 1 +
> configs/Itead_Ibox_A20_defconfig | 1 +
> configs/Lamobo_R1_defconfig | 1 +
> configs/LicheePi_Zero_defconfig | 1 +
> configs/Linksprite_pcDuino3_Nano_defconfig | 1 +
> configs/Linksprite_pcDuino3_defconfig | 1 +
> configs/Linksprite_pcDuino_defconfig | 1 +
> configs/MK808C_defconfig | 1 +
> configs/MPC8349EMDS_PCI64_defconfig | 2 ++
> configs/MPC8349EMDS_SLAVE_defconfig | 2 ++
> configs/MPC8349EMDS_defconfig | 2 ++
> configs/MSI_Primo73_defconfig | 1 +
> configs/MSI_Primo81_defconfig | 1 +
> configs/Marsboard_A10_defconfig | 1 +
> configs/Mele_A1000G_quad_defconfig | 1 +
> configs/Mele_A1000_defconfig | 1 +
> configs/Mele_I7_defconfig | 1 +
> configs/Mele_M3_defconfig | 1 +
> configs/Mele_M5_defconfig | 1 +
> configs/Mele_M9_defconfig | 1 +
> configs/Merrii_A80_Optimus_defconfig | 1 +
> configs/Mini-X_defconfig | 1 +
> .../Nintendo_NES_Classic_Edition_defconfig | 1 +
> configs/Orangepi_defconfig | 1 +
> configs/Orangepi_mini_defconfig | 1 +
> configs/Sinlinx_SinA31s_defconfig | 1 +
> configs/Sinlinx_SinA33_defconfig | 1 +
> configs/Sinovoip_BPI_M2_defconfig | 1 +
> configs/Sinovoip_BPI_M3_defconfig | 1 +
> configs/Sunchip_CX-A99_defconfig | 1 +
> configs/TQM834x_defconfig | 2 ++
> configs/UTOO_P66_defconfig | 1 +
> configs/Wexler_TAB7200_defconfig | 1 +
> configs/Wits_Pro_A20_DKT_defconfig | 1 +
> configs/Wobo_i5_defconfig | 1 +
> configs/Yones_Toptech_BD1078_defconfig | 1 +
> configs/Yones_Toptech_BS1078_V2_defconfig | 1 +
> configs/a64-olinuxino_defconfig | 1 +
> configs/amarula_a64_relic_defconfig | 1 +
> configs/apf27_defconfig | 2 ++
> configs/arndale_defconfig | 1 +
> configs/aspenite_defconfig | 1 +
> configs/ba10_tv_box_defconfig | 1 +
> configs/bananapi_m1_plus_defconfig | 1 +
> configs/bananapi_m2_berry_defconfig | 1 +
> configs/bananapi_m2_plus_h3_defconfig | 1 +
> configs/bananapi_m2_plus_h5_defconfig | 1 +
> configs/bananapi_m2_zero_defconfig | 1 +
> configs/bananapi_m64_defconfig | 1 +
> configs/bcm7260_defconfig | 2 ++
> configs/bcm7445_defconfig | 2 ++
> configs/beelink_gs1_defconfig | 1 +
> configs/beelink_x2_defconfig | 5 ++--
> configs/bitmain_antminer_s9_defconfig | 1 +
> configs/bk4r1_defconfig | 1 +
> configs/brppt1_mmc_defconfig | 2 ++
> configs/brppt1_nand_defconfig | 2 ++
> configs/brppt1_spi_defconfig | 4 ++-
> configs/brxre1_defconfig | 2 ++
> configs/chromebit_mickey_defconfig | 2 +-
> configs/chromebook_jerry_defconfig | 2 +-
> configs/chromebook_minnie_defconfig | 2 +-
> configs/chromebook_speedy_defconfig | 2 +-
> configs/clearfog_defconfig | 1 +
> configs/clearfog_gt_8k_defconfig | 1 +
> configs/cm_fx6_defconfig | 2 ++
> configs/colorfly_e708_q1_defconfig | 1 +
> ...-qeval20-qa3-e3845-internal-uart_defconfig | 1 +
> configs/conga-qeval20-qa3-e3845_defconfig | 1 +
> configs/controlcenterdc_defconfig | 1 +
> configs/crs305-1g-4s_defconfig | 3 ++-
> configs/d2net_v2_defconfig | 1 +
> configs/db-88f6720_defconfig | 1 +
> configs/db-88f6820-amc_defconfig | 1 +
> configs/db-88f6820-gp_defconfig | 1 +
> configs/db-mv784mp-gp_defconfig | 1 +
> configs/db-xc3-24g4xg_defconfig | 1 +
> configs/dfi-bt700-q7x-151_defconfig | 1 +
> configs/difrnce_dit4350_defconfig | 1 +
> configs/dns325_defconfig | 1 +
> configs/dockstar_defconfig | 1 +
> configs/draco_defconfig | 1 +
> configs/dreamplug_defconfig | 1 +
> configs/ds109_defconfig | 1 +
> configs/ds414_defconfig | 2 ++
> configs/dserve_dsrv9703c_defconfig | 1 +
> configs/emlid_neutis_n5_devboard_defconfig | 1 +
> configs/etamin_defconfig | 1 +
> configs/evb-rk3036_defconfig | 1 +
> configs/evb-rk3229_defconfig | 3 +--
> configs/evb-rk3288_defconfig | 2 +-
> configs/fennec-rk3288_defconfig | 2 +-
> configs/firefly-rk3288_defconfig | 2 +-
> configs/ga10h_v1_1_defconfig | 1 +
> configs/goflexhome_defconfig | 1 +
> configs/gplugd_defconfig | 1 +
> configs/gt90h_v4_defconfig | 1 +
> configs/guruplug_defconfig | 1 +
> configs/gwventana_emmc_defconfig | 1 +
> configs/gwventana_gw5904_defconfig | 1 +
> configs/gwventana_nand_defconfig | 1 +
> configs/h8_homlet_v2_defconfig | 1 +
> configs/helios4_defconfig | 1 +
> configs/hrcon_defconfig | 1 +
> configs/hrcon_dh_defconfig | 1 +
> configs/i12-tvbox_defconfig | 1 +
> configs/iNet_3F_defconfig | 1 +
> configs/iNet_3W_defconfig | 1 +
> configs/iNet_86VS_defconfig | 1 +
> configs/iNet_D978_rev2_defconfig | 1 +
> configs/ib62x0_defconfig | 1 +
> configs/icnova-a20-swac_defconfig | 1 +
> configs/iconnect_defconfig | 1 +
> configs/ids8313_defconfig | 2 ++
> configs/inet1_defconfig | 1 +
> configs/inet86dz_defconfig | 1 +
> configs/inet97fv2_defconfig | 1 +
> configs/inet98v_rev2_defconfig | 1 +
> configs/inet9f_rev03_defconfig | 1 +
> configs/inet_q972_defconfig | 1 +
> configs/inetspace_v2_defconfig | 1 +
> configs/jesurun_q5_defconfig | 1 +
> configs/kylin-rk3036_defconfig | 1 +
> configs/libretech-ac_defconfig | 2 ++
> configs/libretech_all_h3_cc_h2_plus_defconfig | 1 +
> configs/libretech_all_h3_cc_h3_defconfig | 1 +
> configs/libretech_all_h3_cc_h5_defconfig | 1 +
> configs/lschlv2_defconfig | 1 +
> configs/lsxhl_defconfig | 1 +
> configs/m53menlo_defconfig | 2 ++
> configs/maxbcm_defconfig | 1 +
> configs/meesc_dataflash_defconfig | 3 ++-
> configs/meesc_defconfig | 1 +
> configs/microblaze-generic_defconfig | 2 ++
> configs/miqi-rk3288_defconfig | 2 +-
> configs/mixtile_loftq_defconfig | 1 +
> configs/mk802_a10s_defconfig | 1 +
> configs/mk802_defconfig | 1 +
> configs/mk802ii_defconfig | 1 +
> configs/mvebu_db-88f3720_defconfig | 1 +
> configs/mvebu_db_armada8k_defconfig | 1 +
> configs/mvebu_espressobin-88f3720_defconfig | 1 +
> configs/mvebu_mcbin-88f8040_defconfig | 1 +
> configs/mx51evk_defconfig | 1 +
> configs/mx53cx9020_defconfig | 1 +
> configs/mx53loco_defconfig | 1 +
> configs/mx6cuboxi_defconfig | 2 ++
> configs/mx6qsabrelite_defconfig | 1 +
> configs/nanopi_a64_defconfig | 1 +
> configs/nanopi_m1_defconfig | 1 +
> configs/nanopi_m1_plus_defconfig | 1 +
> configs/nanopi_neo2_defconfig | 1 +
> configs/nanopi_neo_air_defconfig | 1 +
> configs/nanopi_neo_defconfig | 1 +
> configs/nanopi_neo_plus2_defconfig | 1 +
> configs/nas220_defconfig | 1 +
> configs/net2big_v2_defconfig | 1 +
> configs/netspace_lite_v2_defconfig | 1 +
> configs/netspace_max_v2_defconfig | 1 +
> configs/netspace_mini_v2_defconfig | 1 +
> configs/netspace_v2_defconfig | 1 +
> configs/nitrogen6dl2g_defconfig | 1 +
> configs/nitrogen6dl_defconfig | 1 +
> configs/nitrogen6q2g_defconfig | 1 +
> configs/nitrogen6q_defconfig | 1 +
> configs/nitrogen6s1g_defconfig | 1 +
> configs/nitrogen6s_defconfig | 1 +
> configs/nokia_rx51_defconfig | 2 ++
> configs/nsa310s_defconfig | 1 +
> configs/oceanic_5205_5inmfd_defconfig | 1 +
> configs/omap35_logic_defconfig | 2 ++
> configs/omap35_logic_somlv_defconfig | 2 ++
> configs/omap3_beagle_defconfig | 2 ++
> configs/omap3_evm_defconfig | 1 +
> configs/omap3_logic_defconfig | 2 ++
> configs/omap3_logic_somlv_defconfig | 2 ++
> configs/openrd_base_defconfig | 1 +
> configs/openrd_client_defconfig | 1 +
> configs/openrd_ultimate_defconfig | 1 +
> configs/opos6uldev_defconfig | 2 ++
> configs/orangepi_2_defconfig | 1 +
> configs/orangepi_lite2_defconfig | 1 +
> configs/orangepi_lite_defconfig | 1 +
> configs/orangepi_one_defconfig | 1 +
> configs/orangepi_one_plus_defconfig | 1 +
> configs/orangepi_pc2_defconfig | 1 +
> configs/orangepi_pc_defconfig | 1 +
> configs/orangepi_pc_plus_defconfig | 1 +
> configs/orangepi_plus2e_defconfig | 1 +
> configs/orangepi_plus_defconfig | 1 +
> configs/orangepi_prime_defconfig | 1 +
> configs/orangepi_r1_defconfig | 1 +
> configs/orangepi_win_defconfig | 1 +
> configs/orangepi_zero_defconfig | 1 +
> configs/orangepi_zero_plus2_defconfig | 1 +
> configs/orangepi_zero_plus_defconfig | 1 +
> configs/ot1200_defconfig | 1 +
> configs/ot1200_spl_defconfig | 1 +
> configs/parrot_r16_defconfig | 1 +
> configs/phycore-rk3288_defconfig | 2 +-
> configs/pine64-lts_defconfig | 1 +
> configs/pine64_plus_defconfig | 1 +
> configs/pine_h64_defconfig | 3 ++-
> configs/pinebook_defconfig | 1 +
> configs/platinum_picon_defconfig | 1 +
> configs/platinum_titanium_defconfig | 1 +
> configs/pogo_e02_defconfig | 1 +
> configs/polaroid_mid2407pxe03_defconfig | 1 +
> configs/polaroid_mid2809pxe04_defconfig | 1 +
> configs/popmetal-rk3288_defconfig | 2 +-
> configs/pov_protab2_ips9_defconfig | 1 +
> configs/pxm2_defconfig | 1 +
> configs/q8_a13_tablet_defconfig | 1 +
> configs/q8_a23_tablet_800x480_defconfig | 1 +
> configs/q8_a33_tablet_1024x600_defconfig | 1 +
> configs/q8_a33_tablet_800x480_defconfig | 1 +
> configs/qemu_arm64_defconfig | 2 ++
> configs/qemu_arm_defconfig | 2 ++
> configs/r7-tv-dongle_defconfig | 1 +
> configs/rastaban_defconfig | 1 +
> configs/rock2_defconfig | 2 +-
> configs/rock_defconfig | 1 +
> configs/rpi_0_w_defconfig | 2 ++
> configs/rpi_2_defconfig | 2 ++
> configs/rpi_3_32b_defconfig | 2 ++
> configs/rpi_3_b_plus_defconfig | 4 ++-
> configs/rpi_3_defconfig | 2 ++
> configs/rpi_defconfig | 2 ++
> configs/rut_defconfig | 1 +
> configs/seaboard_defconfig | 2 ++
> configs/sheevaplug_defconfig | 1 +
> configs/socfpga_dbm_soc1_defconfig | 2 ++
> configs/socfpga_vining_fpga_defconfig | 2 ++
> configs/socrates_defconfig | 2 ++
> configs/sopine_baseboard_defconfig | 1 +
> configs/strider_con_defconfig | 1 +
> configs/strider_con_dp_defconfig | 1 +
> configs/strider_cpu_defconfig | 1 +
> configs/strider_cpu_dp_defconfig | 1 +
> configs/sun8i_a23_evb_defconfig | 1 +
> configs/sunxi_Gemei_G9_defconfig | 1 +
> configs/syzygy_hub_defconfig | 1 +
> configs/tbs2910_defconfig | 2 ++
> configs/tbs_a711_defconfig | 1 +
> configs/teres_i_defconfig | 1 +
> ...able-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 +
> .../theadorable-x86-conga-qa3-e3845_defconfig | 1 +
> configs/theadorable-x86-dfi-bt700_defconfig | 1 +
> configs/theadorable_debug_defconfig | 1 +
> configs/thuban_defconfig | 1 +
> configs/tinker-rk3288_defconfig | 2 +-
> configs/topic_miami_defconfig | 1 +
> configs/topic_miamilite_defconfig | 1 +
> configs/topic_miamiplus_defconfig | 1 +
> configs/turris_mox_defconfig | 1 +
> configs/turris_omnia_defconfig | 1 +
> configs/uDPU_defconfig | 1 +
> configs/ventana_defconfig | 2 ++
> configs/vyasa-rk3288_defconfig | 2 +-
> configs/xpedite517x_defconfig | 1 +
> configs/xpedite520x_defconfig | 1 +
> configs/xpedite537x_defconfig | 1 +
> configs/xpedite550x_defconfig | 1 +
> configs/zmx25_defconfig | 1 +
> configs/zynq_cc108_defconfig | 1 +
> configs/zynq_cse_nand_defconfig | 1 +
> configs/zynq_cse_nor_defconfig | 1 +
> configs/zynq_cse_qspi_defconfig | 1 +
> configs/zynq_dlc20_rev1_0_defconfig | 1 +
> configs/zynq_microzed_defconfig | 1 +
> configs/zynq_minized_defconfig | 1 +
> configs/zynq_picozed_defconfig | 1 +
> configs/zynq_z_turn_defconfig | 1 +
> configs/zynq_zc702_defconfig | 1 +
> configs/zynq_zc706_defconfig | 1 +
> configs/zynq_zc770_xm010_defconfig | 1 +
> configs/zynq_zc770_xm011_defconfig | 1 +
> configs/zynq_zc770_xm011_x16_defconfig | 1 +
> configs/zynq_zc770_xm012_defconfig | 1 +
> configs/zynq_zc770_xm013_defconfig | 1 +
> configs/zynq_zed_defconfig | 1 +
> configs/zynq_zybo_defconfig | 1 +
> configs/zynq_zybo_z7_defconfig | 1 +
> include/configs/MPC8349EMDS.h | 5 ----
> include/configs/MPC8349EMDS_SDRAM.h | 4 ---
> include/configs/TQM834x.h | 5 ----
> include/configs/am3517_crane.h | 10 --------
> include/configs/am3517_evm.h | 13 ----------
> include/configs/apf27.h | 2 --
> include/configs/arndale.h | 3 ---
> include/configs/bcmstb.h | 5 ----
> include/configs/bk4r1.h | 2 --
> include/configs/bur_cfg_common.h | 3 ---
> include/configs/cm_fx6.h | 3 ---
> include/configs/conga-qeval20-qa3-e3845.h | 3 ---
> include/configs/controlcenterdc.h | 3 ---
> include/configs/dfi-bt700.h | 3 ---
> include/configs/ds414.h | 3 ---
> include/configs/gazerbeam.h | 2 --
> include/configs/gw_ventana.h | 2 --
> include/configs/hrcon.h | 3 ---
> include/configs/ids8313.h | 4 ---
> include/configs/m53menlo.h | 2 --
> include/configs/meesc.h | 3 ---
> include/configs/meson64.h | 2 --
> include/configs/microblaze-generic.h | 3 ---
> include/configs/mv-common.h | 2 --
> include/configs/mvebu_armada-37xx.h | 2 --
> include/configs/mvebu_armada-8k.h | 2 --
> include/configs/mx51evk.h | 2 --
> include/configs/mx53cx9020.h | 2 --
> include/configs/mx53loco.h | 2 --
> include/configs/mx6cuboxi.h | 12 ---------
> include/configs/nitrogen6x.h | 3 ---
> include/configs/nokia_rx51.h | 25 -------------------
> include/configs/omap3_beagle.h | 3 ---
> include/configs/omap3_logic.h | 5 ----
> include/configs/opos6uldev.h | 2 --
> include/configs/ot1200.h | 3 ---
> include/configs/platinum.h | 2 --
> include/configs/qemu-arm.h | 2 --
> include/configs/qemu-riscv.h | 4 ---
> include/configs/rk3036_common.h | 3 ---
> include/configs/rk3188_common.h | 3 ---
> include/configs/rk322x_common.h | 3 ---
> include/configs/rk3288_common.h | 3 ---
> include/configs/rpi.h | 2 --
> include/configs/siemens-am33x-common.h | 2 --
> include/configs/socfpga_dbm_soc1.h | 2 --
> include/configs/socfpga_mcvevk.h | 1 -
> include/configs/socfpga_vining_fpga.h | 11 --------
> include/configs/socrates.h | 6 -----
> include/configs/strider.h | 3 ---
> include/configs/sunxi-common.h | 5 ----
> include/configs/tbs2910.h | 10 --------
> include/configs/tegra-common-post.h | 2 --
> include/configs/theadorable-x86-common.h | 3 ---
> include/configs/theadorable.h | 3 ---
> include/configs/topic_miami.h | 3 ---
> include/configs/turris_mox.h | 2 --
> include/configs/xpedite517x.h | 2 --
> include/configs/xpedite520x.h | 2 --
> include/configs/xpedite537x.h | 2 --
> include/configs/xpedite550x.h | 2 --
> include/configs/zmx25.h | 3 ---
> include/configs/zynq-common.h | 2 --
> 380 files changed, 362 insertions(+), 264 deletions(-)
>
> diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
> index a986bf880e..9eea922d10 100644
> --- a/configs/A10-OLinuXino-Lime_defconfig
> +++ b/configs/A10-OLinuXino-Lime_defconfig
> @@ -11,6 +11,7 @@ CONFIG_I2C1_ENABLE=y
> CONFIG_SATAPWR="PC3"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
> index 26c927ffde..d92a70e4d0 100644
> --- a/configs/A10s-OLinuXino-M_defconfig
> +++ b/configs/A10s-OLinuXino-M_defconfig
> @@ -9,6 +9,7 @@ CONFIG_MMC1_CD_PIN="PG13"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=1
> CONFIG_USB1_VBUS_PIN="PB10"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
> index 1d48214aa4..da80d35054 100644
> --- a/configs/A13-OLinuXinoM_defconfig
> +++ b/configs/A13-OLinuXinoM_defconfig
> @@ -13,6 +13,7 @@ CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y
> CONFIG_VIDEO_LCD_POWER="PB10"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
> index 63c8a2a895..dfd439a52e 100644
> --- a/configs/A13-OLinuXino_defconfig
> +++ b/configs/A13-OLinuXino_defconfig
> @@ -15,6 +15,7 @@ CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y
> CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> CONFIG_CMD_DFU=y
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> index b00fcf34fd..298c9f2072 100644
> --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> @@ -13,6 +13,7 @@ CONFIG_SATAPWR="PC3"
> CONFIG_SPL_SPI_SUNXI=y
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> CONFIG_CMD_DFU=y
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
> index db1c25c6f8..084dab0ceb 100644
> --- a/configs/A20-OLinuXino-Lime2_defconfig
> +++ b/configs/A20-OLinuXino-Lime2_defconfig
> @@ -11,6 +11,7 @@ CONFIG_I2C1_ENABLE=y
> CONFIG_SATAPWR="PC3"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> CONFIG_CMD_DFU=y
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
> index e1e72ed3a3..ffeeda414e 100644
> --- a/configs/A20-OLinuXino-Lime_defconfig
> +++ b/configs/A20-OLinuXino-Lime_defconfig
> @@ -9,6 +9,7 @@ CONFIG_I2C1_ENABLE=y
> CONFIG_SATAPWR="PC3"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/A20-OLinuXino_MICRO-eMMC_defconfig b/configs/A20-OLinuXino_MICRO-eMMC_defconfig
> index 62d878f404..f4c6c54cfd 100644
> --- a/configs/A20-OLinuXino_MICRO-eMMC_defconfig
> +++ b/configs/A20-OLinuXino_MICRO-eMMC_defconfig
> @@ -11,6 +11,7 @@ CONFIG_VIDEO_VGA=y
> CONFIG_SATAPWR="PB8"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
> index 29efaf6bc4..440eebbeec 100644
> --- a/configs/A20-OLinuXino_MICRO_defconfig
> +++ b/configs/A20-OLinuXino_MICRO_defconfig
> @@ -12,6 +12,7 @@ CONFIG_VIDEO_VGA=y
> CONFIG_SATAPWR="PB8"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig
> index 59dfdcc407..48c4c3e53a 100644
> --- a/configs/A20-Olimex-SOM-EVB_defconfig
> +++ b/configs/A20-Olimex-SOM-EVB_defconfig
> @@ -13,6 +13,7 @@ CONFIG_USB0_VBUS_DET="PH5"
> CONFIG_SATAPWR="PC3"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig b/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig
> index c41e4356a4..193e20aa8b 100644
> --- a/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig
> +++ b/configs/A20-Olimex-SOM204-EVB-eMMC_defconfig
> @@ -13,6 +13,7 @@ CONFIG_SATAPWR="PC3"
> CONFIG_GMAC_TX_DELAY=4
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/A20-Olimex-SOM204-EVB_defconfig b/configs/A20-Olimex-SOM204-EVB_defconfig
> index 38cc65bd5c..42a73c8057 100644
> --- a/configs/A20-Olimex-SOM204-EVB_defconfig
> +++ b/configs/A20-Olimex-SOM204-EVB_defconfig
> @@ -12,6 +12,7 @@ CONFIG_SATAPWR="PC3"
> CONFIG_GMAC_TX_DELAY=4
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/A33-OLinuXino_defconfig b/configs/A33-OLinuXino_defconfig
> index 4389856987..6ea4238342 100644
> --- a/configs/A33-OLinuXino_defconfig
> +++ b/configs/A33-OLinuXino_defconfig
> @@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
> CONFIG_VIDEO_LCD_BL_EN="PB2"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
> index c44050f899..9b7f19736c 100644
> --- a/configs/Ainol_AW1_defconfig
> +++ b/configs/Ainol_AW1_defconfig
> @@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
> CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig
> index 0a2774761e..1810d48a0b 100644
> --- a/configs/Ampe_A76_defconfig
> +++ b/configs/Ampe_A76_defconfig
> @@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Auxtek-T003_defconfig b/configs/Auxtek-T003_defconfig
> index c0fb54749e..2dc6c8d8e2 100644
> --- a/configs/Auxtek-T003_defconfig
> +++ b/configs/Auxtek-T003_defconfig
> @@ -8,6 +8,7 @@ CONFIG_DRAM_EMR1=0
> CONFIG_USB1_VBUS_PIN="PB10"
> CONFIG_VIDEO_COMPOSITE=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
> index ae320b7033..4395d5b724 100644
> --- a/configs/Auxtek-T004_defconfig
> +++ b/configs/Auxtek-T004_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN5I=y
> CONFIG_DRAM_CLK=432
> CONFIG_USB1_VBUS_PIN="PG13"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Bananapi_M2_Ultra_defconfig b/configs/Bananapi_M2_Ultra_defconfig
> index 384820d939..40b60599d5 100644
> --- a/configs/Bananapi_M2_Ultra_defconfig
> +++ b/configs/Bananapi_M2_Ultra_defconfig
> @@ -9,6 +9,7 @@ CONFIG_MMC0_CD_PIN="PH13"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_DEFAULT_DEVICE_TREE="sun8i-r40-bananapi-m2-ultra"
> diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
> index 86cc3a2f04..abd7d3d125 100644
> --- a/configs/Bananapi_defconfig
> +++ b/configs/Bananapi_defconfig
> @@ -9,6 +9,7 @@ CONFIG_VIDEO_COMPOSITE=y
> CONFIG_GMAC_TX_DELAY=3
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Bananapi_m2m_defconfig b/configs/Bananapi_m2m_defconfig
> index 87e2d34e4d..b4f3794153 100644
> --- a/configs/Bananapi_m2m_defconfig
> +++ b/configs/Bananapi_m2m_defconfig
> @@ -10,6 +10,7 @@ CONFIG_MMC0_CD_PIN="PB4"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> CONFIG_USB0_ID_DET="PH8"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_PARTITION_UUIDS is not set
> diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
> index 8636eab238..c5d33a2e14 100644
> --- a/configs/Bananapro_defconfig
> +++ b/configs/Bananapro_defconfig
> @@ -11,6 +11,7 @@ CONFIG_VIDEO_COMPOSITE=y
> CONFIG_GMAC_TX_DELAY=3
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
> index 95c564c407..78681084ba 100644
> --- a/configs/CHIP_defconfig
> +++ b/configs/CHIP_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN5I=y
> CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
> CONFIG_USB0_VBUS_PIN="PB10"
> CONFIG_VIDEO_COMPOSITE=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> CONFIG_CMD_DFU=y
> CONFIG_CMD_USB_MASS_STORAGE=y
> diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
> index 6cd500f3be..82994212a2 100644
> --- a/configs/CHIP_pro_defconfig
> +++ b/configs/CHIP_pro_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SPL=y
> CONFIG_MACH_SUN5I=y
> CONFIG_DRAM_TIMINGS_DDR3_800E_1066G_1333J=y
> CONFIG_USB0_VBUS_PIN="PB10"
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_MTDPARTS=y
> diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
> index d1ba5c87b7..65b6777e0e 100644
> --- a/configs/CSQ_CS908_defconfig
> +++ b/configs/CSQ_CS908_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=432
> CONFIG_USB1_VBUS_PIN=""
> CONFIG_USB2_VBUS_PIN=""
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
> index acd931c910..39caa75ff3 100644
> --- a/configs/Chuwi_V7_CW0825_defconfig
> +++ b/configs/Chuwi_V7_CW0825_defconfig
> @@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_PANEL_HITACHI_TX18D42VM=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
> index 5e52388e7e..9065792149 100644
> --- a/configs/Colombus_defconfig
> +++ b/configs/Colombus_defconfig
> @@ -17,6 +17,7 @@ CONFIG_VIDEO_LCD_PANEL_I2C_SDA="PA23"
> CONFIG_VIDEO_LCD_PANEL_I2C_SCL="PA24"
> CONFIG_VIDEO_LCD_PANEL_EDP_4_LANE_1620M_VIA_ANX9804=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
> index d1ff8fd116..ee5412cdb8 100644
> --- a/configs/Cubieboard2_defconfig
> +++ b/configs/Cubieboard2_defconfig
> @@ -8,6 +8,7 @@ CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_SATAPWR="PB8"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Cubieboard4_defconfig b/configs/Cubieboard4_defconfig
> index 013482094f..e44d79e0c2 100644
> --- a/configs/Cubieboard4_defconfig
> +++ b/configs/Cubieboard4_defconfig
> @@ -12,6 +12,7 @@ CONFIG_USB0_ID_DET="PH16"
> CONFIG_USB1_VBUS_PIN="PH14"
> CONFIG_USB3_VBUS_PIN="PH15"
> CONFIG_AXP_GPIO=y
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
> index 1ff72708dd..593dbe86a1 100644
> --- a/configs/Cubieboard_defconfig
> +++ b/configs/Cubieboard_defconfig
> @@ -8,6 +8,7 @@ CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_SATAPWR="PB8"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index ed8fbe9f2a..fe92f64644 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -13,6 +13,7 @@ CONFIG_SATAPWR="PH12"
> CONFIG_GMAC_TX_DELAY=1
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> CONFIG_CMD_DFU=y
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Cubietruck_plus_defconfig b/configs/Cubietruck_plus_defconfig
> index 0573c1f2fa..9748805dca 100644
> --- a/configs/Cubietruck_plus_defconfig
> +++ b/configs/Cubietruck_plus_defconfig
> @@ -15,6 +15,7 @@ CONFIG_USB2_VBUS_PIN="PL6"
> CONFIG_I2C0_ENABLE=y
> CONFIG_AXP_GPIO=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Empire_electronix_d709_defconfig b/configs/Empire_electronix_d709_defconfig
> index f5dd96d6e8..ff6562df5c 100644
> --- a/configs/Empire_electronix_d709_defconfig
> +++ b/configs/Empire_electronix_d709_defconfig
> @@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Empire_electronix_m712_defconfig b/configs/Empire_electronix_m712_defconfig
> index b8c3c56a91..767d497b3c 100644
> --- a/configs/Empire_electronix_m712_defconfig
> +++ b/configs/Empire_electronix_m712_defconfig
> @@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
> index f7a7b736b2..44a66028bd 100644
> --- a/configs/Hummingbird_A31_defconfig
> +++ b/configs/Hummingbird_A31_defconfig
> @@ -9,6 +9,7 @@ CONFIG_USB2_VBUS_PIN=""
> CONFIG_VIDEO_VGA_VIA_LCD=y
> CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN="PH25"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig
> index 2b1b1ccfbb..0fe7c11300 100644
> --- a/configs/Hyundai_A7HD_defconfig
> +++ b/configs/Hyundai_A7HD_defconfig
> @@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Itead_Ibox_A20_defconfig b/configs/Itead_Ibox_A20_defconfig
> index f44fc9e935..01f259f45d 100644
> --- a/configs/Itead_Ibox_A20_defconfig
> +++ b/configs/Itead_Ibox_A20_defconfig
> @@ -8,6 +8,7 @@ CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_SATAPWR="PB8"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
> index 0ce8c1110a..974ff1c76b 100644
> --- a/configs/Lamobo_R1_defconfig
> +++ b/configs/Lamobo_R1_defconfig
> @@ -10,6 +10,7 @@ CONFIG_SATAPWR="PB3"
> CONFIG_GMAC_TX_DELAY=4
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/LicheePi_Zero_defconfig b/configs/LicheePi_Zero_defconfig
> index 760cb1b068..ca0bcc0cf2 100644
> --- a/configs/LicheePi_Zero_defconfig
> +++ b/configs/LicheePi_Zero_defconfig
> @@ -4,6 +4,7 @@ CONFIG_NR_DRAM_BANKS=1
> CONFIG_SPL=y
> CONFIG_MACH_SUN8I_V3S=y
> CONFIG_DRAM_CLK=360
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
> index 3277461b92..23651ec985 100644
> --- a/configs/Linksprite_pcDuino3_Nano_defconfig
> +++ b/configs/Linksprite_pcDuino3_Nano_defconfig
> @@ -10,6 +10,7 @@ CONFIG_SATAPWR="PH2"
> CONFIG_GMAC_TX_DELAY=3
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
> index ce07a8c7ec..6cb36637a3 100644
> --- a/configs/Linksprite_pcDuino3_defconfig
> +++ b/configs/Linksprite_pcDuino3_defconfig
> @@ -8,6 +8,7 @@ CONFIG_DRAM_ZQ=122
> CONFIG_SATAPWR="PH2"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig
> index 9685757e30..dd2b2802e4 100644
> --- a/configs/Linksprite_pcDuino_defconfig
> +++ b/configs/Linksprite_pcDuino_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN4I=y
> CONFIG_USB1_VBUS_PIN=""
> CONFIG_USB2_VBUS_PIN=""
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig
> index 2da7a857a2..7f23f9e608 100644
> --- a/configs/MK808C_defconfig
> +++ b/configs/MK808C_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SPL=y
> CONFIG_MACH_SUN7I=y
> CONFIG_DRAM_CLK=384
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/MPC8349EMDS_PCI64_defconfig b/configs/MPC8349EMDS_PCI64_defconfig
> index f99aaecfb0..00dc72d81c 100644
> --- a/configs/MPC8349EMDS_PCI64_defconfig
> +++ b/configs/MPC8349EMDS_PCI64_defconfig
> @@ -84,6 +84,8 @@ CONFIG_LCRR_CLKDIV_4=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_BOOTDELAY=6
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_IMLS=y
> CONFIG_CMD_I2C=y
> diff --git a/configs/MPC8349EMDS_SLAVE_defconfig b/configs/MPC8349EMDS_SLAVE_defconfig
> index 3a1268a5ae..7550aa30c7 100644
> --- a/configs/MPC8349EMDS_SLAVE_defconfig
> +++ b/configs/MPC8349EMDS_SLAVE_defconfig
> @@ -84,6 +84,8 @@ CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_SYS_EXTRA_OPTIONS="PCISLAVE"
> CONFIG_BOOTDELAY=6
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_IMLS=y
> CONFIG_CMD_I2C=y
> diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig
> index a446bb9f2c..ba00a275cd 100644
> --- a/configs/MPC8349EMDS_defconfig
> +++ b/configs/MPC8349EMDS_defconfig
> @@ -85,6 +85,8 @@ CONFIG_PCI_ONE_PCI1=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_BOOTDELAY=6
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_IMLS=y
> CONFIG_CMD_I2C=y
> diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig
> index 746e5686ab..a4d137cd23 100644
> --- a/configs/MSI_Primo73_defconfig
> +++ b/configs/MSI_Primo73_defconfig
> @@ -10,6 +10,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
> CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
> index 5eaf24aa89..12f8bd91b5 100644
> --- a/configs/MSI_Primo81_defconfig
> +++ b/configs/MSI_Primo81_defconfig
> @@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_BL_EN="PA25"
> CONFIG_VIDEO_LCD_BL_PWM="PH13"
> CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
> index 2666f1b601..d4cdcb7907 100644
> --- a/configs/Marsboard_A10_defconfig
> +++ b/configs/Marsboard_A10_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SPL=y
> CONFIG_MACH_SUN4I=y
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Mele_A1000G_quad_defconfig b/configs/Mele_A1000G_quad_defconfig
> index 4d900c1950..08d847989d 100644
> --- a/configs/Mele_A1000G_quad_defconfig
> +++ b/configs/Mele_A1000G_quad_defconfig
> @@ -8,6 +8,7 @@ CONFIG_INITIAL_USB_SCAN_DELAY=2000
> CONFIG_USB1_VBUS_PIN="PC27"
> CONFIG_USB2_VBUS_PIN=""
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
> index fe6c0fa165..d1cd98db90 100644
> --- a/configs/Mele_A1000_defconfig
> +++ b/configs/Mele_A1000_defconfig
> @@ -8,6 +8,7 @@ CONFIG_VIDEO_VGA=y
> CONFIG_VIDEO_COMPOSITE=y
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
> index 10c151f4e0..3b3b35d6d5 100644
> --- a/configs/Mele_I7_defconfig
> +++ b/configs/Mele_I7_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=120
> CONFIG_USB1_VBUS_PIN="PC27"
> CONFIG_USB2_VBUS_PIN=""
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
> index b3b38a5288..8f03d1e96a 100644
> --- a/configs/Mele_M3_defconfig
> +++ b/configs/Mele_M3_defconfig
> @@ -9,6 +9,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> CONFIG_VIDEO_VGA=y
> CONFIG_VIDEO_COMPOSITE=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
> index 57b25bac02..d455a56315 100644
> --- a/configs/Mele_M5_defconfig
> +++ b/configs/Mele_M5_defconfig
> @@ -9,6 +9,7 @@ CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_VIDEO_COMPOSITE=y
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
> index 70facee385..9865e83f06 100644
> --- a/configs/Mele_M9_defconfig
> +++ b/configs/Mele_M9_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=120
> CONFIG_USB1_VBUS_PIN="PC27"
> CONFIG_USB2_VBUS_PIN=""
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig
> index 288b5e6be8..b45b6cde1c 100644
> --- a/configs/Merrii_A80_Optimus_defconfig
> +++ b/configs/Merrii_A80_Optimus_defconfig
> @@ -12,6 +12,7 @@ CONFIG_USB0_ID_DET="PH3"
> CONFIG_USB1_VBUS_PIN="PH4"
> CONFIG_USB3_VBUS_PIN="PH5"
> CONFIG_AXP_GPIO=y
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
> index 6000e397f2..7d440d1813 100644
> --- a/configs/Mini-X_defconfig
> +++ b/configs/Mini-X_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN4I=y
> CONFIG_USB0_VBUS_PIN="PB9"
> CONFIG_VIDEO_COMPOSITE=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
> index d0a788987c..2a75804105 100644
> --- a/configs/Nintendo_NES_Classic_Edition_defconfig
> +++ b/configs/Nintendo_NES_Classic_Edition_defconfig
> @@ -9,6 +9,7 @@ CONFIG_DRAM_ODT_EN=y
> CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
> CONFIG_AXP_GPIO=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_MTDPARTS=y
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
> index 2a7bfffc95..1ff40a09ef 100644
> --- a/configs/Orangepi_defconfig
> +++ b/configs/Orangepi_defconfig
> @@ -12,6 +12,7 @@ CONFIG_VIDEO_COMPOSITE=y
> CONFIG_GMAC_TX_DELAY=3
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
> index 9f41fabddb..af98dc8396 100644
> --- a/configs/Orangepi_mini_defconfig
> +++ b/configs/Orangepi_mini_defconfig
> @@ -14,6 +14,7 @@ CONFIG_VIDEO_COMPOSITE=y
> CONFIG_GMAC_TX_DELAY=3
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Sinlinx_SinA31s_defconfig b/configs/Sinlinx_SinA31s_defconfig
> index 0714430403..3588a2c9dd 100644
> --- a/configs/Sinlinx_SinA31s_defconfig
> +++ b/configs/Sinlinx_SinA31s_defconfig
> @@ -11,6 +11,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=3
> CONFIG_USB1_VBUS_PIN=""
> CONFIG_USB2_VBUS_PIN=""
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
> index 978e856d79..a7383f1eda 100644
> --- a/configs/Sinlinx_SinA33_defconfig
> +++ b/configs/Sinlinx_SinA33_defconfig
> @@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_CMD_DFU=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Sinovoip_BPI_M2_defconfig b/configs/Sinovoip_BPI_M2_defconfig
> index 46ef97d7eb..691fd85f47 100644
> --- a/configs/Sinovoip_BPI_M2_defconfig
> +++ b/configs/Sinovoip_BPI_M2_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=432
> CONFIG_USB1_VBUS_PIN=""
> CONFIG_USB2_VBUS_PIN=""
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/Sinovoip_BPI_M3_defconfig b/configs/Sinovoip_BPI_M3_defconfig
> index 914fc9d506..6ded24e294 100644
> --- a/configs/Sinovoip_BPI_M3_defconfig
> +++ b/configs/Sinovoip_BPI_M3_defconfig
> @@ -16,6 +16,7 @@ CONFIG_USB1_VBUS_PIN="PD24"
> CONFIG_AXP_GPIO=y
> CONFIG_SATAPWR="PD25"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Sunchip_CX-A99_defconfig b/configs/Sunchip_CX-A99_defconfig
> index c884d8f955..8bc353112b 100644
> --- a/configs/Sunchip_CX-A99_defconfig
> +++ b/configs/Sunchip_CX-A99_defconfig
> @@ -12,6 +12,7 @@ CONFIG_USB0_VBUS_PIN="PH15"
> CONFIG_USB1_VBUS_PIN="PL7"
> CONFIG_USB3_VBUS_PIN="PL8"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig
> index 65ab07ee4d..d2e85c9408 100644
> --- a/configs/TQM834x_defconfig
> +++ b/configs/TQM834x_defconfig
> @@ -119,6 +119,8 @@ CONFIG_LCRR_CLKDIV_8=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_BOOTDELAY=6
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
> CONFIG_BOARD_EARLY_INIT_R=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_IMLS=y
> diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig
> index 5be41f1880..2b10629cbf 100644
> --- a/configs/UTOO_P66_defconfig
> +++ b/configs/UTOO_P66_defconfig
> @@ -20,6 +20,7 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_TL059WV5C0=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig
> index b721118418..6413fabf84 100644
> --- a/configs/Wexler_TAB7200_defconfig
> +++ b/configs/Wexler_TAB7200_defconfig
> @@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
> CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
> index 954a6b777b..437c86795b 100644
> --- a/configs/Wits_Pro_A20_DKT_defconfig
> +++ b/configs/Wits_Pro_A20_DKT_defconfig
> @@ -12,6 +12,7 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Wobo_i5_defconfig b/configs/Wobo_i5_defconfig
> index 3a2c2877a8..e21e4e0ab4 100644
> --- a/configs/Wobo_i5_defconfig
> +++ b/configs/Wobo_i5_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=432
> CONFIG_MMC0_CD_PIN="PB3"
> CONFIG_USB1_VBUS_PIN="PG12"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig
> index 9a4743ff6a..0f8c8afc29 100644
> --- a/configs/Yones_Toptech_BD1078_defconfig
> +++ b/configs/Yones_Toptech_BD1078_defconfig
> @@ -19,6 +19,7 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/Yones_Toptech_BS1078_V2_defconfig b/configs/Yones_Toptech_BS1078_V2_defconfig
> index cd2b6744b8..9c8107c50d 100644
> --- a/configs/Yones_Toptech_BS1078_V2_defconfig
> +++ b/configs/Yones_Toptech_BS1078_V2_defconfig
> @@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_BL_EN="PA25"
> CONFIG_VIDEO_LCD_BL_PWM="PH13"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/a64-olinuxino_defconfig b/configs/a64-olinuxino_defconfig
> index 65430c32fc..8a3561bed5 100644
> --- a/configs/a64-olinuxino_defconfig
> +++ b/configs/a64-olinuxino_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN50I=y
> CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig
> index d41eb34691..9eda731a77 100644
> --- a/configs/amarula_a64_relic_defconfig
> +++ b/configs/amarula_a64_relic_defconfig
> @@ -7,6 +7,7 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_VIDEO_DE2 is not set
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
> index 0f5123abb0..29e9e3b9a9 100644
> --- a/configs/apf27_defconfig
> +++ b/configs/apf27_defconfig
> @@ -10,6 +10,8 @@ CONFIG_ENV_VARS_UBOOT_CONFIG=y
> CONFIG_BOOTDELAY=5
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttySMX0,115200 mtdparts=mxc_nand.0:1M(u-boot)ro,512K(env),512K(env2),512K(firmware),512K(dtb),5M(kernel),-(rootfs) ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="run check_flash check_env;"
> CONFIG_VERSION_VARIABLE=y
> # CONFIG_SPL_FRAMEWORK is not set
> CONFIG_SPL_TEXT_BASE=0xA0000000
> diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
> index c1b727e0df..6f586bae68 100644
> --- a/configs/arndale_defconfig
> +++ b/configs/arndale_defconfig
> @@ -9,6 +9,7 @@ CONFIG_IDENT_STRING=" for ARNDALE"
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_FIT=y
> CONFIG_FIT_BEST_MATCH=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_CONSOLE_MUX=y
> # CONFIG_SPL_FRAMEWORK is not set
> diff --git a/configs/aspenite_defconfig b/configs/aspenite_defconfig
> index 68b68f89d1..fed2de5c37 100644
> --- a/configs/aspenite_defconfig
> +++ b/configs/aspenite_defconfig
> @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
> CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nMarvell-Aspenite DB"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_BOARD_EARLY_INIT_F=y
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
> index dc47292ce0..a384399b41 100644
> --- a/configs/ba10_tv_box_defconfig
> +++ b/configs/ba10_tv_box_defconfig
> @@ -9,6 +9,7 @@ CONFIG_USB0_VBUS_PIN="PB9"
> CONFIG_USB2_VBUS_PIN="PH12"
> CONFIG_VIDEO_COMPOSITE=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/bananapi_m1_plus_defconfig b/configs/bananapi_m1_plus_defconfig
> index c534a548d8..549d13ee48 100644
> --- a/configs/bananapi_m1_plus_defconfig
> +++ b/configs/bananapi_m1_plus_defconfig
> @@ -9,6 +9,7 @@ CONFIG_VIDEO_COMPOSITE=y
> CONFIG_GMAC_TX_DELAY=3
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/bananapi_m2_berry_defconfig b/configs/bananapi_m2_berry_defconfig
> index 27999555b6..75fd0b173a 100644
> --- a/configs/bananapi_m2_berry_defconfig
> +++ b/configs/bananapi_m2_berry_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=576
> CONFIG_MMC0_CD_PIN="PH13"
> CONFIG_AHCI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_DEFAULT_DEVICE_TREE="sun8i-v40-bananapi-m2-berry"
> diff --git a/configs/bananapi_m2_plus_h3_defconfig b/configs/bananapi_m2_plus_h3_defconfig
> index 87fa0a9b45..fbfa273069 100644
> --- a/configs/bananapi_m2_plus_h3_defconfig
> +++ b/configs/bananapi_m2_plus_h3_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=672
> CONFIG_MACPWR="PD6"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/bananapi_m2_plus_h5_defconfig b/configs/bananapi_m2_plus_h5_defconfig
> index bff6f37e28..3bc83134b3 100644
> --- a/configs/bananapi_m2_plus_h5_defconfig
> +++ b/configs/bananapi_m2_plus_h5_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=672
> CONFIG_MACPWR="PD6"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/bananapi_m2_zero_defconfig b/configs/bananapi_m2_zero_defconfig
> index 8546674b23..933ec4db43 100644
> --- a/configs/bananapi_m2_zero_defconfig
> +++ b/configs/bananapi_m2_zero_defconfig
> @@ -5,6 +5,7 @@ CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=408
> CONFIG_MMC0_CD_PIN=""
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig
> index 0f5d531136..498b6601a5 100644
> --- a/configs/bananapi_m64_defconfig
> +++ b/configs/bananapi_m64_defconfig
> @@ -7,6 +7,7 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
> CONFIG_MMC0_CD_PIN="PH13"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig
> index 6e0266be45..2c18d36afc 100644
> --- a/configs/bcm7260_defconfig
> +++ b/configs/bcm7260_defconfig
> @@ -6,6 +6,8 @@ CONFIG_NR_DRAM_BANKS=1
> CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_BOOTDELAY=1
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};"
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="U-Boot>"
> CONFIG_EFI_PARTITION=y
> diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig
> index f22b06e9ce..c79de19919 100644
> --- a/configs/bcm7445_defconfig
> +++ b/configs/bcm7445_defconfig
> @@ -6,6 +6,8 @@ CONFIG_NR_DRAM_BANKS=3
> CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_BOOTDELAY=1
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsaveaddr};fdt addr ${fdtsaveaddr};"
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="U-Boot>"
> CONFIG_CMD_SF=y
> diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig
> index f142cde779..c89fba5b83 100644
> --- a/configs/beelink_gs1_defconfig
> +++ b/configs/beelink_gs1_defconfig
> @@ -8,6 +8,7 @@ CONFIG_MMC0_CD_PIN="PF6"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_PSCI_RESET is not set
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/beelink_x2_defconfig b/configs/beelink_x2_defconfig
> index be946956fa..7c62944e98 100644
> --- a/configs/beelink_x2_defconfig
> +++ b/configs/beelink_x2_defconfig
> @@ -3,14 +3,13 @@ CONFIG_ARCH_SUNXI=y
> CONFIG_SPL=y
> CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=567
> -CONFIG_DRAM_ZQ=3881979
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> -CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-beelink-x2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_CONSOLE_MUX=y
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-beelink-x2"
> CONFIG_SUN8I_EMAC=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig
> index 7f432e5720..14f8d769bb 100644
> --- a/configs/bitmain_antminer_s9_defconfig
> +++ b/configs/bitmain_antminer_s9_defconfig
> @@ -18,6 +18,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_SPL_STACK_R=y
> CONFIG_HUSH_PARSER=y
> diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig
> index d9e337a8a9..5d47395f5e 100644
> --- a/configs/bk4r1_defconfig
> +++ b/configs/bk4r1_defconfig
> @@ -10,6 +10,7 @@ CONFIG_TARGET_BK4R1=y
> CONFIG_FIT=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_HUSH_PARSER=y
> # CONFIG_CMD_ELF is not set
> diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
> index 5487e5517c..94b9babf5e 100644
> --- a/configs/brppt1_mmc_defconfig
> +++ b/configs/brppt1_mmc_defconfig
> @@ -19,6 +19,8 @@ CONFIG_OF_BOARD_SETUP=y
> CONFIG_BOOTDELAY=0
> CONFIG_USE_BOOTCOMMAND=y
> CONFIG_BOOTCOMMAND="run b_default"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="run cfgscr; run brdefaultip"
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
> index 5ab3f929b2..75fc6b7dcd 100644
> --- a/configs/brppt1_nand_defconfig
> +++ b/configs/brppt1_nand_defconfig
> @@ -18,6 +18,8 @@ CONFIG_OF_BOARD_SETUP=y
> CONFIG_BOOTDELAY=0
> CONFIG_USE_BOOTCOMMAND=y
> CONFIG_BOOTCOMMAND="run b_default"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="run cfgscr; run brdefaultip"
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
> index ce7c8522b1..9d629f69c5 100644
> --- a/configs/brppt1_spi_defconfig
> +++ b/configs/brppt1_spi_defconfig
> @@ -11,6 +11,7 @@ CONFIG_ENV_SIZE=0x10000
> CONFIG_ENV_OFFSET=0x20000
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_SPL=y
> +CONFIG_ENV_SECT_SIZE=0x10000
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_TPL_SYS_MALLOC_F_LEN=0x0
> @@ -21,6 +22,8 @@ CONFIG_SPI_BOOT=y
> CONFIG_BOOTDELAY=0
> CONFIG_USE_BOOTCOMMAND=y
> CONFIG_BOOTCOMMAND="run b_default"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="run cfgscr; run brdefaultip"
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> @@ -70,7 +73,6 @@ CONFIG_SPL_OF_CONTROL=y
> CONFIG_DEFAULT_DEVICE_TREE="am335x-brppt1-spi"
> CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clocks clock-names interrupt-parent interrupt-controller interrupt-cells dma-names dmas "
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> -CONFIG_ENV_SECT_SIZE=0x10000
> CONFIG_NET_RANDOM_ETHADDR=y
> CONFIG_DM=y
> CONFIG_SPL_DM=y
> diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
> index f2f10ba4bc..a4b0c45ee3 100644
> --- a/configs/brxre1_defconfig
> +++ b/configs/brxre1_defconfig
> @@ -20,6 +20,8 @@ CONFIG_OF_BOARD_SETUP=y
> CONFIG_BOOTDELAY=0
> CONFIG_USE_BOOTCOMMAND=y
> CONFIG_BOOTCOMMAND="mmc dev 1; run b_default"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="run cfgscr; run brdefaultip"
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_VERSION_VARIABLE=y
> diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
> index 1a343093c8..04bd2df282 100644
> --- a/configs/chromebit_mickey_defconfig
> +++ b/configs/chromebit_mickey_defconfig
> @@ -13,6 +13,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-mickey.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> @@ -88,6 +89,5 @@ CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
> index 7c7986e6ae..babeae6b12 100644
> --- a/configs/chromebook_jerry_defconfig
> +++ b/configs/chromebook_jerry_defconfig
> @@ -13,6 +13,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_LOG=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-jerry.dtb"
> @@ -97,6 +98,5 @@ CONFIG_VIDEO_ROCKCHIP=y
> CONFIG_DISPLAY_ROCKCHIP_EDP=y
> CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> # CONFIG_USE_PRIVATE_LIBGCC is not set
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
> index 17c1ea6453..bf43f01a9a 100644
> --- a/configs/chromebook_minnie_defconfig
> +++ b/configs/chromebook_minnie_defconfig
> @@ -13,6 +13,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-minnie.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> @@ -95,6 +96,5 @@ CONFIG_VIDEO_ROCKCHIP=y
> CONFIG_DISPLAY_ROCKCHIP_EDP=y
> CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> CONFIG_CONSOLE_SCROLL_LINES=10
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/chromebook_speedy_defconfig b/configs/chromebook_speedy_defconfig
> index 0cc1eb6a0b..f6e7c59b90 100644
> --- a/configs/chromebook_speedy_defconfig
> +++ b/configs/chromebook_speedy_defconfig
> @@ -13,6 +13,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-speedy.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> @@ -94,7 +95,6 @@ CONFIG_VIDEO_ROCKCHIP=y
> CONFIG_DISPLAY_ROCKCHIP_EDP=y
> CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> # CONFIG_USE_PRIVATE_LIBGCC is not set
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> # CONFIG_SPL_OF_LIBFDT is not set
> diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
> index b7b886be4f..280c981a36 100644
> --- a/configs/clearfog_defconfig
> +++ b/configs/clearfog_defconfig
> @@ -18,6 +18,7 @@ CONFIG_DEBUG_UART=y
> CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig
> index 2f919b597d..a4f6f096fb 100644
> --- a/configs/clearfog_gt_8k_defconfig
> +++ b/configs/clearfog_gt_8k_defconfig
> @@ -11,6 +11,7 @@ CONFIG_DEBUG_UART=y
> CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
> index 002db24b04..6f4fe45760 100644
> --- a/configs/cm_fx6_defconfig
> +++ b/configs/cm_fx6_defconfig
> @@ -18,6 +18,8 @@ CONFIG_OF_BOARD_SETUP=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
> CONFIG_BOOTDELAY=3
> CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run legacy_bootcmd"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start;sf probe"
> CONFIG_MISC_INIT_R=y
> CONFIG_BOUNCE_BUFFER=y
> CONFIG_SPL_TEXT_BASE=0x00908000
> diff --git a/configs/colorfly_e708_q1_defconfig b/configs/colorfly_e708_q1_defconfig
> index c9d5d4d510..45653089f1 100644
> --- a/configs/colorfly_e708_q1_defconfig
> +++ b/configs/colorfly_e708_q1_defconfig
> @@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_BL_EN="PA25"
> CONFIG_VIDEO_LCD_BL_PWM="PH13"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
> index 7229893c24..3e193edef3 100644
> --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
> +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
> @@ -22,6 +22,7 @@ CONFIG_BOOTSTAGE_REPORT=y
> CONFIG_SHOW_BOOT_PROGRESS=y
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="root=/dev/sda2 ro quiet"
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_LAST_STAGE_INIT=y
> diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
> index dd10170cf7..2e71156b84 100644
> --- a/configs/conga-qeval20-qa3-e3845_defconfig
> +++ b/configs/conga-qeval20-qa3-e3845_defconfig
> @@ -18,6 +18,7 @@ CONFIG_BOOTSTAGE_REPORT=y
> CONFIG_SHOW_BOOT_PROGRESS=y
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="root=/dev/sda2 ro quiet"
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_LAST_STAGE_INIT=y
> diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig
> index 326668d742..93abad2a81 100644
> --- a/configs/controlcenterdc_defconfig
> +++ b/configs/controlcenterdc_defconfig
> @@ -16,6 +16,7 @@ CONFIG_AHCI=y
> CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_LAST_STAGE_INIT=y
> diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig
> index df77cb89ca..c5e2d890cd 100644
> --- a/configs/crs305-1g-4s_defconfig
> +++ b/configs/crs305-1g-4s_defconfig
> @@ -4,10 +4,11 @@ CONFIG_SYS_TEXT_BASE=0x00800000
> CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_TARGET_CRS305_1G_4S=y
> CONFIG_BUILD_TARGET="u-boot.kwb"
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> +CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_MEMTEST=y
> CONFIG_SYS_ALT_MEMTEST=y
> -CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_I2C=y
> CONFIG_CMD_SF=y
> diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
> index 845565d620..2723c56068 100644
> --- a/configs/d2net_v2_defconfig
> +++ b/configs/d2net_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
> CONFIG_BOOTDELAY=3
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200"
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig
> index c1a430cf3b..a2d27efd80 100644
> --- a/configs/db-88f6720_defconfig
> +++ b/configs/db-88f6720_defconfig
> @@ -15,6 +15,7 @@ CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_DEBUG_UART=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig
> index d55dfc095f..38d519237f 100644
> --- a/configs/db-88f6820-amc_defconfig
> +++ b/configs/db-88f6820-amc_defconfig
> @@ -16,6 +16,7 @@ CONFIG_DEBUG_UART=y
> CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
> index b8f036e317..f54538ab11 100644
> --- a/configs/db-88f6820-gp_defconfig
> +++ b/configs/db-88f6820-gp_defconfig
> @@ -15,6 +15,7 @@ CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_DEBUG_UART=y
> CONFIG_AHCI=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
> index 65995b2b5c..5654fd7b44 100644
> --- a/configs/db-mv784mp-gp_defconfig
> +++ b/configs/db-mv784mp-gp_defconfig
> @@ -15,6 +15,7 @@ CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_DEBUG_UART=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/db-xc3-24g4xg_defconfig b/configs/db-xc3-24g4xg_defconfig
> index 071a889cd3..3a311ebdf2 100644
> --- a/configs/db-xc3-24g4xg_defconfig
> +++ b/configs/db-xc3-24g4xg_defconfig
> @@ -7,6 +7,7 @@ CONFIG_BUILD_TARGET="u-boot.kwb"
> CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_FIT_BEST_MATCH=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_CMD_MEMTEST=y
> CONFIG_SYS_ALT_MEMTEST=y
> diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
> index de701b59f7..13c58831f4 100644
> --- a/configs/dfi-bt700-q7x-151_defconfig
> +++ b/configs/dfi-bt700-q7x-151_defconfig
> @@ -17,6 +17,7 @@ CONFIG_BOOTSTAGE_REPORT=y
> CONFIG_SHOW_BOOT_PROGRESS=y
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="root=/dev/sda1 ro quiet"
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_LAST_STAGE_INIT=y
> diff --git a/configs/difrnce_dit4350_defconfig b/configs/difrnce_dit4350_defconfig
> index 3600863eca..7e28dec718 100644
> --- a/configs/difrnce_dit4350_defconfig
> +++ b/configs/difrnce_dit4350_defconfig
> @@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
> index aca8abbe9c..6dec69d73a 100644
> --- a/configs/dns325_defconfig
> +++ b/configs/dns325_defconfig
> @@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nD-Link DNS-325"
> # CONFIG_SYS_MALLOC_F is not set
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_HUSH_PARSER=y
> diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
> index 679c18236f..70fbb3660a 100644
> --- a/configs/dockstar_defconfig
> +++ b/configs/dockstar_defconfig
> @@ -6,6 +6,7 @@ CONFIG_TARGET_DOCKSTAR=y
> CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_SYS_PROMPT="DockStar> "
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/draco_defconfig b/configs/draco_defconfig
> index d23ca8a4c6..d6b2b4a42b 100644
> --- a/configs/draco_defconfig
> +++ b/configs/draco_defconfig
> @@ -19,6 +19,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_ARCH_MISC_INIT=y
> diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
> index e148208f99..5762c70a4a 100644
> --- a/configs/dreamplug_defconfig
> +++ b/configs/dreamplug_defconfig
> @@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nMarvell-DreamPlug"
> # CONFIG_SYS_MALLOC_F is not set
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_HUSH_PARSER=y
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
> index 671572b976..a22c067a3e 100644
> --- a/configs/ds109_defconfig
> +++ b/configs/ds109_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
> CONFIG_TARGET_DS109=y
> CONFIG_NR_DRAM_BANKS=2
> # CONFIG_SYS_MALLOC_F is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_HUSH_PARSER=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_CMD_IDE=y
> diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig
> index 9abfae5b6b..3f8c1773c4 100644
> --- a/configs/ds414_defconfig
> +++ b/configs/ds414_defconfig
> @@ -16,6 +16,8 @@ CONFIG_DEBUG_UART=y
> CONFIG_BOOTDELAY=3
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start; sf probe"
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_SPL_TEXT_BASE=0x40004030
> diff --git a/configs/dserve_dsrv9703c_defconfig b/configs/dserve_dsrv9703c_defconfig
> index 0a192a090a..c664bf5684 100644
> --- a/configs/dserve_dsrv9703c_defconfig
> +++ b/configs/dserve_dsrv9703c_defconfig
> @@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/emlid_neutis_n5_devboard_defconfig b/configs/emlid_neutis_n5_devboard_defconfig
> index c1307aa1c5..e85287e3ec 100644
> --- a/configs/emlid_neutis_n5_devboard_defconfig
> +++ b/configs/emlid_neutis_n5_devboard_defconfig
> @@ -8,6 +8,7 @@ CONFIG_DRAM_ZQ=3881977
> # CONFIG_DRAM_ODT_EN is not set
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
> index aded18fb77..cec52592ef 100644
> --- a/configs/etamin_defconfig
> +++ b/configs/etamin_defconfig
> @@ -20,6 +20,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_ARCH_MISC_INIT=y
> diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
> index 5e6bb54551..167cdd9758 100644
> --- a/configs/evb-rk3036_defconfig
> +++ b/configs/evb-rk3036_defconfig
> @@ -13,6 +13,7 @@ CONFIG_DEBUG_UART_BASE=0x20068000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_DEFAULT_FDT_FILE="rk3036-evb.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
> index 31c1b1719c..f910be6348 100644
> --- a/configs/evb-rk3229_defconfig
> +++ b/configs/evb-rk3229_defconfig
> @@ -17,12 +17,12 @@ CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_LOAD_FIT=y
> CONFIG_SPL_FIT_SOURCE="arch/arm/mach-rockchip/fit_spl_optee.its"
> +CONFIG_USE_PREBOOT=y
> CONFIG_DEFAULT_FDT_FILE="rk3229-evb.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_SPL_TEXT_BASE=0x60000000
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
> CONFIG_SPL_OPTEE=y
> @@ -71,6 +71,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_FUNCTION_MASS_STORAGE=y
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_TPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
> index 843c59d30d..144634d386 100644
> --- a/configs/evb-rk3288_defconfig
> +++ b/configs/evb-rk3288_defconfig
> @@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-evb-rk808.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> @@ -83,6 +84,5 @@ CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> CONFIG_VIDEO_ROCKCHIP_MAX_YRES=1200
> CONFIG_DISPLAY_ROCKCHIP_MIPI=y
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
> index 6dfaff50ff..536b3eab84 100644
> --- a/configs/fennec-rk3288_defconfig
> +++ b/configs/fennec-rk3288_defconfig
> @@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_CONSOLE_MUX=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-fennec.dtb"
> @@ -80,6 +81,5 @@ CONFIG_USB_FUNCTION_MASS_STORAGE=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
> index 4cedb28d22..cb8e90ae51 100644
> --- a/configs/firefly-rk3288_defconfig
> +++ b/configs/firefly-rk3288_defconfig
> @@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-firefly.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> @@ -90,6 +91,5 @@ CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> CONFIG_CONSOLE_SCROLL_LINES=10
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig
> index d8eceac37a..b82325dfe8 100644
> --- a/configs/ga10h_v1_1_defconfig
> +++ b/configs/ga10h_v1_1_defconfig
> @@ -17,6 +17,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
> index b5d31db322..5984bee1ae 100644
> --- a/configs/goflexhome_defconfig
> +++ b/configs/goflexhome_defconfig
> @@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nSeagate GoFlex Home"
> # CONFIG_SYS_MALLOC_F is not set
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_SYS_PROMPT="GoFlexHome> "
> diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig
> index fe2e00a0b6..d0c1abf080 100644
> --- a/configs/gplugd_defconfig
> +++ b/configs/gplugd_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x00f00000
> CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nMarvell-gplugD"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_BOARD_EARLY_INIT_F=y
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/gt90h_v4_defconfig b/configs/gt90h_v4_defconfig
> index 1cbee126e7..b317d4d1d7 100644
> --- a/configs/gt90h_v4_defconfig
> +++ b/configs/gt90h_v4_defconfig
> @@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
> index 787ba6c87a..c1827a16f2 100644
> --- a/configs/guruplug_defconfig
> +++ b/configs/guruplug_defconfig
> @@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nMarvell-GuruPlug"
> # CONFIG_SYS_MALLOC_F is not set
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
> index 19aa73f765..70b663a526 100644
> --- a/configs/gwventana_emmc_defconfig
> +++ b/configs/gwventana_emmc_defconfig
> @@ -18,6 +18,7 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
> index 1461cb175a..96acfff385 100644
> --- a/configs/gwventana_gw5904_defconfig
> +++ b/configs/gwventana_gw5904_defconfig
> @@ -18,6 +18,7 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
> index f440363d6f..e511fd3cb3 100644
> --- a/configs/gwventana_nand_defconfig
> +++ b/configs/gwventana_nand_defconfig
> @@ -18,6 +18,7 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/h8_homlet_v2_defconfig b/configs/h8_homlet_v2_defconfig
> index c1144c4094..70c566da6a 100644
> --- a/configs/h8_homlet_v2_defconfig
> +++ b/configs/h8_homlet_v2_defconfig
> @@ -10,6 +10,7 @@ CONFIG_USB0_VBUS_PIN="PL5"
> CONFIG_USB1_VBUS_PIN="PL6"
> CONFIG_AXP_GPIO=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
> index 3b1737b385..9710c3af72 100644
> --- a/configs/helios4_defconfig
> +++ b/configs/helios4_defconfig
> @@ -15,6 +15,7 @@ CONFIG_DEBUG_UART=y
> CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig
> index abb409d23e..6afd64733d 100644
> --- a/configs/hrcon_defconfig
> +++ b/configs/hrcon_defconfig
> @@ -100,6 +100,7 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_BOOTDELAY=5
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_BOARD_EARLY_INIT_F=y
> diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig
> index 6f221a3366..544a98c504 100644
> --- a/configs/hrcon_dh_defconfig
> +++ b/configs/hrcon_dh_defconfig
> @@ -101,6 +101,7 @@ CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_SYS_EXTRA_OPTIONS="HRCON_DH"
> CONFIG_BOOTDELAY=5
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_BOARD_EARLY_INIT_F=y
> diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
> index 629aea90eb..c512d36ba0 100644
> --- a/configs/i12-tvbox_defconfig
> +++ b/configs/i12-tvbox_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=384
> CONFIG_MACPWR="PH21"
> CONFIG_VIDEO_COMPOSITE=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig
> index f7b2e4ff0d..6c047ca98b 100644
> --- a/configs/iNet_3F_defconfig
> +++ b/configs/iNet_3F_defconfig
> @@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig
> index 38d80482e9..3b4ffe494b 100644
> --- a/configs/iNet_3W_defconfig
> +++ b/configs/iNet_3W_defconfig
> @@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
> CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig
> index 71442226a3..5fff4ad585 100644
> --- a/configs/iNet_86VS_defconfig
> +++ b/configs/iNet_86VS_defconfig
> @@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/iNet_D978_rev2_defconfig b/configs/iNet_D978_rev2_defconfig
> index c3fc0b290c..d36c3eec7d 100644
> --- a/configs/iNet_D978_rev2_defconfig
> +++ b/configs/iNet_D978_rev2_defconfig
> @@ -17,6 +17,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
> index 979f724d85..4998db3669 100644
> --- a/configs/ib62x0_defconfig
> +++ b/configs/ib62x0_defconfig
> @@ -6,6 +6,7 @@ CONFIG_TARGET_IB62X0=y
> CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="ib62x0 => "
> diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig
> index b745dac738..1372c7606c 100644
> --- a/configs/icnova-a20-swac_defconfig
> +++ b/configs/icnova-a20-swac_defconfig
> @@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:209,up:22,lo
> CONFIG_VIDEO_LCD_POWER="PH22"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> CONFIG_CMD_UNZIP=y
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
> index eb0e8a9c88..53ba459965 100644
> --- a/configs/iconnect_defconfig
> +++ b/configs/iconnect_defconfig
> @@ -6,6 +6,7 @@ CONFIG_TARGET_ICONNECT=y
> CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING=" Iomega iConnect"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_SYS_PROMPT="iconnect => "
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
> index 31ed63c000..418a4b3706 100644
> --- a/configs/ids8313_defconfig
> +++ b/configs/ids8313_defconfig
> @@ -121,6 +121,8 @@ CONFIG_LEGACY_IMAGE_FORMAT=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_BOOTDELAY=1
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="echo;echo Type \"run nfsboot\" to mount root filesystem over NFS;echo"
> CONFIG_MISC_INIT_R=y
> CONFIG_VERSION_VARIABLE=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/inet1_defconfig b/configs/inet1_defconfig
> index 831b5d0041..3cb6664157 100644
> --- a/configs/inet1_defconfig
> +++ b/configs/inet1_defconfig
> @@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/inet86dz_defconfig b/configs/inet86dz_defconfig
> index 77da929584..9038811eac 100644
> --- a/configs/inet86dz_defconfig
> +++ b/configs/inet86dz_defconfig
> @@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/inet97fv2_defconfig b/configs/inet97fv2_defconfig
> index a5e4c6a9db..2b43142bc6 100644
> --- a/configs/inet97fv2_defconfig
> +++ b/configs/inet97fv2_defconfig
> @@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
> CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/inet98v_rev2_defconfig b/configs/inet98v_rev2_defconfig
> index d96250d23f..76baeec5f2 100644
> --- a/configs/inet98v_rev2_defconfig
> +++ b/configs/inet98v_rev2_defconfig
> @@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/inet9f_rev03_defconfig b/configs/inet9f_rev03_defconfig
> index c19c10fba7..771dc1fadf 100644
> --- a/configs/inet9f_rev03_defconfig
> +++ b/configs/inet9f_rev03_defconfig
> @@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_POWER="PH8"
> CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/inet_q972_defconfig b/configs/inet_q972_defconfig
> index 66c7628a0d..4b26a926a6 100644
> --- a/configs/inet_q972_defconfig
> +++ b/configs/inet_q972_defconfig
> @@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
> CONFIG_VIDEO_LCD_BL_EN="PA25"
> CONFIG_VIDEO_LCD_BL_PWM="PH13"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
> index 53898a15c5..daf6662abf 100644
> --- a/configs/inetspace_v2_defconfig
> +++ b/configs/inetspace_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
> CONFIG_BOOTDELAY=3
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200"
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig
> index 974e63c61d..ab4a2718de 100644
> --- a/configs/jesurun_q5_defconfig
> +++ b/configs/jesurun_q5_defconfig
> @@ -8,6 +8,7 @@ CONFIG_MACPWR="PH19"
> CONFIG_USB0_VBUS_PIN="PB9"
> CONFIG_VIDEO_COMPOSITE=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
> index 921af0d476..c343198fad 100644
> --- a/configs/kylin-rk3036_defconfig
> +++ b/configs/kylin-rk3036_defconfig
> @@ -13,6 +13,7 @@ CONFIG_DEBUG_UART_BASE=0x20068000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_DEFAULT_FDT_FILE="rk3036-kylin.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig
> index 55785a3559..f4f7b068a1 100644
> --- a/configs/libretech-ac_defconfig
> +++ b/configs/libretech-ac_defconfig
> @@ -9,6 +9,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_IDENT_STRING=" libretech-ac"
> CONFIG_DEBUG_UART=y
> CONFIG_OF_BOARD_SETUP=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start"
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/libretech_all_h3_cc_h2_plus_defconfig b/configs/libretech_all_h3_cc_h2_plus_defconfig
> index 7d42356993..d9c9b6de47 100644
> --- a/configs/libretech_all_h3_cc_h2_plus_defconfig
> +++ b/configs/libretech_all_h3_cc_h2_plus_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=672
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/libretech_all_h3_cc_h3_defconfig b/configs/libretech_all_h3_cc_h3_defconfig
> index 7ef0000cd5..e99dc5c172 100644
> --- a/configs/libretech_all_h3_cc_h3_defconfig
> +++ b/configs/libretech_all_h3_cc_h3_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=672
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/libretech_all_h3_cc_h5_defconfig b/configs/libretech_all_h3_cc_h5_defconfig
> index 1e22469022..088246d60b 100644
> --- a/configs/libretech_all_h3_cc_h5_defconfig
> +++ b/configs/libretech_all_h3_cc_h5_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN50I_H5=y
> CONFIG_DRAM_CLK=672
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
> index cb1538a3ea..010beaebdb 100644
> --- a/configs/lschlv2_defconfig
> +++ b/configs/lschlv2_defconfig
> @@ -13,6 +13,7 @@ CONFIG_BOOTDELAY=3
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2"
> CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}"
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_MISC_INIT_R=y
> diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
> index 9d12ef9bd6..1223d7131a 100644
> --- a/configs/lsxhl_defconfig
> +++ b/configs/lsxhl_defconfig
> @@ -13,6 +13,7 @@ CONFIG_BOOTDELAY=3
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2"
> CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}"
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_MISC_INIT_R=y
> diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
> index 3a5fa26bcd..fa2e67d2a8 100644
> --- a/configs/m53menlo_defconfig
> +++ b/configs/m53menlo_defconfig
> @@ -18,6 +18,8 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/menlo/m53menlo/imximage.cfg"
> CONFIG_BOOTDELAY=1
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttymxc0,115200"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="run try_bootscript"
> CONFIG_VERSION_VARIABLE=y
> CONFIG_BOARD_LATE_INIT=y
> CONFIG_SPL_TEXT_BASE=0x70008000
> diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
> index 0d4b6264e9..581e5bf756 100644
> --- a/configs/maxbcm_defconfig
> +++ b/configs/maxbcm_defconfig
> @@ -14,6 +14,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_DEBUG_UART=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig
> index 0bef67e8cd..479466286f 100644
> --- a/configs/meesc_dataflash_defconfig
> +++ b/configs/meesc_dataflash_defconfig
> @@ -6,9 +6,11 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_ENV_SIZE=0x4200
> CONFIG_ENV_OFFSET=0x4200
> CONFIG_NR_DRAM_BANKS=1
> +CONFIG_ENV_SECT_SIZE=0x210
> CONFIG_FIT=y
> CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_MISC_INIT_R=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_HUSH_PARSER=y
> @@ -24,7 +26,6 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_USE_ENV_SPI_MAX_HZ=y
> CONFIG_ENV_SPI_MAX_HZ=15000000
> -CONFIG_ENV_SECT_SIZE=0x210
> CONFIG_DM=y
> CONFIG_CLK=y
> CONFIG_CLK_AT91=y
> diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig
> index 970e8b8052..74426677d4 100644
> --- a/configs/meesc_defconfig
> +++ b/configs/meesc_defconfig
> @@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1
> CONFIG_FIT=y
> CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_MISC_INIT_R=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_HUSH_PARSER=y
> diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
> index e8756267b0..94b9c78a6c 100644
> --- a/configs/microblaze-generic_defconfig
> +++ b/configs/microblaze-generic_defconfig
> @@ -15,6 +15,8 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_BOOTDELAY=-1
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="root=romfs"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="echo U-BOOT for ${hostname};setenv preboot;echo"
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_DISPLAY_BOARDINFO=y
> CONFIG_SPL_BOARD_INIT=y
> diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
> index 936192f547..335b960fba 100644
> --- a/configs/miqi-rk3288_defconfig
> +++ b/configs/miqi-rk3288_defconfig
> @@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-miqi.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> @@ -85,6 +86,5 @@ CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> CONFIG_CONSOLE_SCROLL_LINES=10
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig
> index 4dce096d69..04d2426361 100644
> --- a/configs/mixtile_loftq_defconfig
> +++ b/configs/mixtile_loftq_defconfig
> @@ -9,6 +9,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> CONFIG_USB1_VBUS_PIN="PH24"
> CONFIG_USB2_VBUS_PIN=""
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig
> index 48659dbb09..396879015e 100644
> --- a/configs/mk802_a10s_defconfig
> +++ b/configs/mk802_a10s_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=432
> CONFIG_DRAM_EMR1=0
> CONFIG_USB1_VBUS_PIN="PB10"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig
> index 58986e3d9c..416cb9a9c2 100644
> --- a/configs/mk802_defconfig
> +++ b/configs/mk802_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SPL=y
> CONFIG_MACH_SUN4I=y
> CONFIG_USB2_VBUS_PIN="PH12"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig
> index 243a19500c..221c2bc88b 100644
> --- a/configs/mk802ii_defconfig
> +++ b/configs/mk802ii_defconfig
> @@ -4,6 +4,7 @@ CONFIG_NR_DRAM_BANKS=1
> CONFIG_SPL=y
> CONFIG_MACH_SUN4I=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig
> index 209349bf64..900c98de35 100644
> --- a/configs/mvebu_db-88f3720_defconfig
> +++ b/configs/mvebu_db-88f3720_defconfig
> @@ -10,6 +10,7 @@ CONFIG_DEBUG_UART=y
> CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig
> index 7697d7552c..875db3b40b 100644
> --- a/configs/mvebu_db_armada8k_defconfig
> +++ b/configs/mvebu_db_armada8k_defconfig
> @@ -11,6 +11,7 @@ CONFIG_DEBUG_UART=y
> CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig
> index cdfa091efc..2d834e5170 100644
> --- a/configs/mvebu_espressobin-88f3720_defconfig
> +++ b/configs/mvebu_espressobin-88f3720_defconfig
> @@ -10,6 +10,7 @@ CONFIG_DEBUG_UART=y
> CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig
> index 39a49d5bf9..6b05522870 100644
> --- a/configs/mvebu_mcbin-88f8040_defconfig
> +++ b/configs/mvebu_mcbin-88f8040_defconfig
> @@ -10,6 +10,7 @@ CONFIG_DEBUG_UART=y
> CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
> index 42b37af0dc..d30687a56f 100644
> --- a/configs/mx51evk_defconfig
> +++ b/configs/mx51evk_defconfig
> @@ -5,6 +5,7 @@ CONFIG_TARGET_MX51EVK=y
> CONFIG_NR_DRAM_BANKS=1
> # CONFIG_CMD_BMODE is not set
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg"
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CONSOLE_MUX is not set
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig
> index e57d0dfc67..4ed38250f3 100644
> --- a/configs/mx53cx9020_defconfig
> +++ b/configs/mx53cx9020_defconfig
> @@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=2
> # CONFIG_CMD_BMODE is not set
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beckhoff/mx53cx9020/imximage.cfg"
> CONFIG_BOOTDELAY=1
> +CONFIG_USE_PREBOOT=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig
> index 2c76b83d5e..b4c3b0e315 100644
> --- a/configs/mx53loco_defconfig
> +++ b/configs/mx53loco_defconfig
> @@ -5,6 +5,7 @@ CONFIG_TARGET_MX53LOCO=y
> CONFIG_NR_DRAM_BANKS=2
> # CONFIG_CMD_BMODE is not set
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg"
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CONSOLE_MUX is not set
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
> index cc2ed9af9c..9fc443c386 100644
> --- a/configs/mx6cuboxi_defconfig
> +++ b/configs/mx6cuboxi_defconfig
> @@ -15,6 +15,8 @@ CONFIG_CMD_HDMIDETECT=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
> CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="if hdmidet; then usb start; setenv stdin serial,usbkbd; setenv stdout serial,vga; setenv stderr serial,vga; else setenv stdin serial; setenv stdout serial; setenv stderr serial; fi;"
> CONFIG_BOUNCE_BUFFER=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_SPL_TEXT_BASE=0x00908000
> diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
> index 0d402f2196..65e9c4f117 100644
> --- a/configs/mx6qsabrelite_defconfig
> +++ b/configs/mx6qsabrelite_defconfig
> @@ -8,6 +8,7 @@ CONFIG_DISTRO_DEFAULTS=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
> CONFIG_BOOTDELAY=3
> # CONFIG_USE_BOOTCOMMAND is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_MISC_INIT_R=y
> CONFIG_BOUNCE_BUFFER=y
> diff --git a/configs/nanopi_a64_defconfig b/configs/nanopi_a64_defconfig
> index eb031e661f..95a9c965f7 100644
> --- a/configs/nanopi_a64_defconfig
> +++ b/configs/nanopi_a64_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SPL=y
> CONFIG_MACH_SUN50I=y
> CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/nanopi_m1_defconfig b/configs/nanopi_m1_defconfig
> index f021d87190..7568fb1b4b 100644
> --- a/configs/nanopi_m1_defconfig
> +++ b/configs/nanopi_m1_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SPL=y
> CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=408
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/nanopi_m1_plus_defconfig b/configs/nanopi_m1_plus_defconfig
> index c676579e54..a359de8069 100644
> --- a/configs/nanopi_m1_plus_defconfig
> +++ b/configs/nanopi_m1_plus_defconfig
> @@ -8,6 +8,7 @@ CONFIG_MACPWR="PD6"
> CONFIG_MMC0_CD_PIN="PH13"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/nanopi_neo2_defconfig b/configs/nanopi_neo2_defconfig
> index 984d9ddb84..cfda325442 100644
> --- a/configs/nanopi_neo2_defconfig
> +++ b/configs/nanopi_neo2_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=672
> CONFIG_DRAM_ZQ=3881977
> # CONFIG_DRAM_ODT_EN is not set
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig
> index bba31fc1bc..246658b699 100644
> --- a/configs/nanopi_neo_air_defconfig
> +++ b/configs/nanopi_neo_air_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=408
> # CONFIG_VIDEO_DE2 is not set
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/nanopi_neo_defconfig b/configs/nanopi_neo_defconfig
> index af36ad43af..fba6ff516d 100644
> --- a/configs/nanopi_neo_defconfig
> +++ b/configs/nanopi_neo_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=408
> # CONFIG_VIDEO_DE2 is not set
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
> index 3aa9ceaa6a..5f78a8b63a 100644
> --- a/configs/nanopi_neo_plus2_defconfig
> +++ b/configs/nanopi_neo_plus2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_DRAM_ZQ=3881977
> CONFIG_MACPWR="PD6"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
> index 80b122d74f..4672e78c3f 100644
> --- a/configs/nas220_defconfig
> +++ b/configs/nas220_defconfig
> @@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nNAS 220"
> # CONFIG_SYS_MALLOC_F is not set
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="nas220> "
> diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
> index 9ae774a0ec..e5dd072347 100644
> --- a/configs/net2big_v2_defconfig
> +++ b/configs/net2big_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
> CONFIG_BOOTDELAY=3
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200"
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
> index 6611046803..3d2a95a0e7 100644
> --- a/configs/netspace_lite_v2_defconfig
> +++ b/configs/netspace_lite_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
> CONFIG_BOOTDELAY=3
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200"
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
> index 41eeab8ad1..5fc9e94a4d 100644
> --- a/configs/netspace_max_v2_defconfig
> +++ b/configs/netspace_max_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
> CONFIG_BOOTDELAY=3
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200"
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
> index fd56ae0dc2..c6460dd324 100644
> --- a/configs/netspace_mini_v2_defconfig
> +++ b/configs/netspace_mini_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
> CONFIG_BOOTDELAY=3
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200"
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
> index ffb60dabcf..6427c79215 100644
> --- a/configs/netspace_v2_defconfig
> +++ b/configs/netspace_v2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
> CONFIG_BOOTDELAY=3
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200"
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
> index 015675b377..c50e79aba8 100644
> --- a/configs/nitrogen6dl2g_defconfig
> +++ b/configs/nitrogen6dl2g_defconfig
> @@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
> CONFIG_CMD_HDMIDETECT=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
> index ee353f2f29..85a8a8d708 100644
> --- a/configs/nitrogen6dl_defconfig
> +++ b/configs/nitrogen6dl_defconfig
> @@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
> CONFIG_CMD_HDMIDETECT=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
> index ebd9bf8dee..5a2df361fd 100644
> --- a/configs/nitrogen6q2g_defconfig
> +++ b/configs/nitrogen6q2g_defconfig
> @@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
> CONFIG_CMD_HDMIDETECT=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
> index d324282ea5..fdc0f2b03f 100644
> --- a/configs/nitrogen6q_defconfig
> +++ b/configs/nitrogen6q_defconfig
> @@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
> CONFIG_CMD_HDMIDETECT=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
> index b26bce4923..230b12f7e6 100644
> --- a/configs/nitrogen6s1g_defconfig
> +++ b/configs/nitrogen6s1g_defconfig
> @@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
> CONFIG_CMD_HDMIDETECT=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
> index a2fb07f9b2..72e590a4fe 100644
> --- a/configs/nitrogen6s_defconfig
> +++ b/configs/nitrogen6s_defconfig
> @@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1
> CONFIG_CMD_HDMIDETECT=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
> index fe2ecf6c94..5cd96017e5 100644
> --- a/configs/nokia_rx51_defconfig
> +++ b/configs/nokia_rx51_defconfig
> @@ -5,6 +5,8 @@ CONFIG_SYS_TEXT_BASE=0x80008000
> CONFIG_TARGET_NOKIA_RX51=y
> CONFIG_NR_DRAM_BANKS=2
> CONFIG_BOOTDELAY=30
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="setenv mmcnum 1; setenv mmcpart 1;setenv mmcscriptfile bootmenu.scr;if run switchmmc; then setenv mmcdone true;setenv mmctype fat;if run scriptload; then true; else setenv mmctype ext2;if run scriptload; then true; else setenv mmctype ext4;if run scriptload; then true; else setenv mmcdone false;fi;fi;fi;if ${mmcdone}; then run scriptboot;fi;fi;if run slide; then true; else setenv bootmenu_delay 0;setenv bootdelay 0;fi"
> # CONFIG_CONSOLE_MUX is not set
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_HUSH_PARSER=y
> diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
> index a428d76129..d74149e3c5 100644
> --- a/configs/nsa310s_defconfig
> +++ b/configs/nsa310s_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x600000
> CONFIG_TARGET_NSA310S=y
> CONFIG_NR_DRAM_BANKS=2
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_HUSH_PARSER=y
> CONFIG_SYS_PROMPT="nsa310s => "
> diff --git a/configs/oceanic_5205_5inmfd_defconfig b/configs/oceanic_5205_5inmfd_defconfig
> index 219de7ae50..23a181335b 100644
> --- a/configs/oceanic_5205_5inmfd_defconfig
> +++ b/configs/oceanic_5205_5inmfd_defconfig
> @@ -10,6 +10,7 @@ CONFIG_DRAM_ZQ=3881949
> CONFIG_MMC0_CD_PIN=""
> CONFIG_SPL_SPI_SUNXI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
> index 3a529e8836..66736d065a 100644
> --- a/configs/omap35_logic_defconfig
> +++ b/configs/omap35_logic_defconfig
> @@ -12,6 +12,8 @@ CONFIG_SPL=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_ANDROID_BOOT_IMAGE=y
> # CONFIG_USE_BOOTCOMMAND is not set
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="setenv preboot;saveenv;"
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DEFAULT_FDT_FILE="logicpd-torpedo-35xx-devkit.dtb"
> CONFIG_VERSION_VARIABLE=y
> diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
> index fb7e7146b2..8ed962c255 100644
> --- a/configs/omap35_logic_somlv_defconfig
> +++ b/configs/omap35_logic_somlv_defconfig
> @@ -12,6 +12,8 @@ CONFIG_SPL=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_ANDROID_BOOT_IMAGE=y
> # CONFIG_USE_BOOTCOMMAND is not set
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="setenv preboot;saveenv;"
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DEFAULT_FDT_FILE="logicpd-som-lv-35xx-devkit.dtb"
> CONFIG_VERSION_VARIABLE=y
> diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
> index b389d1d3c5..4a2bbdc339 100644
> --- a/configs/omap3_beagle_defconfig
> +++ b/configs/omap3_beagle_defconfig
> @@ -10,6 +10,8 @@ CONFIG_SPL=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_TPL_SYS_MALLOC_F_LEN=0x400
> CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start"
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DEFAULT_FDT_FILE="omap3-beagle.dtb"
> CONFIG_VERSION_VARIABLE=y
> diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
> index 26d0e65589..8b1719280b 100644
> --- a/configs/omap3_evm_defconfig
> +++ b/configs/omap3_evm_defconfig
> @@ -9,6 +9,7 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_SPL=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_TPL_SYS_MALLOC_F_LEN=0x400
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb"
> CONFIG_VERSION_VARIABLE=y
> diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
> index 0868e33131..b747f147ab 100644
> --- a/configs/omap3_logic_defconfig
> +++ b/configs/omap3_logic_defconfig
> @@ -12,6 +12,8 @@ CONFIG_SPL=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_ANDROID_BOOT_IMAGE=y
> # CONFIG_USE_BOOTCOMMAND is not set
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="setenv preboot;saveenv;"
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_VERSION_VARIABLE=y
> CONFIG_SPL_TEXT_BASE=0x40200000
> diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
> index f8dd7f37df..d93ec395d0 100644
> --- a/configs/omap3_logic_somlv_defconfig
> +++ b/configs/omap3_logic_somlv_defconfig
> @@ -12,6 +12,8 @@ CONFIG_SPL=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_ANDROID_BOOT_IMAGE=y
> # CONFIG_USE_BOOTCOMMAND is not set
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="setenv preboot;saveenv;"
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DEFAULT_FDT_FILE="logicpd-som-lv-37xx-devkit.dtb"
> CONFIG_VERSION_VARIABLE=y
> diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
> index 23521b295f..2b9fd16182 100644
> --- a/configs/openrd_base_defconfig
> +++ b/configs/openrd_base_defconfig
> @@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nOpenRD-Base"
> CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_LOGLEVEL=2
> # CONFIG_DISPLAY_BOARDINFO is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
> index ea53231555..4e9a99f7ba 100644
> --- a/configs/openrd_client_defconfig
> +++ b/configs/openrd_client_defconfig
> @@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nOpenRD-Client"
> CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_LOGLEVEL=2
> # CONFIG_DISPLAY_BOARDINFO is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
> index 589e248bbd..aeae24b1f5 100644
> --- a/configs/openrd_ultimate_defconfig
> +++ b/configs/openrd_ultimate_defconfig
> @@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nOpenRD-Ultimate"
> CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_LOGLEVEL=2
> # CONFIG_DISPLAY_BOARDINFO is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig
> index 4f8bc289bd..14e15b03b2 100644
> --- a/configs/opos6uldev_defconfig
> +++ b/configs/opos6uldev_defconfig
> @@ -16,6 +16,8 @@ CONFIG_TPL_SYS_MALLOC_F_LEN=0x400
> CONFIG_BOOTDELAY=5
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttymxc0,115200"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="run check_env"
> # CONFIG_CONSOLE_MUX is not set
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_SUPPORT_RAW_INITRD=y
> diff --git a/configs/orangepi_2_defconfig b/configs/orangepi_2_defconfig
> index a561a117d4..664b4b3541 100644
> --- a/configs/orangepi_2_defconfig
> +++ b/configs/orangepi_2_defconfig
> @@ -7,6 +7,7 @@ CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=672
> CONFIG_USB1_VBUS_PIN="PG13"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/orangepi_lite2_defconfig b/configs/orangepi_lite2_defconfig
> index 74c11d8355..0d6101fc68 100644
> --- a/configs/orangepi_lite2_defconfig
> +++ b/configs/orangepi_lite2_defconfig
> @@ -7,6 +7,7 @@ CONFIG_SUNXI_DRAM_H6_LPDDR3=y
> CONFIG_MMC0_CD_PIN="PF6"
> # CONFIG_PSCI_RESET is not set
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig
> index 8b274e651b..5638c4a3a6 100644
> --- a/configs/orangepi_lite_defconfig
> +++ b/configs/orangepi_lite_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SPL=y
> CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=672
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig
> index b56588a42e..4fe81f8ab9 100644
> --- a/configs/orangepi_one_defconfig
> +++ b/configs/orangepi_one_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SPL=y
> CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=672
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/orangepi_one_plus_defconfig b/configs/orangepi_one_plus_defconfig
> index f86bb29e34..890e6abd45 100644
> --- a/configs/orangepi_one_plus_defconfig
> +++ b/configs/orangepi_one_plus_defconfig
> @@ -7,6 +7,7 @@ CONFIG_SUNXI_DRAM_H6_LPDDR3=y
> CONFIG_MMC0_CD_PIN="PF6"
> # CONFIG_PSCI_RESET is not set
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig
> index 15ad3af991..84801a6586 100644
> --- a/configs/orangepi_pc2_defconfig
> +++ b/configs/orangepi_pc2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_DRAM_ZQ=3881977
> CONFIG_MACPWR="PD6"
> CONFIG_SPL_SPI_SUNXI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig
> index 7fe516ecf6..6ac46649c9 100644
> --- a/configs/orangepi_pc_defconfig
> +++ b/configs/orangepi_pc_defconfig
> @@ -5,6 +5,7 @@ CONFIG_SPL=y
> CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=624
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig
> index 8586bfc188..685b577a31 100644
> --- a/configs/orangepi_pc_plus_defconfig
> +++ b/configs/orangepi_pc_plus_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN8I_H3=y
> CONFIG_DRAM_CLK=624
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig
> index 59294bc09b..79da5ce235 100644
> --- a/configs/orangepi_plus2e_defconfig
> +++ b/configs/orangepi_plus2e_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=672
> CONFIG_MACPWR="PD6"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
> index e63295495b..808f937b1d 100644
> --- a/configs/orangepi_plus_defconfig
> +++ b/configs/orangepi_plus_defconfig
> @@ -9,6 +9,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> CONFIG_USB1_VBUS_PIN="PG13"
> CONFIG_SATAPWR="PG11"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig
> index 8a8266935f..d7b80040de 100644
> --- a/configs/orangepi_prime_defconfig
> +++ b/configs/orangepi_prime_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=672
> CONFIG_DRAM_ZQ=3881977
> # CONFIG_DRAM_ODT_EN is not set
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig
> index d80d83a5db..b2aa3eef3f 100644
> --- a/configs/orangepi_r1_defconfig
> +++ b/configs/orangepi_r1_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=624
> # CONFIG_VIDEO_DE2 is not set
> CONFIG_SPL_SPI_SUNXI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-r1"
> diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig
> index 5b800b59bb..8a9cc40095 100644
> --- a/configs/orangepi_win_defconfig
> +++ b/configs/orangepi_win_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN50I=y
> CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
> CONFIG_SPL_SPI_SUNXI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig
> index 69471de36b..a7c72f7c80 100644
> --- a/configs/orangepi_zero_defconfig
> +++ b/configs/orangepi_zero_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=624
> # CONFIG_VIDEO_DE2 is not set
> CONFIG_SPL_SPI_SUNXI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_CONSOLE_MUX=y
> # CONFIG_CMD_FLASH is not set
> CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero"
> diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig
> index ed417dc306..7cfb39dcdf 100644
> --- a/configs/orangepi_zero_plus2_defconfig
> +++ b/configs/orangepi_zero_plus2_defconfig
> @@ -9,6 +9,7 @@ CONFIG_DRAM_ZQ=3881977
> CONFIG_MMC0_CD_PIN="PH13"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig
> index ad3a6b739f..c63b70f20c 100644
> --- a/configs/orangepi_zero_plus_defconfig
> +++ b/configs/orangepi_zero_plus_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=624
> CONFIG_DRAM_ZQ=3881977
> # CONFIG_DRAM_ODT_EN is not set
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig
> index 02c6d7126b..b33b0c4028 100644
> --- a/configs/ot1200_defconfig
> +++ b/configs/ot1200_defconfig
> @@ -5,6 +5,7 @@ CONFIG_TARGET_OT1200=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> CONFIG_BOUNCE_BUFFER=y
> diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig
> index dd745911ea..82ee6d0fc6 100644
> --- a/configs/ot1200_spl_defconfig
> +++ b/configs/ot1200_spl_defconfig
> @@ -12,6 +12,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> CONFIG_BOUNCE_BUFFER=y
> diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
> index 50147457b1..d0ef1b6fa5 100644
> --- a/configs/parrot_r16_defconfig
> +++ b/configs/parrot_r16_defconfig
> @@ -12,6 +12,7 @@ CONFIG_USB0_ID_DET="PD10"
> CONFIG_USB1_VBUS_PIN="PD12"
> CONFIG_AXP_GPIO=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_PARTITION_UUIDS is not set
> diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig
> index 2e6a4a7621..4a67b00935 100644
> --- a/configs/phycore-rk3288_defconfig
> +++ b/configs/phycore-rk3288_defconfig
> @@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_CONSOLE_MUX=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-phycore-rdk.dtb"
> @@ -84,6 +85,5 @@ CONFIG_USB_FUNCTION_MASS_STORAGE=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/pine64-lts_defconfig b/configs/pine64-lts_defconfig
> index 0da6b70ea8..35c05f7f28 100644
> --- a/configs/pine64-lts_defconfig
> +++ b/configs/pine64-lts_defconfig
> @@ -10,6 +10,7 @@ CONFIG_MMC0_CD_PIN=""
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> CONFIG_SPL_SPI_SUNXI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig
> index 65ea32d1ff..a7ea1bcc89 100644
> --- a/configs/pine64_plus_defconfig
> +++ b/configs/pine64_plus_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN50I=y
> CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
> CONFIG_PINE64_DT_SELECTION=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/pine_h64_defconfig b/configs/pine_h64_defconfig
> index dd1368af39..c840ca0a18 100644
> --- a/configs/pine_h64_defconfig
> +++ b/configs/pine_h64_defconfig
> @@ -6,12 +6,13 @@ CONFIG_MACH_SUN50I_H6=y
> CONFIG_SUNXI_DRAM_H6_LPDDR3=y
> CONFIG_MMC0_CD_PIN="PF6"
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> +CONFIG_USB3_VBUS_PIN="PL5"
> # CONFIG_PSCI_RESET is not set
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-pine-h64"
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_OHCI_HCD=y
> -CONFIG_USB3_VBUS_PIN="PL5"
> diff --git a/configs/pinebook_defconfig b/configs/pinebook_defconfig
> index 2760f8cc39..1ed907df7a 100644
> --- a/configs/pinebook_defconfig
> +++ b/configs/pinebook_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_CLK=552
> CONFIG_DRAM_ZQ=3881949
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> CONFIG_R_I2C_ENABLE=y
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
> index 130d8accd3..4cc4954e84 100644
> --- a/configs/platinum_picon_defconfig
> +++ b/configs/platinum_picon_defconfig
> @@ -12,6 +12,7 @@ CONFIG_SPL=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> CONFIG_BOUNCE_BUFFER=y
> diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
> index 71914ad83f..1410bf8c8d 100644
> --- a/configs/platinum_titanium_defconfig
> +++ b/configs/platinum_titanium_defconfig
> @@ -12,6 +12,7 @@ CONFIG_SPL=y
> CONFIG_SPL_LIBDISK_SUPPORT=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SUPPORT_RAW_INITRD=y
> CONFIG_MISC_INIT_R=y
> CONFIG_BOUNCE_BUFFER=y
> diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
> index 58780607eb..7207eb41bc 100644
> --- a/configs/pogo_e02_defconfig
> +++ b/configs/pogo_e02_defconfig
> @@ -6,6 +6,7 @@ CONFIG_TARGET_POGO_E02=y
> CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nPogo E02"
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_SYS_PROMPT="PogoE02> "
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/polaroid_mid2407pxe03_defconfig b/configs/polaroid_mid2407pxe03_defconfig
> index 0186a69424..012e1f2434 100644
> --- a/configs/polaroid_mid2407pxe03_defconfig
> +++ b/configs/polaroid_mid2407pxe03_defconfig
> @@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/polaroid_mid2809pxe04_defconfig b/configs/polaroid_mid2809pxe04_defconfig
> index 265e6b85f9..3564ddc9a1 100644
> --- a/configs/polaroid_mid2809pxe04_defconfig
> +++ b/configs/polaroid_mid2809pxe04_defconfig
> @@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
> index 902294bc3c..f0b6313afa 100644
> --- a/configs/popmetal-rk3288_defconfig
> +++ b/configs/popmetal-rk3288_defconfig
> @@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_CONSOLE_MUX=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-popmetal.dtb"
> @@ -80,6 +81,5 @@ CONFIG_USB_FUNCTION_MASS_STORAGE=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/pov_protab2_ips9_defconfig b/configs/pov_protab2_ips9_defconfig
> index 80cdacfd4d..0b6bf6dfd8 100644
> --- a/configs/pov_protab2_ips9_defconfig
> +++ b/configs/pov_protab2_ips9_defconfig
> @@ -14,6 +14,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
> index 31f5888184..a34620b6f7 100644
> --- a/configs/pxm2_defconfig
> +++ b/configs/pxm2_defconfig
> @@ -19,6 +19,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CONSOLE_MUX is not set
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> diff --git a/configs/q8_a13_tablet_defconfig b/configs/q8_a13_tablet_defconfig
> index 8f81b9a7bf..4933e6f861 100644
> --- a/configs/q8_a13_tablet_defconfig
> +++ b/configs/q8_a13_tablet_defconfig
> @@ -15,6 +15,7 @@ CONFIG_VIDEO_LCD_POWER="AXP0-0"
> CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/q8_a23_tablet_800x480_defconfig b/configs/q8_a23_tablet_800x480_defconfig
> index 04132688ef..59683190cc 100644
> --- a/configs/q8_a23_tablet_800x480_defconfig
> +++ b/configs/q8_a23_tablet_800x480_defconfig
> @@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/q8_a33_tablet_1024x600_defconfig b/configs/q8_a33_tablet_1024x600_defconfig
> index 7367306ecf..05a82c41f8 100644
> --- a/configs/q8_a33_tablet_1024x600_defconfig
> +++ b/configs/q8_a33_tablet_1024x600_defconfig
> @@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/q8_a33_tablet_800x480_defconfig b/configs/q8_a33_tablet_800x480_defconfig
> index 03006e382c..94a680ce8b 100644
> --- a/configs/q8_a33_tablet_800x480_defconfig
> +++ b/configs/q8_a33_tablet_800x480_defconfig
> @@ -16,6 +16,7 @@ CONFIG_VIDEO_LCD_POWER="PH7"
> CONFIG_VIDEO_LCD_BL_EN="PH6"
> CONFIG_VIDEO_LCD_BL_PWM="PH0"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig
> index b47e256a02..7237819909 100644
> --- a/configs/qemu_arm64_defconfig
> +++ b/configs/qemu_arm64_defconfig
> @@ -4,6 +4,8 @@ CONFIG_TARGET_QEMU_ARM_64BIT=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="pci enum"
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_CMD_BOOTEFI_SELFTEST=y
> diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig
> index 19d572afb4..7c95892d98 100644
> --- a/configs/qemu_arm_defconfig
> +++ b/configs/qemu_arm_defconfig
> @@ -5,6 +5,8 @@ CONFIG_TARGET_QEMU_ARM_32BIT=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="pci enum"
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_CMD_BOOTEFI_SELFTEST=y
> diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
> index 500d5e95e3..b7d738526d 100644
> --- a/configs/r7-tv-dongle_defconfig
> +++ b/configs/r7-tv-dongle_defconfig
> @@ -6,6 +6,7 @@ CONFIG_MACH_SUN5I=y
> CONFIG_DRAM_CLK=384
> CONFIG_USB1_VBUS_PIN="PG13"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
> index efd6e49333..fa1d0daa59 100644
> --- a/configs/rastaban_defconfig
> +++ b/configs/rastaban_defconfig
> @@ -19,6 +19,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_ARCH_MISC_INIT=y
> diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
> index 7639b558cf..72c6b1f756 100644
> --- a/configs/rock2_defconfig
> +++ b/configs/rock2_defconfig
> @@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-rock2-square.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> @@ -83,6 +84,5 @@ CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> CONFIG_CONSOLE_SCROLL_LINES=10
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/rock_defconfig b/configs/rock_defconfig
> index 5c29548059..37cd5c55c3 100644
> --- a/configs/rock_defconfig
> +++ b/configs/rock_defconfig
> @@ -12,6 +12,7 @@ CONFIG_SPL_STACK_R_ADDR=0x60080000
> CONFIG_DEBUG_UART_BASE=0x20064000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_DEFAULT_FDT_FILE="rk3188-radxarock.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
> index 1ab35f1b25..3d56b4ac7c 100644
> --- a/configs/rpi_0_w_defconfig
> +++ b/configs/rpi_0_w_defconfig
> @@ -5,6 +5,8 @@ CONFIG_TARGET_RPI_0_W=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_OF_BOARD_SETUP=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start"
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
> index 53aa554cc7..3cb2bb6713 100644
> --- a/configs/rpi_2_defconfig
> +++ b/configs/rpi_2_defconfig
> @@ -5,6 +5,8 @@ CONFIG_TARGET_RPI_2=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_OF_BOARD_SETUP=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start"
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
> index c33ea58438..9d9d12074e 100644
> --- a/configs/rpi_3_32b_defconfig
> +++ b/configs/rpi_3_32b_defconfig
> @@ -6,6 +6,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_OF_BOARD_SETUP=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start"
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
> index 2ae7b6dcae..7655fe7060 100644
> --- a/configs/rpi_3_b_plus_defconfig
> +++ b/configs/rpi_3_b_plus_defconfig
> @@ -3,9 +3,11 @@ CONFIG_ARCH_BCM283X=y
> CONFIG_SYS_TEXT_BASE=0x00080000
> CONFIG_TARGET_RPI_3=y
> CONFIG_SYS_MALLOC_F_LEN=0x2000
> -CONFIG_DISTRO_DEFAULTS=y
> CONFIG_NR_DRAM_BANKS=1
> +CONFIG_DISTRO_DEFAULTS=y
> CONFIG_OF_BOARD_SETUP=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start"
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
> index 98573bb89a..af8718a1ee 100644
> --- a/configs/rpi_3_defconfig
> +++ b/configs/rpi_3_defconfig
> @@ -6,6 +6,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_OF_BOARD_SETUP=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start"
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
> index bd15c98697..55d70eb68a 100644
> --- a/configs/rpi_defconfig
> +++ b/configs/rpi_defconfig
> @@ -5,6 +5,8 @@ CONFIG_TARGET_RPI=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_OF_BOARD_SETUP=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start"
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/rut_defconfig b/configs/rut_defconfig
> index 330f7e2371..7669053e6b 100644
> --- a/configs/rut_defconfig
> +++ b/configs/rut_defconfig
> @@ -19,6 +19,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CONSOLE_MUX is not set
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
> index 47c4540656..efc8586e8b 100644
> --- a/configs/seaboard_defconfig
> +++ b/configs/seaboard_defconfig
> @@ -5,6 +5,8 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_TEGRA20=y
> CONFIG_TARGET_SEABOARD=y
> CONFIG_OF_SYSTEM_SETUP=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start"
> CONFIG_SPL_TEXT_BASE=0x00108000
> CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # "
> # CONFIG_CMD_IMI is not set
> diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
> index 74a52e6670..73f567f0c9 100644
> --- a/configs/sheevaplug_defconfig
> +++ b/configs/sheevaplug_defconfig
> @@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_IDENT_STRING="\nMarvell-Sheevaplug"
> # CONFIG_SYS_MALLOC_F is not set
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> diff --git a/configs/socfpga_dbm_soc1_defconfig b/configs/socfpga_dbm_soc1_defconfig
> index dd14be4219..66f894efd2 100644
> --- a/configs/socfpga_dbm_soc1_defconfig
> +++ b/configs/socfpga_dbm_soc1_defconfig
> @@ -4,6 +4,8 @@ CONFIG_TARGET_SOCFPGA_DEVBOARDS_DBM_SOC1=y
> CONFIG_FIT=y
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200"
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="run try_bootscript"
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
> diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
> index 958f146e1c..1a9323f822 100644
> --- a/configs/socfpga_vining_fpga_defconfig
> +++ b/configs/socfpga_vining_fpga_defconfig
> @@ -7,6 +7,8 @@ CONFIG_BOOTDELAY=5
> CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttyS0,115200"
> # CONFIG_USE_BOOTCOMMAND is not set
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="setenv hostname vining-${unit_serial} ; setenv PS1 "${unit_ident} (${unit_serial}) => " ; if gpio input 78 ; then setenv bootdelay 10 ; setenv boottype rcvr ; else setenv bootdelay 5 ; setenv boottype norm ; fi"
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
> diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
> index 2d5e158871..720e3294ac 100644
> --- a/configs/socrates_defconfig
> +++ b/configs/socrates_defconfig
> @@ -7,6 +7,8 @@ CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_BOOTDELAY=1
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="echo;echo Welcome on the ABB Socrates Board;echo"
> # CONFIG_CONSOLE_MUX is not set
> CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> CONFIG_BOARD_EARLY_INIT_R=y
> diff --git a/configs/sopine_baseboard_defconfig b/configs/sopine_baseboard_defconfig
> index e47218cb6a..b78f9e8807 100644
> --- a/configs/sopine_baseboard_defconfig
> +++ b/configs/sopine_baseboard_defconfig
> @@ -11,6 +11,7 @@ CONFIG_MMC0_CD_PIN=""
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> CONFIG_SPL_SPI_SUNXI=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig
> index 1bdbe9ebdd..6a561d0cd1 100644
> --- a/configs/strider_con_defconfig
> +++ b/configs/strider_con_defconfig
> @@ -95,6 +95,7 @@ CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_SYS_EXTRA_OPTIONS="STRIDER_CON"
> CONFIG_BOOTDELAY=5
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_BOARD_EARLY_INIT_F=y
> diff --git a/configs/strider_con_dp_defconfig b/configs/strider_con_dp_defconfig
> index 424c915c29..eb4ad77456 100644
> --- a/configs/strider_con_dp_defconfig
> +++ b/configs/strider_con_dp_defconfig
> @@ -95,6 +95,7 @@ CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_SYS_EXTRA_OPTIONS="STRIDER_CON_DP"
> CONFIG_BOOTDELAY=5
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_BOARD_EARLY_INIT_F=y
> diff --git a/configs/strider_cpu_defconfig b/configs/strider_cpu_defconfig
> index 1149b13bef..8a48df25f6 100644
> --- a/configs/strider_cpu_defconfig
> +++ b/configs/strider_cpu_defconfig
> @@ -95,6 +95,7 @@ CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_SYS_EXTRA_OPTIONS="STRIDER_CPU"
> CONFIG_BOOTDELAY=5
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_BOARD_EARLY_INIT_F=y
> diff --git a/configs/strider_cpu_dp_defconfig b/configs/strider_cpu_dp_defconfig
> index ec68d3d3e8..26793dbdd6 100644
> --- a/configs/strider_cpu_dp_defconfig
> +++ b/configs/strider_cpu_dp_defconfig
> @@ -95,6 +95,7 @@ CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_SYS_EXTRA_OPTIONS="STRIDER_CPU,STRIDER_CPU_DP"
> CONFIG_BOOTDELAY=5
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_BOARD_EARLY_INIT_F=y
> diff --git a/configs/sun8i_a23_evb_defconfig b/configs/sun8i_a23_evb_defconfig
> index 3543e95883..34cbb1e0c1 100644
> --- a/configs/sun8i_a23_evb_defconfig
> +++ b/configs/sun8i_a23_evb_defconfig
> @@ -9,6 +9,7 @@ CONFIG_USB0_VBUS_PIN="axp_drivebus"
> CONFIG_USB0_VBUS_DET="axp_vbus_detect"
> CONFIG_USB1_VBUS_PIN="PH7"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig
> index 62b6838a95..f3d77f1cd1 100644
> --- a/configs/sunxi_Gemei_G9_defconfig
> +++ b/configs/sunxi_Gemei_G9_defconfig
> @@ -11,6 +11,7 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
> CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_I2C_SUPPORT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig
> index ac1bac877d..8b72983b23 100644
> --- a/configs/syzygy_hub_defconfig
> +++ b/configs/syzygy_hub_defconfig
> @@ -16,6 +16,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SYS_PROMPT="Zynq> "
> diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
> index 17c90a7d6c..88fbbf4bc0 100644
> --- a/configs/tbs2910_defconfig
> +++ b/configs/tbs2910_defconfig
> @@ -7,6 +7,8 @@ CONFIG_NR_DRAM_BANKS=1
> CONFIG_CMD_HDMIDETECT=y
> CONFIG_AHCI=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start; if hdmidet; then run set_con_hdmi; else run set_con_serial; fi"
> CONFIG_PRE_CONSOLE_BUFFER=y
> CONFIG_PRE_CON_BUF_ADDR=0x7c000000
> CONFIG_SUPPORT_RAW_INITRD=y
> diff --git a/configs/tbs_a711_defconfig b/configs/tbs_a711_defconfig
> index d56bf68468..196c4ce400 100644
> --- a/configs/tbs_a711_defconfig
> +++ b/configs/tbs_a711_defconfig
> @@ -13,6 +13,7 @@ CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
> CONFIG_USB0_ID_DET="PH11"
> CONFIG_AXP_GPIO=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/teres_i_defconfig b/configs/teres_i_defconfig
> index 421a8d3d40..cfd696f8a3 100644
> --- a/configs/teres_i_defconfig
> +++ b/configs/teres_i_defconfig
> @@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=3881949
> CONFIG_MMC_SUNXI_SLOT_EXTRA=2
> CONFIG_USB1_VBUS_PIN="PL7"
> CONFIG_I2C0_ENABLE=y
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CMD_FLASH is not set
> # CONFIG_SPL_DOS_PARTITION is not set
> # CONFIG_SPL_EFI_PARTITION is not set
> diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
> index 1327edd6b9..770804f893 100644
> --- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
> +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig
> @@ -18,6 +18,7 @@ CONFIG_FIT_SIGNATURE=y
> CONFIG_BOOTSTAGE=y
> CONFIG_BOOTSTAGE_REPORT=y
> CONFIG_SHOW_BOOT_PROGRESS=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_LAST_STAGE_INIT=y
> diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig
> index 651c0ce40a..d69c2a91db 100644
> --- a/configs/theadorable-x86-conga-qa3-e3845_defconfig
> +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig
> @@ -17,6 +17,7 @@ CONFIG_FIT_SIGNATURE=y
> CONFIG_BOOTSTAGE=y
> CONFIG_BOOTSTAGE_REPORT=y
> CONFIG_SHOW_BOOT_PROGRESS=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_LAST_STAGE_INIT=y
> diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
> index 9ac8379007..d53aff0ea0 100644
> --- a/configs/theadorable-x86-dfi-bt700_defconfig
> +++ b/configs/theadorable-x86-dfi-bt700_defconfig
> @@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y
> CONFIG_BOOTSTAGE=y
> CONFIG_BOOTSTAGE_REPORT=y
> CONFIG_SHOW_BOOT_PROGRESS=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_LAST_STAGE_INIT=y
> diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
> index 50f9df0db4..9b003870e5 100644
> --- a/configs/theadorable_debug_defconfig
> +++ b/configs/theadorable_debug_defconfig
> @@ -16,6 +16,7 @@ CONFIG_DEBUG_UART=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_FIT=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_CONSOLE_MUX is not set
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
> index 68ce230704..4c52610271 100644
> --- a/configs/thuban_defconfig
> +++ b/configs/thuban_defconfig
> @@ -19,6 +19,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
> CONFIG_SPL_SPI_SUPPORT=y
> CONFIG_ENV_VARS_UBOOT_CONFIG=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_ARCH_MISC_INIT=y
> diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
> index 482ee7d555..976f8f429d 100644
> --- a/configs/tinker-rk3288_defconfig
> +++ b/configs/tinker-rk3288_defconfig
> @@ -11,6 +11,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_CONSOLE_MUX=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-tinker.dtb"
> @@ -80,6 +81,5 @@ CONFIG_USB_FUNCTION_MASS_STORAGE=y
> CONFIG_USB_HOST_ETHER=y
> CONFIG_USB_ETHER_ASIX=y
> CONFIG_USB_ETHER_SMSC95XX=y
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig
> index 6b126c52c0..daab4b2998 100644
> --- a/configs/topic_miami_defconfig
> +++ b/configs/topic_miami_defconfig
> @@ -14,6 +14,7 @@ CONFIG_DISTRO_DEFAULTS=y
> CONFIG_SYS_CUSTOM_LDSCRIPT=y
> CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
> CONFIG_BOOTDELAY=0
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_SYS_PROMPT="zynq-uboot> "
> diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig
> index a0b016c004..f92014224a 100644
> --- a/configs/topic_miamilite_defconfig
> +++ b/configs/topic_miamilite_defconfig
> @@ -14,6 +14,7 @@ CONFIG_DISTRO_DEFAULTS=y
> CONFIG_SYS_CUSTOM_LDSCRIPT=y
> CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
> CONFIG_BOOTDELAY=0
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_SYS_PROMPT="zynq-uboot> "
> diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
> index c34b034072..9ba7282c6f 100644
> --- a/configs/topic_miamiplus_defconfig
> +++ b/configs/topic_miamiplus_defconfig
> @@ -14,6 +14,7 @@ CONFIG_DISTRO_DEFAULTS=y
> CONFIG_SYS_CUSTOM_LDSCRIPT=y
> CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
> CONFIG_BOOTDELAY=0
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_SYS_PROMPT="zynq-uboot> "
> diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
> index d26cb3cfe0..4d3f7ba8ef 100644
> --- a/configs/turris_mox_defconfig
> +++ b/configs/turris_mox_defconfig
> @@ -9,6 +9,7 @@ CONFIG_DEBUG_UART_CLOCK=25804800
> CONFIG_DEBUG_UART=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_CPUINFO is not set
> diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
> index e04156311f..e7ece9e4b7 100644
> --- a/configs/turris_omnia_defconfig
> +++ b/configs/turris_omnia_defconfig
> @@ -20,6 +20,7 @@ CONFIG_DISTRO_DEFAULTS=y
> CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> CONFIG_MISC_INIT_R=y
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/uDPU_defconfig b/configs/uDPU_defconfig
> index 2209330048..c312b1af6a 100644
> --- a/configs/uDPU_defconfig
> +++ b/configs/uDPU_defconfig
> @@ -12,6 +12,7 @@ CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> CONFIG_FIT=y
> CONFIG_SPI_BOOT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
> index c33862c26a..c16ddb97c1 100644
> --- a/configs/ventana_defconfig
> +++ b/configs/ventana_defconfig
> @@ -5,6 +5,8 @@ CONFIG_NR_DRAM_BANKS=2
> CONFIG_TEGRA20=y
> CONFIG_TARGET_VENTANA=y
> CONFIG_OF_SYSTEM_SETUP=y
> +CONFIG_USE_PREBOOT=y
> +CONFIG_PREBOOT="usb start"
> CONFIG_SPL_TEXT_BASE=0x00108000
> CONFIG_SYS_PROMPT="Tegra20 (Ventana) # "
> # CONFIG_CMD_IMI is not set
> diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig
> index 1108c6a907..0f0148a3be 100644
> --- a/configs/vyasa-rk3288_defconfig
> +++ b/configs/vyasa-rk3288_defconfig
> @@ -11,6 +11,7 @@ CONFIG_SPL_STACK_R_ADDR=0x80000
> CONFIG_DEBUG_UART_BASE=0xff690000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_DEBUG_UART=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SILENT_CONSOLE=y
> CONFIG_DEFAULT_FDT_FILE="rk3288-vyasa.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> @@ -85,6 +86,5 @@ CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> CONFIG_CONSOLE_SCROLL_LINES=10
> -CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig
> index cad95d338e..86819427fa 100644
> --- a/configs/xpedite517x_defconfig
> +++ b/configs/xpedite517x_defconfig
> @@ -8,6 +8,7 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> CONFIG_BOARD_EARLY_INIT_R=y
> CONFIG_HUSH_PARSER=y
> # CONFIG_AUTO_COMPLETE is not set
> diff --git a/configs/xpedite520x_defconfig b/configs/xpedite520x_defconfig
> index 1c0bd951ee..81689a44d5 100644
> --- a/configs/xpedite520x_defconfig
> +++ b/configs/xpedite520x_defconfig
> @@ -8,6 +8,7 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_MISC_INIT_R is not set
> CONFIG_BOARD_EARLY_INIT_R=y
> CONFIG_HUSH_PARSER=y
> diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig
> index e009aabb55..72a2a424e2 100644
> --- a/configs/xpedite537x_defconfig
> +++ b/configs/xpedite537x_defconfig
> @@ -8,6 +8,7 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_MISC_INIT_R is not set
> CONFIG_BOARD_EARLY_INIT_R=y
> CONFIG_HUSH_PARSER=y
> diff --git a/configs/xpedite550x_defconfig b/configs/xpedite550x_defconfig
> index 5d3569b34d..f86d1bdc2d 100644
> --- a/configs/xpedite550x_defconfig
> +++ b/configs/xpedite550x_defconfig
> @@ -8,6 +8,7 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_OF_STDOUT_VIA_ALIAS=y
> CONFIG_BOOTDELAY=3
> +CONFIG_USE_PREBOOT=y
> # CONFIG_MISC_INIT_R is not set
> CONFIG_BOARD_EARLY_INIT_R=y
> CONFIG_HUSH_PARSER=y
> diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
> index 60f0efd46e..3bba1ec74a 100644
> --- a/configs/zmx25_defconfig
> +++ b/configs/zmx25_defconfig
> @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0xA0000000
> CONFIG_TARGET_ZMX25=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_BOOTDELAY=5
> +CONFIG_USE_PREBOOT=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> CONFIG_HUSH_PARSER=y
> diff --git a/configs/zynq_cc108_defconfig b/configs/zynq_cc108_defconfig
> index 4d914ea725..76a9a120ca 100644
> --- a/configs/zynq_cc108_defconfig
> +++ b/configs/zynq_cc108_defconfig
> @@ -14,6 +14,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_SYS_PROMPT="Zynq> "
> diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig
> index fca0382a90..0910d3bf9d 100644
> --- a/configs/zynq_cse_nand_defconfig
> +++ b/configs/zynq_cse_nand_defconfig
> @@ -10,6 +10,7 @@ CONFIG_SPL=y
> CONFIG_SYS_MALLOC_LEN=0x1000
> CONFIG_SYS_CUSTOM_LDSCRIPT=y
> CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
> +CONFIG_USE_PREBOOT=y
> # CONFIG_BOARD_LATE_INIT is not set
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_SPL_STACK_R=y
> diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig
> index 21d7dd556e..0a6b172b7e 100644
> --- a/configs/zynq_cse_nor_defconfig
> +++ b/configs/zynq_cse_nor_defconfig
> @@ -10,6 +10,7 @@ CONFIG_SPL=y
> CONFIG_SYS_MALLOC_LEN=0x1000
> CONFIG_SYS_CUSTOM_LDSCRIPT=y
> CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
> +CONFIG_USE_PREBOOT=y
> # CONFIG_BOARD_LATE_INIT is not set
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_SPL_STACK_R=y
> diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig
> index 8f9ba072ba..e12306f844 100644
> --- a/configs/zynq_cse_qspi_defconfig
> +++ b/configs/zynq_cse_qspi_defconfig
> @@ -16,6 +16,7 @@ CONFIG_DEBUG_UART=y
> CONFIG_SYS_CUSTOM_LDSCRIPT=y
> CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
> # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
> +CONFIG_USE_PREBOOT=y
> # CONFIG_BOARD_LATE_INIT is not set
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_ARCH_EARLY_INIT_R is not set
> diff --git a/configs/zynq_dlc20_rev1_0_defconfig b/configs/zynq_dlc20_rev1_0_defconfig
> index 1e15889bda..1b4233ca9a 100644
> --- a/configs/zynq_dlc20_rev1_0_defconfig
> +++ b/configs/zynq_dlc20_rev1_0_defconfig
> @@ -15,6 +15,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
> index 1fceccdc09..3de1928e75 100644
> --- a/configs/zynq_microzed_defconfig
> +++ b/configs/zynq_microzed_defconfig
> @@ -11,6 +11,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SPL_SPI_LOAD=y
> diff --git a/configs/zynq_minized_defconfig b/configs/zynq_minized_defconfig
> index 60fe72f04e..3c95f0aceb 100644
> --- a/configs/zynq_minized_defconfig
> +++ b/configs/zynq_minized_defconfig
> @@ -13,6 +13,7 @@ CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
> CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SYS_PROMPT="Zynq> "
> diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
> index 453cd549c1..6457876ce4 100644
> --- a/configs/zynq_picozed_defconfig
> +++ b/configs/zynq_picozed_defconfig
> @@ -7,6 +7,7 @@ CONFIG_SPL=y
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_SYS_CUSTOM_LDSCRIPT=y
> CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SYS_PROMPT="Zynq> "
> diff --git a/configs/zynq_z_turn_defconfig b/configs/zynq_z_turn_defconfig
> index 0908fc767c..ea24915203 100644
> --- a/configs/zynq_z_turn_defconfig
> +++ b/configs/zynq_z_turn_defconfig
> @@ -14,6 +14,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SPL_SPI_LOAD=y
> diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
> index 2ff263034a..caf97d83f1 100644
> --- a/configs/zynq_zc702_defconfig
> +++ b/configs/zynq_zc702_defconfig
> @@ -15,6 +15,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SPL_SPI_LOAD=y
> diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
> index 33f26a6f2a..d4fcf9da04 100644
> --- a/configs/zynq_zc706_defconfig
> +++ b/configs/zynq_zc706_defconfig
> @@ -17,6 +17,7 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_PRINT=y
> CONFIG_SPL_LOAD_FIT=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_FPGA_SUPPORT=y
> CONFIG_SPL_OS_BOOT=y
> diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
> index 55ae55edc4..6458e62e1e 100644
> --- a/configs/zynq_zc770_xm010_defconfig
> +++ b/configs/zynq_zc770_xm010_defconfig
> @@ -15,6 +15,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SPL_SPI_LOAD=y
> diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig
> index 7792ba29a0..feedb327bd 100644
> --- a/configs/zynq_zc770_xm011_defconfig
> +++ b/configs/zynq_zc770_xm011_defconfig
> @@ -16,6 +16,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SYS_PROMPT="Zynq> "
> diff --git a/configs/zynq_zc770_xm011_x16_defconfig b/configs/zynq_zc770_xm011_x16_defconfig
> index 3a3740629b..28d63c9ec5 100644
> --- a/configs/zynq_zc770_xm011_x16_defconfig
> +++ b/configs/zynq_zc770_xm011_x16_defconfig
> @@ -16,6 +16,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SYS_PROMPT="Zynq> "
> diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
> index d777ba889e..01e3d5fb84 100644
> --- a/configs/zynq_zc770_xm012_defconfig
> +++ b/configs/zynq_zc770_xm012_defconfig
> @@ -13,6 +13,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SYS_PROMPT="Zynq> "
> diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
> index c5288e56e3..5195ec3d8c 100644
> --- a/configs/zynq_zc770_xm013_defconfig
> +++ b/configs/zynq_zc770_xm013_defconfig
> @@ -13,6 +13,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SPL_SPI_LOAD=y
> diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
> index e47cce5e07..1254b4efe9 100644
> --- a/configs/zynq_zed_defconfig
> +++ b/configs/zynq_zed_defconfig
> @@ -14,6 +14,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SPL_SPI_LOAD=y
> diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
> index ee15d83147..078b436add 100644
> --- a/configs/zynq_zybo_defconfig
> +++ b/configs/zynq_zybo_defconfig
> @@ -14,6 +14,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SPL_SPI_LOAD=y
> diff --git a/configs/zynq_zybo_z7_defconfig b/configs/zynq_zybo_z7_defconfig
> index 43b746f56c..3c974925c4 100644
> --- a/configs/zynq_zybo_z7_defconfig
> +++ b/configs/zynq_zybo_z7_defconfig
> @@ -14,6 +14,7 @@ CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> +CONFIG_USE_PREBOOT=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_OS_BOOT=y
> CONFIG_SPL_SPI_LOAD=y
> diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
> index b37f3a8727..7352e34b9c 100644
> --- a/include/configs/MPC8349EMDS.h
> +++ b/include/configs/MPC8349EMDS.h
> @@ -347,11 +347,6 @@
>
> #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"
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "netdev=eth0\0" \
> "hostname=mpc8349emds\0" \
> diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h
> index 493f6df187..2ae1069e4f 100644
> --- a/include/configs/MPC8349EMDS_SDRAM.h
> +++ b/include/configs/MPC8349EMDS_SDRAM.h
> @@ -404,10 +404,6 @@
>
> #define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
>
> -#define CONFIG_PREBOOT "echo;" \
> - "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
> - "echo"
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "netdev=eth0\0" \
> "hostname=mpc8349emds\0" \
> diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
> index 0c2df7ec03..9bf5d9d3fd 100644
> --- a/include/configs/TQM834x.h
> +++ b/include/configs/TQM834x.h
> @@ -236,11 +236,6 @@
> /* 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"
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "netdev=eth0\0" \
> "hostname=tqm834x\0" \
> diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
> index e9a9da3aed..5fa393d45d 100644
> --- a/include/configs/am3517_crane.h
> +++ b/include/configs/am3517_crane.h
> @@ -68,16 +68,6 @@
> */
>
> #ifdef CONFIG_USB_AM35X
> -
> -#ifdef CONFIG_USB_MUSB_HCD
> -
> -#ifdef CONFIG_USB_KEYBOARD
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT "usb start"
> -#endif /* CONFIG_USB_KEYBOARD */
> -
> -#endif /* CONFIG_USB_MUSB_HCD */
> -
> #ifdef CONFIG_USB_MUSB_UDC
> /* USB device configuration */
> #define CONFIG_USB_DEVICE 1
> diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
> index 841e750b00..99668dc8f4 100644
> --- a/include/configs/am3517_evm.h
> +++ b/include/configs/am3517_evm.h
> @@ -28,19 +28,6 @@
> * Enable CONFIG_USB_MUSB_GADGET for Device functionalities.
> */
>
> -#ifdef CONFIG_USB_MUSB_AM35X
> -
> -#ifdef CONFIG_USB_MUSB_HOST
> -
> -#ifdef CONFIG_USB_KEYBOARD
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT "usb start"
> -#endif /* CONFIG_USB_KEYBOARD */
> -
> -#endif /* CONFIG_USB_MUSB_HOST */
> -
> -#endif /* CONFIG_USB_MUSB_AM35X */
> -
> /* I2C */
>
> /* Ethernet */
> diff --git a/include/configs/apf27.h b/include/configs/apf27.h
> index d7af4f91bc..044ce4467e 100644
> --- a/include/configs/apf27.h
> +++ b/include/configs/apf27.h
> @@ -83,8 +83,6 @@
> #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;"
>
> /*
> * Boot Linux
> diff --git a/include/configs/arndale.h b/include/configs/arndale.h
> index 0485e7a6d8..8aa6e1d0c3 100644
> --- a/include/configs/arndale.h
> +++ b/include/configs/arndale.h
> @@ -29,9 +29,6 @@
>
> #define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK
>
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
> -
> #define CONFIG_S5P_PA_SYSRAM 0x02020000
> #define CONFIG_SMP_PEN_ADDR CONFIG_S5P_PA_SYSRAM
>
> diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
> index 648a4db8f1..b8437052a9 100644
> --- a/include/configs/bcmstb.h
> +++ b/include/configs/bcmstb.h
> @@ -157,11 +157,6 @@ 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};" \
> - "fdt addr ${fdtsaveaddr};"
> /*
> * Enable in-place RFS with this initrd_high setting.
> */
> diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
> index 76dc38766d..285e28b535 100644
> --- a/include/configs/bk4r1.h
> +++ b/include/configs/bk4r1.h
> @@ -37,8 +37,6 @@
> "run manage_userdata; "
>
> /* Enable PREBOOT variable */
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
>
> /* Set ARP_TIMEOUT to 500ms */
> #define CONFIG_ARP_TIMEOUT 500UL
> diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h
> index 0a8d41b8f6..dff41239ba 100644
> --- a/include/configs/bur_cfg_common.h
> +++ b/include/configs/bur_cfg_common.h
> @@ -23,9 +23,6 @@
> "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 */
> #define CONFIG_BOOTP_SEND_HOSTNAME
> #define CONFIG_NET_RETRY_COUNT 10
> diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
> index 7b9640fb26..60bac9adc8 100644
> --- a/include/configs/cm_fx6.h
> +++ b/include/configs/cm_fx6.h
> @@ -144,9 +144,6 @@
> "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) \
> func(USB, usb, 0) \
> func(MMC, mmc, 2) \
> diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
> index 1978074617..93dcad4b66 100644
> --- a/include/configs/conga-qeval20-qa3-e3845.h
> +++ b/include/configs/conga-qeval20-qa3-e3845.h
> @@ -37,7 +37,4 @@
> "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 f0f460aac9..54bbfe3f55 100644
> --- a/include/configs/controlcenterdc.h
> +++ b/include/configs/controlcenterdc.h
> @@ -124,9 +124,6 @@
> #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 \
> "netdev=eth1\0" \
> "consoledev=ttyS1\0" \
> diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
> index d3a4a61c6c..a8e1850f2b 100644
> --- a/include/configs/dfi-bt700.h
> +++ b/include/configs/dfi-bt700.h
> @@ -42,7 +42,4 @@
> "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 2b44437ed3..b175e9d574 100644
> --- a/include/configs/ds414.h
> +++ b/include/configs/ds414.h
> @@ -99,8 +99,5 @@
> /* 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"
>
> #endif /* _CONFIG_SYNOLOGY_DS414_H */
> diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
> index 11d367a151..0ff48287ac 100644
> --- a/include/configs/gazerbeam.h
> +++ b/include/configs/gazerbeam.h
> @@ -100,8 +100,6 @@
> #define CONFIG_ROOTPATH "/opt/nfsroot"
> #define CONFIG_BOOTFILE "uImage"
>
> -#define CONFIG_PREBOOT /* enable preboot variable */
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "netdev=eth0\0" \
> "consoledev=ttyS1\0" \
> diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
> index aec5d61c56..a27627e721 100644
> --- a/include/configs/gw_ventana.h
> +++ b/include/configs/gw_ventana.h
> @@ -138,8 +138,6 @@
>
> /* Miscellaneous configurable options */
> #define CONFIG_HWCONFIG
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
>
> /* Memory configuration */
> #define CONFIG_SYS_MEMTEST_START 0x10000000
> diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
> index 31ce410448..8fb321178f 100644
> --- a/include/configs/hrcon.h
> +++ b/include/configs/hrcon.h
> @@ -403,9 +403,6 @@ 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 \
> "netdev=eth0\0" \
> "consoledev=ttyS1\0" \
> diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
> index 8bc8e00f98..43cb14c14e 100644
> --- a/include/configs/ids8313.h
> +++ b/include/configs/ids8313.h
> @@ -253,10 +253,6 @@
> #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"
> #define CONFIG_BOOTCOMMAND "run boot_cramfs"
> #undef CONFIG_SYS_LOADS_BAUD_CHANGE
>
> diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
> index ba0e75b5ee..03d495a5a8 100644
> --- a/include/configs/m53menlo.h
> +++ b/include/configs/m53menlo.h
> @@ -185,8 +185,6 @@
> /*
> * Extra Environments
> */
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT "run try_bootscript"
> #define CONFIG_HOSTNAME "m53menlo"
>
> #define CONFIG_EXTRA_ENV_SETTINGS \
> diff --git a/include/configs/meesc.h b/include/configs/meesc.h
> index 6cf8c672eb..aeab2e983b 100644
> --- a/include/configs/meesc.h
> +++ b/include/configs/meesc.h
> @@ -40,9 +40,6 @@
> #define CONFIG_REVISION_TAG
> #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
>
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT /* enable preboot variable */
> -
> /*
> * Hardware drivers
> */
> diff --git a/include/configs/meson64.h b/include/configs/meson64.h
> index 7ced66774f..78b1615d5c 100644
> --- a/include/configs/meson64.h
> +++ b/include/configs/meson64.h
> @@ -31,8 +31,6 @@
>
> #ifdef CONFIG_USB_KEYBOARD
> #define STDIN_CFG "usbkbd,serial"
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT "usb start"
> #else
> #define STDIN_CFG "serial"
> #endif
> diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
> index f99bd71167..814fec5b33 100644
> --- a/include/configs/microblaze-generic.h
> +++ b/include/configs/microblaze-generic.h
> @@ -140,9 +140,6 @@
> /* architecture dependent code */
> #define CONFIG_SYS_USR_EXCEP /* user exception */
>
> -#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" \
> "nor0=flash-0\0"\
> diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
> index 6ee0443f11..e6d5c680d7 100644
> --- a/include/configs/mv-common.h
> +++ b/include/configs/mv-common.h
> @@ -38,8 +38,6 @@
> #endif
>
> /* auto boot */
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
>
> /*
> * For booting Linux, the board info and command line data
> diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
> index dbedad1a97..ff8cc3c770 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -14,8 +14,6 @@
> #define CONFIG_SYS_SDRAM_BASE 0x00000000
>
> /* auto boot */
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
>
> #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
> 115200, 230400, 460800, 921600 }
> diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
> index 2931014744..f3f8538541 100644
> --- a/include/configs/mvebu_armada-8k.h
> +++ b/include/configs/mvebu_armada-8k.h
> @@ -15,8 +15,6 @@
> #define CONFIG_SYS_SDRAM_BASE 0x00000000
>
> /* auto boot */
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
>
> #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
> 115200, 230400, 460800, 921600 }
> diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
> index 8e66a2bf67..fc498b2481 100644
> --- a/include/configs/mx51evk.h
> +++ b/include/configs/mx51evk.h
> @@ -66,8 +66,6 @@
> #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
> #define CONFIG_BMP_16BPP
> diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
> index fb57a2113c..bbe0574033 100644
> --- a/include/configs/mx53cx9020.h
> +++ b/include/configs/mx53cx9020.h
> @@ -160,7 +160,5 @@
>
> /* 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 6eca8b6027..b734b822dd 100644
> --- a/include/configs/mx53loco.h
> +++ b/include/configs/mx53loco.h
> @@ -176,8 +176,6 @@
> #endif
>
> /* Framebuffer and LCD */
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
> #define CONFIG_VIDEO_BMP_RLE8
> #define CONFIG_SPLASH_SCREEN
> #define CONFIG_BMP_16BPP
> diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
> index cde8fa210b..3cf2f1ce28 100644
> --- a/include/configs/mx6cuboxi.h
> +++ b/include/configs/mx6cuboxi.h
> @@ -49,18 +49,6 @@
> #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; " \
> - "setenv stdin serial,usbkbd; "\
> - "setenv stdout serial,vga; " \
> - "setenv stderr serial,vga; " \
> - "else " \
> - "setenv stdin serial; " \
> - "setenv stdout serial; " \
> - "setenv stderr serial; " \
> - "fi;"
>
> /* Command definition */
>
> diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
> index 3709fa6537..23c370b07c 100644
> --- a/include/configs/nitrogen6x.h
> +++ b/include/configs/nitrogen6x.h
> @@ -67,9 +67,6 @@
> #define CONFIG_IMX_HDMI
> #define CONFIG_IMX_VIDEO_SKIP
>
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT ""
> -
> #ifdef CONFIG_CMD_MMC
> #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
> #else
> diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
> index 43dfeeac32..f47d088303 100644
> --- a/include/configs/nokia_rx51.h
> +++ b/include/configs/nokia_rx51.h
> @@ -253,31 +253,6 @@ 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;" \
> - "if run switchmmc; then " \
> - "setenv mmcdone true;" \
> - "setenv mmctype fat;" \
> - "if run scriptload; then true; else " \
> - "setenv mmctype ext2;" \
> - "if run scriptload; then true; else " \
> - "setenv mmctype ext4;" \
> - "if run scriptload; then true; else " \
> - "setenv mmcdone false;" \
> - "fi;" \
> - "fi;" \
> - "fi;" \
> - "if ${mmcdone}; then " \
> - "run scriptboot;" \
> - "fi;" \
> - "fi;" \
> - "if run slide; then true; else " \
> - "setenv bootmenu_delay 0;" \
> - "setenv bootdelay 0;" \
> - "fi"
> -
> #define CONFIG_POSTBOOTMENU \
> "echo;" \
> "echo Extra commands:;" \
> diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
> index 0bf2df22ea..e8c60838b7 100644
> --- a/include/configs/omap3_beagle.h
> +++ b/include/configs/omap3_beagle.h
> @@ -58,9 +58,6 @@
>
> /* TWL4030 LED Support */
>
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT "usb start"
> -
> #define MEM_LAYOUT_ENV_SETTINGS \
> DEFAULT_LINUX_BOOT_ENV
>
> diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
> index e2c3ce1200..71e86144dd 100644
> --- a/include/configs/omap3_logic.h
> +++ b/include/configs/omap3_logic.h
> @@ -56,11 +56,6 @@
>
> /* Environment information */
>
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT \
> - "setenv preboot;" \
> - "saveenv;"
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> DEFAULT_LINUX_BOOT_ENV \
> "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
> diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
> index d7dd77e535..309b4717c4 100644
> --- a/include/configs/opos6uldev.h
> +++ b/include/configs/opos6uldev.h
> @@ -76,8 +76,6 @@
> #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"
>
> #define CONFIG_EXTRA_ENV_SETTINGS \
> diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
> index 307797d0e3..7dfcccb82b 100644
> --- a/include/configs/ot1200.h
> +++ b/include/configs/ot1200.h
> @@ -77,9 +77,6 @@
> #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
> #endif
>
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT ""
> -
> /* Thermal support */
> #define CONFIG_IMX_THERMAL
>
> diff --git a/include/configs/platinum.h b/include/configs/platinum.h
> index ced843f97e..1b57e9931f 100644
> --- a/include/configs/platinum.h
> +++ b/include/configs/platinum.h
> @@ -102,8 +102,6 @@
> #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 afbf7a828d..c7aaafaad4 100644
> --- a/include/configs/qemu-arm.h
> +++ b/include/configs/qemu-arm.h
> @@ -32,8 +32,6 @@
>
> #include <config_distro_bootcmd.h>
>
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT "pci enum"
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "fdt_high=0xffffffff\0" \
> "initrd_high=0xffffffff\0" \
> diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
> index df22f780b0..ecea1d4765 100644
> --- a/include/configs/qemu-riscv.h
> +++ b/include/configs/qemu-riscv.h
> @@ -48,8 +48,4 @@
> "ramdisk_addr_r=0x88300000\0" \
> BOOTENV
>
> -#define CONFIG_PREBOOT \
> - "setenv fdt_addr ${fdtcontroladdr};" \
> - "fdt addr ${fdtcontroladdr};"
> -
Shouldn't this be added to qemu-riscv*_defconfig
(there are 4 of those)?
> #endif /* __CONFIG_H */
> diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
> index 9ad10e6c75..a5369996ff 100644
> --- a/include/configs/rk3036_common.h
> +++ b/include/configs/rk3036_common.h
> @@ -55,7 +55,4 @@
> 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 d93f8cc5c8..0b22345198 100644
> --- a/include/configs/rk3188_common.h
> +++ b/include/configs/rk3188_common.h
> @@ -62,7 +62,4 @@
>
> #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 d2394a9d1a..67bc465522 100644
> --- a/include/configs/rk322x_common.h
> +++ b/include/configs/rk322x_common.h
> @@ -54,7 +54,4 @@
> 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 50d6859d9b..004acbcf29 100644
> --- a/include/configs/rk3288_common.h
> +++ b/include/configs/rk3288_common.h
> @@ -63,7 +63,4 @@
> BOOTENV
> #endif
>
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
> -
> #endif
> diff --git a/include/configs/rpi.h b/include/configs/rpi.h
> index 0a612a642d..e706bea8cc 100644
> --- a/include/configs/rpi.h
> +++ b/include/configs/rpi.h
> @@ -73,8 +73,6 @@
> /* 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 f1ce7a0117..dd63adb6db 100644
> --- a/include/configs/siemens-am33x-common.h
> +++ b/include/configs/siemens-am33x-common.h
> @@ -189,8 +189,6 @@
> /* UBI Support */
>
> /* Commen environment */
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
> #define COMMON_ENV_DFU_ARGS "dfu_args=run bootargs_defaults;" \
> "setenv bootargs ${bootargs};" \
> "mtdparts default;" \
> diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h
> index 56876d3db5..2f60b6b1e7 100644
> --- a/include/configs/socfpga_dbm_soc1.h
> +++ b/include/configs/socfpga_dbm_soc1.h
> @@ -12,8 +12,6 @@
>
> /* 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
> #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
> diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
> index a2fc1033b3..590a9af274 100644
> --- a/include/configs/socfpga_mcvevk.h
> +++ b/include/configs/socfpga_mcvevk.h
> @@ -12,7 +12,6 @@
>
> /* Booting Linux */
> #define CONFIG_BOOTFILE "fitImage"
> -#define CONFIG_PREBOOT "run try_bootscript"
> #define CONFIG_BOOTCOMMAND "run mmc_mmc"
> #define CONFIG_LOADADDR 0x01000000
> #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
> diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
> index 05369e7225..6909e97e99 100644
> --- a/include/configs/socfpga_vining_fpga.h
> +++ b/include/configs/socfpga_vining_fpga.h
> @@ -33,17 +33,6 @@
> * 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}) => \" ; " \
> - "if gpio input 78 ; then " \
> - "setenv bootdelay 10 ; " \
> - "setenv boottype rcvr ; " \
> - "else " \
> - "setenv bootdelay 5 ; " \
> - "setenv boottype norm ; " \
> - "fi"
>
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "verify=n\0" \
> diff --git a/include/configs/socrates.h b/include/configs/socrates.h
> index 3e26476dea..ff2eb75c3b 100644
> --- a/include/configs/socrates.h
> +++ b/include/configs/socrates.h
> @@ -273,12 +273,6 @@
>
> #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"
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "netdev=eth0\0" \
> "consdev=ttyS0\0" \
> diff --git a/include/configs/strider.h b/include/configs/strider.h
> index 525b548344..e3d64e52aa 100644
> --- a/include/configs/strider.h
> +++ b/include/configs/strider.h
> @@ -436,9 +436,6 @@ 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 \
> "netdev=eth0\0" \
> "consoledev=ttyS1\0" \
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index 7d92c2177f..d7133a73fc 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -285,11 +285,6 @@ extern int soft_i2c_gpio_scl;
> #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
> #endif
>
> -#ifdef CONFIG_USB_KEYBOARD
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
> -#endif
> -
> #ifndef CONFIG_SPL_BUILD
>
> #ifdef CONFIG_ARM64
> diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
> index c935577f5d..11f76e777b 100644
> --- a/include/configs/tbs2910.h
> +++ b/include/configs/tbs2910.h
> @@ -79,16 +79,6 @@
> #ifdef CONFIG_CMD_USB_MASS_STORAGE
> #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 " \
> - "run set_con_hdmi; " \
> - "else " \
> - "run set_con_serial; " \
> - "fi"
> -#endif /* CONFIG_USB_KEYBOARD */
> #endif /* CONFIG_CMD_USB */
>
> /* Environment organization */
> diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
> index f19218799d..fae0e761fb 100644
> --- a/include/configs/tegra-common-post.h
> +++ b/include/configs/tegra-common-post.h
> @@ -42,8 +42,6 @@
>
> #ifdef CONFIG_USB_KEYBOARD
> #define STDIN_KBD_USB ",usbkbd"
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT "usb start"
> #else
> #define STDIN_KBD_USB ""
> #endif
> diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
> index ac7ee2eda5..0c563e714d 100644
> --- a/include/configs/theadorable-x86-common.h
> +++ b/include/configs/theadorable-x86-common.h
> @@ -13,9 +13,6 @@
>
> #define CONFIG_SYS_MONITOR_LEN (1 << 20)
>
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
> -
> #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \
> "stdout=serial\0" \
> "stderr=serial\0"
> diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
> index d28978467b..3562a14261 100644
> --- a/include/configs/theadorable.h
> +++ b/include/configs/theadorable.h
> @@ -47,9 +47,6 @@
>
> #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 */
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "fdt_high=0x10000000\0" \
> diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
> index 3d48ab2352..a915c32607 100644
> --- a/include/configs/topic_miami.h
> +++ b/include/configs/topic_miami.h
> @@ -79,9 +79,6 @@
> # define EXTRA_ENV_USB
> #endif
>
> -#define CONFIG_USE_PREBOOT
> -#undef CONFIG_PREBOOT
> -
> #undef CONFIG_EXTRA_ENV_SETTINGS
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "kernel_image=uImage\0" \
> diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
> index fc0fe1504c..7d5f5fa409 100644
> --- a/include/configs/turris_mox.h
> +++ b/include/configs/turris_mox.h
> @@ -21,8 +21,6 @@
> #define CONFIG_SYS_SDRAM_BASE 0x00000000
>
> /* auto boot */
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
>
> #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
> 115200, 230400, 460800, 921600 }
> diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
> index 710bcaeb1a..23f0389615 100644
> --- a/include/configs/xpedite517x.h
> +++ b/include/configs/xpedite517x.h
> @@ -472,8 +472,6 @@ 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 ee22042a81..21e91ee1a4 100644
> --- a/include/configs/xpedite520x.h
> +++ b/include/configs/xpedite520x.h
> @@ -271,8 +271,6 @@
> */
> #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 c33a6e018a..73e1fa313f 100644
> --- a/include/configs/xpedite537x.h
> +++ b/include/configs/xpedite537x.h
> @@ -322,8 +322,6 @@ 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 f42987cf70..e5a41abd4b 100644
> --- a/include/configs/xpedite550x.h
> +++ b/include/configs/xpedite550x.h
> @@ -320,8 +320,6 @@ 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 bc9419225f..9d683768f4 100644
> --- a/include/configs/zmx25.h
> +++ b/include/configs/zmx25.h
> @@ -98,9 +98,6 @@
> #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 ""
> -
>
> /*
> * Size of malloc() pool
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index 388bb498ca..3ae968642c 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -103,8 +103,6 @@
> #define CONFIG_ENV_OVERWRITE
>
> /* enable preboot to be loaded before CONFIG_BOOTDELAY */
> -#define CONFIG_USE_PREBOOT
> -#define CONFIG_PREBOOT
>
> /* Boot configuration */
> #define CONFIG_SYS_LOAD_ADDR 0 /* default? */
> --
> 2.22.0.657.g960e92d24f-goog
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
^ permalink raw reply [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (17 preceding siblings ...)
2019-07-21 2:51 ` [U-Boot] [PATCH v2 18/18] autoboot: Adjust the implementation in autoboot_command() Simon Glass
@ 2019-07-23 22:00 ` Lukasz Majewski
2019-08-02 22:06 ` Tom Rini
19 siblings, 0 replies; 25+ messages in thread
From: Lukasz Majewski @ 2019-07-23 22:00 UTC (permalink / raw)
To: u-boot
Hi Simon,
> This series cleans up autoboot.c a bit to:
>
> - Convert options to Kconfig
> - Use C code instead of C preprocessor where possible
> - Add a few comments
>
Thanks Simon for this clean up series.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
> Changes in v2:
> - Rebase to master
>
> Simon Glass (18):
> main: Use conditional run_preboot_environment_command()
> Convert CONFIG_SHOW_BOOT_PROGRESS to Kconfig
> Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT
> Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig
> autoboot: Use CONFIG_AUTOBOOT_STOP_STR_SHA256 indirectly
> autoboot: Drop #ifdef for CONFIG_AUTOBOOT_ENCRYPTION
> autoboot: Improve docs for CONFIG_AUTOBOOT_ENCRYPTION
> autoboot: Use if() for CONFIG_SILENT_CONSOLE
> autoboot: Drop #ifdef CONFIG_AUTOBOOT_KEYED
> autoboot: Drop unused CONFIG_MENUPROMPT
> autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY
> snow: Define CONFIG_AUTOBOOT_MENUKEY
> autoboot: Tidy up use of menukey
> autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOT
> Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig
> autoboot: Add comments for menu_show()
> autoboot: Move a few more options from #ifdef to if()
> autoboot: Adjust the implementation in autoboot_command()
>
> README | 167
> +----------------- cmd/Kconfig |
> 34 +++- cmd/bootmenu.c | 2 +-
> common/Kconfig | 162 +++++++++++++++++
> common/autoboot.c | 121 +++++++------
> common/main.c | 5 +-
> configs/A10-OLinuXino-Lime_defconfig | 1 +
> configs/A10s-OLinuXino-M_defconfig | 1 +
> configs/A13-OLinuXinoM_defconfig | 1 +
> configs/A13-OLinuXino_defconfig | 1 +
> configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
> configs/A20-OLinuXino-Lime2_defconfig | 1 +
> configs/A20-OLinuXino-Lime_defconfig | 1 +
> configs/A20-OLinuXino_MICRO-eMMC_defconfig | 1 +
> configs/A20-OLinuXino_MICRO_defconfig | 1 +
> configs/A20-Olimex-SOM-EVB_defconfig | 1 +
> configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 +
> configs/A20-Olimex-SOM204-EVB_defconfig | 1 +
> configs/A33-OLinuXino_defconfig | 1 +
> configs/Ainol_AW1_defconfig | 1 +
> configs/Ampe_A76_defconfig | 1 +
> configs/Auxtek-T003_defconfig | 1 +
> configs/Auxtek-T004_defconfig | 1 +
> configs/Bananapi_M2_Ultra_defconfig | 1 +
> configs/Bananapi_defconfig | 1 +
> configs/Bananapi_m2m_defconfig | 1 +
> configs/Bananapro_defconfig | 1 +
> configs/CHIP_defconfig | 1 +
> configs/CHIP_pro_defconfig | 1 +
> configs/CSQ_CS908_defconfig | 1 +
> configs/Chuwi_V7_CW0825_defconfig | 1 +
> configs/Colombus_defconfig | 1 +
> configs/Cubieboard2_defconfig | 1 +
> configs/Cubieboard4_defconfig | 1 +
> configs/Cubieboard_defconfig | 1 +
> configs/Cubietruck_defconfig | 1 +
> configs/Cubietruck_plus_defconfig | 1 +
> configs/Empire_electronix_d709_defconfig | 1 +
> configs/Empire_electronix_m712_defconfig | 1 +
> configs/Hummingbird_A31_defconfig | 1 +
> configs/Hyundai_A7HD_defconfig | 1 +
> configs/Itead_Ibox_A20_defconfig | 1 +
> configs/Lamobo_R1_defconfig | 1 +
> configs/LicheePi_Zero_defconfig | 1 +
> configs/Linksprite_pcDuino3_Nano_defconfig | 1 +
> configs/Linksprite_pcDuino3_defconfig | 1 +
> configs/Linksprite_pcDuino_defconfig | 1 +
> configs/MK808C_defconfig | 1 +
> configs/MPC8349EMDS_PCI64_defconfig | 2 +
> configs/MPC8349EMDS_SLAVE_defconfig | 2 +
> configs/MPC8349EMDS_defconfig | 2 +
> configs/MSI_Primo73_defconfig | 1 +
> configs/MSI_Primo81_defconfig | 1 +
> configs/Marsboard_A10_defconfig | 1 +
> configs/Mele_A1000G_quad_defconfig | 1 +
> configs/Mele_A1000_defconfig | 1 +
> configs/Mele_I7_defconfig | 1 +
> configs/Mele_M3_defconfig | 1 +
> configs/Mele_M5_defconfig | 1 +
> configs/Mele_M9_defconfig | 1 +
> configs/Merrii_A80_Optimus_defconfig | 1 +
> configs/Mini-X_defconfig | 1 +
> .../Nintendo_NES_Classic_Edition_defconfig | 1 +
> configs/Orangepi_defconfig | 1 +
> configs/Orangepi_mini_defconfig | 1 +
> configs/Sinlinx_SinA31s_defconfig | 1 +
> configs/Sinlinx_SinA33_defconfig | 1 +
> configs/Sinovoip_BPI_M2_defconfig | 1 +
> configs/Sinovoip_BPI_M3_defconfig | 1 +
> configs/Sunchip_CX-A99_defconfig | 1 +
> configs/TQM834x_defconfig | 2 +
> configs/UTOO_P66_defconfig | 1 +
> configs/Wexler_TAB7200_defconfig | 1 +
> configs/Wits_Pro_A20_DKT_defconfig | 1 +
> configs/Wobo_i5_defconfig | 1 +
> configs/Yones_Toptech_BD1078_defconfig | 1 +
> configs/Yones_Toptech_BS1078_V2_defconfig | 1 +
> configs/a64-olinuxino_defconfig | 1 +
> configs/am335x_shc_defconfig | 1 +
> configs/am335x_shc_ict_defconfig | 1 +
> configs/am335x_shc_netboot_defconfig | 1 +
> configs/am335x_shc_sdboot_defconfig | 1 +
> configs/amarula_a64_relic_defconfig | 1 +
> configs/apf27_defconfig | 2 +
> configs/arndale_defconfig | 1 +
> configs/aspenite_defconfig | 1 +
> configs/ba10_tv_box_defconfig | 1 +
> configs/bananapi_m1_plus_defconfig | 1 +
> configs/bananapi_m2_berry_defconfig | 1 +
> configs/bananapi_m2_plus_h3_defconfig | 1 +
> configs/bananapi_m2_plus_h5_defconfig | 1 +
> configs/bananapi_m2_zero_defconfig | 1 +
> configs/bananapi_m64_defconfig | 1 +
> configs/bayleybay_defconfig | 1 +
> configs/bcm7260_defconfig | 2 +
> configs/bcm7445_defconfig | 2 +
> configs/beelink_gs1_defconfig | 1 +
> configs/beelink_x2_defconfig | 5 +-
> configs/bitmain_antminer_s9_defconfig | 1 +
> configs/bk4r1_defconfig | 1 +
> configs/brppt1_mmc_defconfig | 2 +
> configs/brppt1_nand_defconfig | 2 +
> configs/brppt1_spi_defconfig | 4 +-
> configs/brxre1_defconfig | 2 +
> configs/cherryhill_defconfig | 1 +
> configs/chromebit_mickey_defconfig | 2 +-
> configs/chromebook_jerry_defconfig | 2 +-
> configs/chromebook_link64_defconfig | 1 +
> configs/chromebook_link_defconfig | 1 +
> configs/chromebook_minnie_defconfig | 2 +-
> configs/chromebook_samus_defconfig | 1 +
> configs/chromebook_samus_tpl_defconfig | 1 +
> configs/chromebook_speedy_defconfig | 2 +-
> configs/chromebox_panther_defconfig | 1 +
> configs/clearfog_defconfig | 1 +
> configs/clearfog_gt_8k_defconfig | 1 +
> configs/cm_fx6_defconfig | 2 +
> configs/colorfly_e708_q1_defconfig | 1 +
> ...-qeval20-qa3-e3845-internal-uart_defconfig | 2 +
> configs/conga-qeval20-qa3-e3845_defconfig | 2 +
> configs/controlcenterdc_defconfig | 1 +
> configs/coreboot_defconfig | 1 +
> configs/cougarcanyon2_defconfig | 1 +
> configs/crownbay_defconfig | 1 +
> configs/crs305-1g-4s_defconfig | 3 +-
> configs/d2net_v2_defconfig | 1 +
> configs/db-88f6720_defconfig | 1 +
> configs/db-88f6820-amc_defconfig | 1 +
> configs/db-88f6820-gp_defconfig | 1 +
> configs/db-mv784mp-gp_defconfig | 1 +
> configs/db-xc3-24g4xg_defconfig | 1 +
> configs/dfi-bt700-q7x-151_defconfig | 2 +
> configs/difrnce_dit4350_defconfig | 1 +
> configs/dns325_defconfig | 1 +
> configs/dockstar_defconfig | 1 +
> configs/draco_defconfig | 1 +
> configs/dreamplug_defconfig | 1 +
> configs/ds109_defconfig | 1 +
> configs/ds414_defconfig | 2 +
> configs/dserve_dsrv9703c_defconfig | 1 +
> configs/efi-x86_app_defconfig | 1 +
> configs/efi-x86_payload32_defconfig | 1 +
> configs/efi-x86_payload64_defconfig | 1 +
> configs/emlid_neutis_n5_devboard_defconfig | 1 +
> configs/etamin_defconfig | 1 +
> configs/evb-rk3036_defconfig | 1 +
> configs/evb-rk3229_defconfig | 3 +-
> configs/evb-rk3288_defconfig | 2 +-
> configs/fennec-rk3288_defconfig | 2 +-
> configs/firefly-rk3288_defconfig | 2 +-
> configs/ga10h_v1_1_defconfig | 1 +
> configs/galileo_defconfig | 1 +
> configs/goflexhome_defconfig | 1 +
> configs/gplugd_defconfig | 1 +
> configs/gt90h_v4_defconfig | 1 +
> configs/guruplug_defconfig | 1 +
> configs/gwventana_emmc_defconfig | 1 +
> configs/gwventana_gw5904_defconfig | 1 +
> configs/gwventana_nand_defconfig | 1 +
> configs/h8_homlet_v2_defconfig | 1 +
> configs/helios4_defconfig | 1 +
> configs/hrcon_defconfig | 1 +
> configs/hrcon_dh_defconfig | 1 +
> configs/i12-tvbox_defconfig | 1 +
> configs/iNet_3F_defconfig | 1 +
> configs/iNet_3W_defconfig | 1 +
> configs/iNet_86VS_defconfig | 1 +
> configs/iNet_D978_rev2_defconfig | 1 +
> configs/ib62x0_defconfig | 1 +
> configs/icnova-a20-swac_defconfig | 1 +
> configs/iconnect_defconfig | 1 +
> configs/ids8313_defconfig | 2 +
> configs/inet1_defconfig | 1 +
> configs/inet86dz_defconfig | 1 +
> configs/inet97fv2_defconfig | 1 +
> configs/inet98v_rev2_defconfig | 1 +
> configs/inet9f_rev03_defconfig | 1 +
> configs/inet_q972_defconfig | 1 +
> configs/inetspace_v2_defconfig | 1 +
> configs/jesurun_q5_defconfig | 1 +
> configs/kylin-rk3036_defconfig | 1 +
> configs/libretech-ac_defconfig | 2 +
> configs/libretech_all_h3_cc_h2_plus_defconfig | 1 +
> configs/libretech_all_h3_cc_h3_defconfig | 1 +
> configs/libretech_all_h3_cc_h5_defconfig | 1 +
> configs/lschlv2_defconfig | 2 +
> configs/lsxhl_defconfig | 2 +
> configs/m53menlo_defconfig | 2 +
> configs/maxbcm_defconfig | 1 +
> configs/meesc_dataflash_defconfig | 3 +-
> configs/meesc_defconfig | 1 +
> configs/microblaze-generic_defconfig | 2 +
> configs/minnowmax_defconfig | 1 +
> configs/miqi-rk3288_defconfig | 2 +-
> configs/mixtile_loftq_defconfig | 1 +
> configs/mk802_a10s_defconfig | 1 +
> configs/mk802_defconfig | 1 +
> configs/mk802ii_defconfig | 1 +
> configs/mvebu_db-88f3720_defconfig | 1 +
> configs/mvebu_db_armada8k_defconfig | 1 +
> configs/mvebu_espressobin-88f3720_defconfig | 1 +
> configs/mvebu_mcbin-88f8040_defconfig | 1 +
> configs/mx51evk_defconfig | 1 +
> configs/mx53cx9020_defconfig | 1 +
> configs/mx53loco_defconfig | 1 +
> configs/mx6cuboxi_defconfig | 2 +
> configs/mx6qsabrelite_defconfig | 1 +
> configs/nanopi_a64_defconfig | 1 +
> configs/nanopi_m1_defconfig | 1 +
> configs/nanopi_m1_plus_defconfig | 1 +
> configs/nanopi_neo2_defconfig | 1 +
> configs/nanopi_neo_air_defconfig | 1 +
> configs/nanopi_neo_defconfig | 1 +
> configs/nanopi_neo_plus2_defconfig | 1 +
> configs/nas220_defconfig | 1 +
> configs/net2big_v2_defconfig | 1 +
> configs/netspace_lite_v2_defconfig | 1 +
> configs/netspace_max_v2_defconfig | 1 +
> configs/netspace_mini_v2_defconfig | 1 +
> configs/netspace_v2_defconfig | 1 +
> configs/nitrogen6dl2g_defconfig | 1 +
> configs/nitrogen6dl_defconfig | 1 +
> configs/nitrogen6q2g_defconfig | 1 +
> configs/nitrogen6q_defconfig | 1 +
> configs/nitrogen6s1g_defconfig | 1 +
> configs/nitrogen6s_defconfig | 1 +
> configs/nokia_rx51_defconfig | 3 +
> configs/nsa310s_defconfig | 1 +
> configs/oceanic_5205_5inmfd_defconfig | 1 +
> configs/omap35_logic_defconfig | 2 +
> configs/omap35_logic_somlv_defconfig | 2 +
> configs/omap3_beagle_defconfig | 2 +
> configs/omap3_evm_defconfig | 1 +
> configs/omap3_logic_defconfig | 2 +
> configs/omap3_logic_somlv_defconfig | 2 +
> configs/openrd_base_defconfig | 1 +
> configs/openrd_client_defconfig | 1 +
> configs/openrd_ultimate_defconfig | 1 +
> configs/opos6uldev_defconfig | 2 +
> configs/orangepi_2_defconfig | 1 +
> configs/orangepi_lite2_defconfig | 1 +
> configs/orangepi_lite_defconfig | 1 +
> configs/orangepi_one_defconfig | 1 +
> configs/orangepi_one_plus_defconfig | 1 +
> configs/orangepi_pc2_defconfig | 1 +
> configs/orangepi_pc_defconfig | 1 +
> configs/orangepi_pc_plus_defconfig | 1 +
> configs/orangepi_plus2e_defconfig | 1 +
> configs/orangepi_plus_defconfig | 1 +
> configs/orangepi_prime_defconfig | 1 +
> configs/orangepi_r1_defconfig | 1 +
> configs/orangepi_win_defconfig | 1 +
> configs/orangepi_zero_defconfig | 1 +
> configs/orangepi_zero_plus2_defconfig | 1 +
> configs/orangepi_zero_plus_defconfig | 1 +
> configs/ot1200_defconfig | 1 +
> configs/ot1200_spl_defconfig | 1 +
> configs/parrot_r16_defconfig | 1 +
> configs/phycore-rk3288_defconfig | 2 +-
> configs/pine64-lts_defconfig | 1 +
> configs/pine64_plus_defconfig | 1 +
> configs/pine_h64_defconfig | 3 +-
> configs/pinebook_defconfig | 1 +
> configs/platinum_picon_defconfig | 1 +
> configs/platinum_titanium_defconfig | 1 +
> configs/pogo_e02_defconfig | 1 +
> configs/polaroid_mid2407pxe03_defconfig | 1 +
> configs/polaroid_mid2809pxe04_defconfig | 1 +
> configs/popmetal-rk3288_defconfig | 2 +-
> configs/pov_protab2_ips9_defconfig | 1 +
> configs/pxm2_defconfig | 1 +
> configs/q8_a13_tablet_defconfig | 1 +
> configs/q8_a23_tablet_800x480_defconfig | 1 +
> configs/q8_a33_tablet_1024x600_defconfig | 1 +
> configs/q8_a33_tablet_800x480_defconfig | 1 +
> configs/qemu-x86_64_defconfig | 1 +
> configs/qemu-x86_defconfig | 1 +
> configs/qemu_arm64_defconfig | 2 +
> configs/qemu_arm_defconfig | 2 +
> configs/r7-tv-dongle_defconfig | 1 +
> configs/rastaban_defconfig | 1 +
> configs/rock2_defconfig | 2 +-
> configs/rock_defconfig | 1 +
> configs/rpi_0_w_defconfig | 2 +
> configs/rpi_2_defconfig | 2 +
> configs/rpi_3_32b_defconfig | 2 +
> configs/rpi_3_b_plus_defconfig | 4 +-
> configs/rpi_3_defconfig | 2 +
> configs/rpi_defconfig | 2 +
> configs/rut_defconfig | 1 +
> configs/seaboard_defconfig | 2 +
> configs/sheevaplug_defconfig | 1 +
> configs/snow_defconfig | 2 +
> configs/socfpga_dbm_soc1_defconfig | 2 +
> configs/socfpga_vining_fpga_defconfig | 2 +
> configs/socrates_defconfig | 2 +
> configs/som-db5800-som-6867_defconfig | 1 +
> configs/sopine_baseboard_defconfig | 1 +
> configs/strider_con_defconfig | 1 +
> configs/strider_con_dp_defconfig | 1 +
> configs/strider_cpu_defconfig | 1 +
> configs/strider_cpu_dp_defconfig | 1 +
> configs/sun8i_a23_evb_defconfig | 1 +
> configs/sunxi_Gemei_G9_defconfig | 1 +
> configs/syzygy_hub_defconfig | 1 +
> configs/tbs2910_defconfig | 2 +
> configs/tbs_a711_defconfig | 1 +
> configs/teres_i_defconfig | 1 +
> ...able-x86-conga-qa3-e3845-pcie-x4_defconfig | 2 +
> .../theadorable-x86-conga-qa3-e3845_defconfig | 2 +
> configs/theadorable-x86-dfi-bt700_defconfig | 2 +
> configs/theadorable_debug_defconfig | 1 +
> configs/thuban_defconfig | 1 +
> configs/tinker-rk3288_defconfig | 2 +-
> configs/topic_miami_defconfig | 1 +
> configs/topic_miamilite_defconfig | 1 +
> configs/topic_miamiplus_defconfig | 1 +
> configs/turris_mox_defconfig | 1 +
> configs/turris_omnia_defconfig | 1 +
> configs/uDPU_defconfig | 1 +
> configs/ventana_defconfig | 2 +
> configs/vyasa-rk3288_defconfig | 2 +-
> configs/xpedite517x_defconfig | 1 +
> configs/xpedite520x_defconfig | 1 +
> configs/xpedite537x_defconfig | 1 +
> configs/xpedite550x_defconfig | 1 +
> configs/xtfpga_defconfig | 1 +
> configs/zmx25_defconfig | 1 +
> configs/zynq_cc108_defconfig | 1 +
> configs/zynq_cse_nand_defconfig | 1 +
> configs/zynq_cse_nor_defconfig | 1 +
> configs/zynq_cse_qspi_defconfig | 1 +
> configs/zynq_dlc20_rev1_0_defconfig | 1 +
> configs/zynq_microzed_defconfig | 1 +
> configs/zynq_minized_defconfig | 1 +
> configs/zynq_picozed_defconfig | 1 +
> configs/zynq_z_turn_defconfig | 1 +
> configs/zynq_zc702_defconfig | 1 +
> configs/zynq_zc706_defconfig | 1 +
> configs/zynq_zc770_xm010_defconfig | 1 +
> configs/zynq_zc770_xm011_defconfig | 1 +
> configs/zynq_zc770_xm011_x16_defconfig | 1 +
> configs/zynq_zc770_xm012_defconfig | 1 +
> configs/zynq_zc770_xm013_defconfig | 1 +
> configs/zynq_zed_defconfig | 1 +
> configs/zynq_zybo_defconfig | 1 +
> configs/zynq_zybo_z7_defconfig | 1 +
> doc/README.autoboot | 23 +++
> doc/README.bootmenu | 2 +-
> doc/README.menu | 2 +-
> include/autoboot.h | 2 +-
> include/configs/MPC8349EMDS.h | 4 -
> include/configs/MPC8349EMDS_SDRAM.h | 4 -
> include/configs/MigoR.h | 1 -
> include/configs/TQM834x.h | 4 -
> include/configs/am335x_shc.h | 2 -
> include/configs/am3517_crane.h | 9 -
> include/configs/am3517_evm.h | 12 --
> include/configs/apf27.h | 1 -
> include/configs/armadillo-800eva.h | 2 -
> include/configs/arndale.h | 2 -
> include/configs/bcmstb.h | 4 -
> include/configs/bk4r1.h | 1 -
> include/configs/bur_cfg_common.h | 2 -
> include/configs/cm_fx6.h | 2 -
> include/configs/conga-qeval20-qa3-e3845.h | 2 -
> include/configs/controlcenterdc.h | 2 -
> include/configs/dfi-bt700.h | 2 -
> include/configs/ds414.h | 2 -
> include/configs/gazerbeam.h | 2 -
> include/configs/gw_ventana.h | 1 -
> include/configs/hrcon.h | 2 -
> include/configs/ids8313.h | 3 -
> include/configs/kzm9g.h | 2 -
> include/configs/lsxl.h | 1 -
> include/configs/m53menlo.h | 1 -
> include/configs/meesc.h | 2 -
> include/configs/meson64.h | 1 -
> include/configs/microblaze-generic.h | 2 -
> 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 | 11 --
> include/configs/nitrogen6x.h | 2 -
> include/configs/nokia_rx51.h | 26 ---
> include/configs/omap3_beagle.h | 2 -
> include/configs/omap3_logic.h | 4 -
> include/configs/opos6uldev.h | 1 -
> include/configs/ot1200.h | 2 -
> include/configs/platinum.h | 1 -
> include/configs/qemu-arm.h | 1 -
> include/configs/qemu-riscv.h | 4 -
> include/configs/rcar-gen2-common.h | 2 -
> include/configs/rcar-gen3-common.h | 2 -
> include/configs/rk3036_common.h | 2 -
> include/configs/rk3188_common.h | 2 -
> include/configs/rk322x_common.h | 2 -
> include/configs/rk3288_common.h | 2 -
> include/configs/rpi.h | 1 -
> include/configs/sbc8548.h | 2 -
> include/configs/sh7752evb.h | 1 -
> include/configs/sh7753evb.h | 1 -
> include/configs/sh7757lcr.h | 1 -
> include/configs/sh7763rdp.h | 1 -
> include/configs/siemens-am33x-common.h | 1 -
> include/configs/socfpga_dbm_soc1.h | 1 -
> include/configs/socfpga_mcvevk.h | 1 -
> include/configs/socfpga_vining_fpga.h | 10 --
> include/configs/socrates.h | 5 -
> include/configs/strider.h | 2 -
> include/configs/sunxi-common.h | 4 -
> include/configs/tbs2910.h | 9 -
> include/configs/tegra-common-post.h | 1 -
> include/configs/theadorable-x86-common.h | 2 -
> include/configs/theadorable.h | 2 -
> include/configs/topic_miami.h | 2 -
> include/configs/turris_mox.h | 1 -
> include/configs/vexpress_aemv8a.h | 2 -
> include/configs/x86-common.h | 1 -
> include/configs/xpedite517x.h | 1 -
> include/configs/xpedite520x.h | 1 -
> include/configs/xpedite537x.h | 1 -
> include/configs/xpedite550x.h | 1 -
> include/configs/xtfpga.h | 1 -
> include/configs/zmx25.h | 2 -
> include/configs/zynq-common.h | 1 -
> include/menu.h | 17 +-
> scripts/config_whitelist.txt | 5 +-
> 431 files changed, 709 insertions(+), 458 deletions(-)
>
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190724/2fed49c5/attachment.sig>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
` (18 preceding siblings ...)
2019-07-23 22:00 ` [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Lukasz Majewski
@ 2019-08-02 22:06 ` Tom Rini
19 siblings, 0 replies; 25+ messages in thread
From: Tom Rini @ 2019-08-02 22:06 UTC (permalink / raw)
To: u-boot
On Sat, Jul 20, 2019 at 08:51:10PM -0600, Simon Glass wrote:
> This series cleans up autoboot.c a bit to:
>
> - Convert options to Kconfig
> - Use C code instead of C preprocessor where possible
> - Add a few comments
>
> Changes in v2:
> - Rebase to master
>
> Simon Glass (18):
> main: Use conditional run_preboot_environment_command()
> Convert CONFIG_SHOW_BOOT_PROGRESS to Kconfig
> Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT
> Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig
> autoboot: Use CONFIG_AUTOBOOT_STOP_STR_SHA256 indirectly
> autoboot: Drop #ifdef for CONFIG_AUTOBOOT_ENCRYPTION
> autoboot: Improve docs for CONFIG_AUTOBOOT_ENCRYPTION
> autoboot: Use if() for CONFIG_SILENT_CONSOLE
> autoboot: Drop #ifdef CONFIG_AUTOBOOT_KEYED
> autoboot: Drop unused CONFIG_MENUPROMPT
> autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY
> snow: Define CONFIG_AUTOBOOT_MENUKEY
> autoboot: Tidy up use of menukey
> autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOT
> Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig
> autoboot: Add comments for menu_show()
> autoboot: Move a few more options from #ifdef to if()
> autoboot: Adjust the implementation in autoboot_command()
For the series, applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190802/29ada827/attachment.sig>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 13/18] autoboot: Tidy up use of menukey
2019-07-21 2:51 ` [U-Boot] [PATCH v2 13/18] autoboot: Tidy up use of menukey Simon Glass
@ 2020-05-04 21:26 ` Da Xue
2020-05-04 21:31 ` Da Xue
0 siblings, 1 reply; 25+ messages in thread
From: Da Xue @ 2020-05-04 21:26 UTC (permalink / raw)
To: u-boot
Hi Simon,
The Kconfig doesn't match the common/autoboot.c. Kconfig is using
AUTOBOOT_USE_MENUKEY and common/autoboot.c is CONFIG_USE_AUTOBOOT_MENUKEY.
Best,
Da
On Sat, Jul 20, 2019 at 11:56 PM Simon Glass <sjg@chromium.org> wrote:
> Move the variable to the top of the file and adjust the code which uses it
> to use if() rather than #ifdef, to make it easier to read.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
> common/autoboot.c | 26 ++++++++++++++------------
> 1 file changed, 14 insertions(+), 12 deletions(-)
>
> diff --git a/common/autoboot.c b/common/autoboot.c
> index ad189a8ba2..9752470873 100644
> --- a/common/autoboot.c
> +++ b/common/autoboot.c
> @@ -28,6 +28,7 @@ DECLARE_GLOBAL_DATA_PTR;
>
> /* Stored value of bootdelay, used by autoboot_command() */
> static int stored_bootdelay;
> +static int menukey;
>
> #ifdef CONFIG_AUTOBOOT_ENCRYPTION
> #define AUTOBOOT_STOP_STR_SHA256 CONFIG_AUTOBOOT_STOP_STR_SHA256
> @@ -35,6 +36,12 @@ static int stored_bootdelay;
> #define AUTOBOOT_STOP_STR_SHA256 ""
> #endif
>
> +#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
> +#define AUTOBOOT_MENUKEY CONFIG_USE_AUTOBOOT_MENUKEY
> +#else
> +#define AUTOBOOT_MENUKEY 0
> +#endif
> +
> /*
> * Use a "constant-length" time compare function for this
> * hash compare:
> @@ -224,10 +231,6 @@ static int abortboot_key_sequence(int bootdelay)
> return abort;
> }
>
> -#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
> -static int menukey;
> -#endif
> -
> static int abortboot_single_key(int bootdelay)
> {
> int abort = 0;
> @@ -250,13 +253,13 @@ static int abortboot_single_key(int bootdelay)
> ts = get_timer(0);
> do {
> if (tstc()) { /* we got a key press */
> + int key;
> +
> abort = 1; /* don't auto boot */
> bootdelay = 0; /* no more delay */
> -# ifdef CONFIG_USE_AUTOBOOT_MENUKEY
> - menukey = getc();
> -# else
> - (void) getc(); /* consume input */
> -# endif
> + key = getc(); /* consume input */
> + if
> (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY))
> + menukey = key;
> break;
> }
> udelay(10000);
> @@ -358,11 +361,10 @@ void autoboot_command(const char *s)
> #endif
> }
>
> -#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
> - if (menukey == CONFIG_AUTOBOOT_MENUKEY) {
> + if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY) &&
> + menukey == AUTOBOOT_MENUKEY) {
> s = env_get("menucmd");
> if (s)
> run_command_list(s, -1, 0);
> }
> -#endif /* CONFIG_USE_AUTOBOOT_MENUKEY */
> }
> --
> 2.22.0.657.g960e92d24f-goog
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 13/18] autoboot: Tidy up use of menukey
2020-05-04 21:26 ` Da Xue
@ 2020-05-04 21:31 ` Da Xue
2020-05-06 14:47 ` Simon Glass
0 siblings, 1 reply; 25+ messages in thread
From: Da Xue @ 2020-05-04 21:31 UTC (permalink / raw)
To: u-boot
Hi Simon,
I think there's something funny going on with this line: #define
AUTOBOOT_MENUKEY CONFIG_USE_AUTOBOOT_MENUKEY
Did you mean: #define AUTOBOOT_MENUKEY CONFIG_AUTOBOOT_MENUKEY?
Best,
Da
On Mon, May 4, 2020 at 5:26 PM Da Xue <da@lessconfused.com> wrote:
> Hi Simon,
>
> The Kconfig doesn't match the common/autoboot.c. Kconfig is using
> AUTOBOOT_USE_MENUKEY and common/autoboot.c is CONFIG_USE_AUTOBOOT_MENUKEY.
>
> Best,
> Da
>
> On Sat, Jul 20, 2019 at 11:56 PM Simon Glass <sjg@chromium.org> wrote:
>
>> Move the variable to the top of the file and adjust the code which uses it
>> to use if() rather than #ifdef, to make it easier to read.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>> Changes in v2: None
>>
>> common/autoboot.c | 26 ++++++++++++++------------
>> 1 file changed, 14 insertions(+), 12 deletions(-)
>>
>> diff --git a/common/autoboot.c b/common/autoboot.c
>> index ad189a8ba2..9752470873 100644
>> --- a/common/autoboot.c
>> +++ b/common/autoboot.c
>> @@ -28,6 +28,7 @@ DECLARE_GLOBAL_DATA_PTR;
>>
>> /* Stored value of bootdelay, used by autoboot_command() */
>> static int stored_bootdelay;
>> +static int menukey;
>>
>> #ifdef CONFIG_AUTOBOOT_ENCRYPTION
>> #define AUTOBOOT_STOP_STR_SHA256 CONFIG_AUTOBOOT_STOP_STR_SHA256
>> @@ -35,6 +36,12 @@ static int stored_bootdelay;
>> #define AUTOBOOT_STOP_STR_SHA256 ""
>> #endif
>>
>> +#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
>> +#define AUTOBOOT_MENUKEY CONFIG_USE_AUTOBOOT_MENUKEY
>> +#else
>> +#define AUTOBOOT_MENUKEY 0
>> +#endif
>> +
>> /*
>> * Use a "constant-length" time compare function for this
>> * hash compare:
>> @@ -224,10 +231,6 @@ static int abortboot_key_sequence(int bootdelay)
>> return abort;
>> }
>>
>> -#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
>> -static int menukey;
>> -#endif
>> -
>> static int abortboot_single_key(int bootdelay)
>> {
>> int abort = 0;
>> @@ -250,13 +253,13 @@ static int abortboot_single_key(int bootdelay)
>> ts = get_timer(0);
>> do {
>> if (tstc()) { /* we got a key press */
>> + int key;
>> +
>> abort = 1; /* don't auto boot */
>> bootdelay = 0; /* no more delay */
>> -# ifdef CONFIG_USE_AUTOBOOT_MENUKEY
>> - menukey = getc();
>> -# else
>> - (void) getc(); /* consume input */
>> -# endif
>> + key = getc(); /* consume input */
>> + if
>> (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY))
>> + menukey = key;
>> break;
>> }
>> udelay(10000);
>> @@ -358,11 +361,10 @@ void autoboot_command(const char *s)
>> #endif
>> }
>>
>> -#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
>> - if (menukey == CONFIG_AUTOBOOT_MENUKEY) {
>> + if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY) &&
>> + menukey == AUTOBOOT_MENUKEY) {
>> s = env_get("menucmd");
>> if (s)
>> run_command_list(s, -1, 0);
>> }
>> -#endif /* CONFIG_USE_AUTOBOOT_MENUKEY */
>> }
>> --
>> 2.22.0.657.g960e92d24f-goog
>>
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot at lists.denx.de
>> https://lists.denx.de/listinfo/u-boot
>>
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [U-Boot] [PATCH v2 13/18] autoboot: Tidy up use of menukey
2020-05-04 21:31 ` Da Xue
@ 2020-05-06 14:47 ` Simon Glass
0 siblings, 0 replies; 25+ messages in thread
From: Simon Glass @ 2020-05-06 14:47 UTC (permalink / raw)
To: u-boot
Hi Da,
On Mon, 4 May 2020 at 15:31, Da Xue <da@lessconfused.com> wrote:
>
> Hi Simon,
>
> I think there's something funny going on with this line: #define AUTOBOOT_MENUKEY CONFIG_USE_AUTOBOOT_MENUKEY
> Did you mean: #define AUTOBOOT_MENUKEY CONFIG_AUTOBOOT_MENUKEY?
>
> Best,
> Da
>
> On Mon, May 4, 2020 at 5:26 PM Da Xue <da@lessconfused.com> wrote:
>>
>> Hi Simon,
>>
>> The Kconfig doesn't match the common/autoboot.c. Kconfig is using AUTOBOOT_USE_MENUKEY and common/autoboot.c is CONFIG_USE_AUTOBOOT_MENUKEY.
Yes that looks wrong. Can you send a patch?
Regards,
Simon
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2020-05-06 14:47 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-21 2:51 [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 01/18] main: Use conditional run_preboot_environment_command() Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 02/18] Convert CONFIG_SHOW_BOOT_PROGRESS to Kconfig Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 03/18] Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOT Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 04/18] Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig Simon Glass
2019-07-23 17:23 ` David Abdurachmanov
2019-07-21 2:51 ` [U-Boot] [PATCH v2 05/18] autoboot: Use CONFIG_AUTOBOOT_STOP_STR_SHA256 indirectly Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 06/18] autoboot: Drop #ifdef for CONFIG_AUTOBOOT_ENCRYPTION Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 07/18] autoboot: Improve docs " Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 08/18] autoboot: Use if() for CONFIG_SILENT_CONSOLE Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 09/18] autoboot: Drop #ifdef CONFIG_AUTOBOOT_KEYED Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 10/18] autoboot: Drop unused CONFIG_MENUPROMPT Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 11/18] autoboot: Rename CONFIG_MENUKEY to CONFIG_AUTOBOOT_MENUKEY Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 12/18] snow: Define CONFIG_AUTOBOOT_MENUKEY Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 13/18] autoboot: Tidy up use of menukey Simon Glass
2020-05-04 21:26 ` Da Xue
2020-05-04 21:31 ` Da Xue
2020-05-06 14:47 ` Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 14/18] autoboot: Rename CONFIG_MENU_SHOW to include AUTOBOOT Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 15/18] Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 16/18] autoboot: Add comments for menu_show() Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 17/18] autoboot: Move a few more options from #ifdef to if() Simon Glass
2019-07-21 2:51 ` [U-Boot] [PATCH v2 18/18] autoboot: Adjust the implementation in autoboot_command() Simon Glass
2019-07-23 22:00 ` [U-Boot] [PATCH v2 00/18] autoboot: Tidy up autoboot code Lukasz Majewski
2019-08-02 22:06 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox