Skip to contentSkip to conversation

Better support of booting VxWorks via 'bootvx'

PATCH Superseded Bin Meng 4 participants 29 messages Sep 28, 2015 – Oct 19, 2015

Subsystems (6)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

v2 cover Better support of booting VxWorks via 'bootvx'

This series adds better support of booting VxWorks using 'bootvx'.

Tested by booting a VxWorks 6.9.4 kernel on Intel Crown Bay, and a VxWorks 7 kernel on Intel Galileo.

Note:

Patch#1 and patch#2 are recommended to be included in v2015.10 release, other patches in this series can target for next release.

http://patchwork.ozlabs.org/patch/522185/ was a single patch previously, now is included in this v2 series as it fixed a bug which could prevent VxWorks from booting.

Changes in v2:
- New patch to move install_e820_map() out of zimage.c
- New patch to remove quotation mark in CONFIG_HOSTNAME
- Split the defconfig reorder to another patch, making this patch as CONFIG_CMD_ELF mods only
- Update sparc and avr32 boards to unset CONFIG_CMD_ELF
- Fix the endian issue for netmask
- New patch to add asmlinkage to the VxWorks x86 entry
- Describe typical values for bootaddr, e820data, e820info.

Bin Meng (13):
Reorder defconfigs with 'savedefconfig'
x86: fsp: Report correct number of E820 table entries
x86: Initialize GDT entry 1 to be the 32-bit CS as well
x86: Move install_e820_map() out of zimage.c
x86: Remove quotation mark in CONFIG_HOSTNAME
cmd: Convert CONFIG_CMD_ELF to Kconfig
cmd: Clean up cmd_elf a little bit
cmd: elf: Reorder load_elf_image_phdr() and load_elf_image_shdr()
cmd: bootvx: Pass netmask and gatewayip to VxWorks bootline
cmd: bootvx: Always get VxWorks bootline from env
cmd: bootvx: Pass E820 information to an x86 VxWorks kernel
cmd: bootvx: Add asmlinkage to the VxWorks x86 entry
doc: Complement document about booting VxWorks

 README                                          |  12 +-
 arch/x86/cpu/cpu.c                              |   7 +-
 arch/x86/include/asm/e820.h                     |   3 +
 arch/x86/include/asm/zimage.h                   |   3 -
 arch/x86/lib/Makefile                           |   1 +
 arch/x86/lib/e820.c                             |  37 +++
 arch/x86/lib/fsp/fsp_dram.c                     |   3 +-
 arch/x86/lib/zimage.c                           |  26 --
 common/Kconfig                                  |   6 +
 common/cmd_elf.c                                | 411 +++++++++++++-----------
 configs/A10-OLinuXino-Lime_defconfig            |   2 +-
 configs/Bananapi_defconfig                      |   2 +-
 configs/Bananapro_defconfig                     |   2 +-
 configs/Chuwi_V7_CW0825_defconfig               |   2 +-
 configs/M5208EVBE_defconfig                     |   2 +-
 configs/M52277EVB_defconfig                     |   2 +-
 configs/M5235EVB_defconfig                      |   2 +-
 configs/M5272C3_defconfig                       |   2 +-
 configs/M5275EVB_defconfig                      |   2 +-
 configs/M5282EVB_defconfig                      |   2 +-
 configs/M53017EVB_defconfig                     |   2 +-
 configs/M5329AFEE_defconfig                     |   2 +-
 configs/M5329BFEE_defconfig                     |   2 +-
 configs/M5373EVB_defconfig                      |   2 +-
 configs/M54418TWR_defconfig                     |   2 +-
 configs/M54418TWR_nand_mii_defconfig            |   2 +-
 configs/M54418TWR_nand_rmii_defconfig           |   2 +-
 configs/M54418TWR_nand_rmii_lowfreq_defconfig   |   2 +-
 configs/M54418TWR_serial_mii_defconfig          |   2 +-
 configs/M54418TWR_serial_rmii_defconfig         |   2 +-
 configs/M54451EVB_defconfig                     |   2 +-
 configs/M54455EVB_defconfig                     |   2 +-
 configs/M5475AFE_defconfig                      |   2 +-
 configs/M5475BFE_defconfig                      |   2 +-
 configs/M5475CFE_defconfig                      |   2 +-
 configs/M5475DFE_defconfig                      |   2 +-
 configs/M5475EFE_defconfig                      |   2 +-
 configs/M5475FFE_defconfig                      |   2 +-
 configs/M5475GFE_defconfig                      |   2 +-
 configs/M5485AFE_defconfig                      |   2 +-
 configs/M5485BFE_defconfig                      |   2 +-
 configs/M5485CFE_defconfig                      |   2 +-
 configs/M5485DFE_defconfig                      |   2 +-
 configs/M5485EFE_defconfig                      |   2 +-
 configs/M5485FFE_defconfig                      |   2 +-
 configs/M5485GFE_defconfig                      |   2 +-
 configs/M5485HFE_defconfig                      |   2 +-
 configs/MPC8349ITXGP_defconfig                  |   2 +-
 configs/MPC8349ITX_LOWBOOT_defconfig            |   2 +-
 configs/MPC8349ITX_defconfig                    |   2 +-
 configs/MSI_Primo81_defconfig                   |   2 +-
 configs/Mini-X_defconfig                        |   2 +-
 configs/PATI_defconfig                          |   2 +-
 configs/UCP1020_defconfig                       |   2 +-
 configs/VCMA9_defconfig                         |   2 +-
 configs/Wexler_TAB7200_defconfig                |   2 +-
 configs/ac14xx_defconfig                        |   2 +-
 configs/adp-ag101p_defconfig                    |   2 +-
 configs/alt_defconfig                           |   2 +-
 configs/am335x_boneblack_defconfig              |   2 +-
 configs/am335x_gp_evm_defconfig                 |   1 -
 configs/am335x_sl50_defconfig                   |   1 -
 configs/am3517_crane_defconfig                  |   2 +-
 configs/am3517_evm_defconfig                    |   2 +-
 configs/amcore_defconfig                        |   2 +-
 configs/apalis_t30_defconfig                    |   4 +-
 configs/apf27_defconfig                         |   2 +-
 configs/arcangel4-be_defconfig                  |   2 +-
 configs/arcangel4_defconfig                     |   4 +-
 configs/arndale_defconfig                       |   4 +-
 configs/astro_mcf5373l_defconfig                |   2 +-
 configs/at91rm9200ek_defconfig                  |   2 +-
 configs/at91rm9200ek_ram_defconfig              |   2 +-
 configs/at91sam9260ek_dataflash_cs0_defconfig   |   2 +-
 configs/at91sam9260ek_dataflash_cs1_defconfig   |   2 +-
 configs/at91sam9260ek_nandflash_defconfig       |   2 +-
 configs/at91sam9261ek_dataflash_cs0_defconfig   |   2 +-
 configs/at91sam9261ek_dataflash_cs3_defconfig   |   2 +-
 configs/at91sam9261ek_nandflash_defconfig       |   2 +-
 configs/at91sam9263ek_dataflash_cs0_defconfig   |   2 +-
 configs/at91sam9263ek_dataflash_defconfig       |   2 +-
 configs/at91sam9263ek_nandflash_defconfig       |   2 +-
 configs/at91sam9263ek_norflash_boot_defconfig   |   2 +-
 configs/at91sam9263ek_norflash_defconfig        |   2 +-
 configs/at91sam9g10ek_dataflash_cs0_defconfig   |   2 +-
 configs/at91sam9g10ek_dataflash_cs3_defconfig   |   2 +-
 configs/at91sam9g10ek_nandflash_defconfig       |   2 +-
 configs/at91sam9g20ek_2mmc_defconfig            |   2 +-
 configs/at91sam9g20ek_2mmc_nandflash_defconfig  |   2 +-
 configs/at91sam9g20ek_dataflash_cs0_defconfig   |   2 +-
 configs/at91sam9g20ek_dataflash_cs1_defconfig   |   2 +-
 configs/at91sam9g20ek_nandflash_defconfig       |   2 +-
 configs/at91sam9m10g45ek_mmc_defconfig          |   2 +-
 configs/at91sam9m10g45ek_nandflash_defconfig    |   2 +-
 configs/at91sam9n12ek_mmc_defconfig             |   2 +-
 configs/at91sam9n12ek_nandflash_defconfig       |   2 +-
 configs/at91sam9n12ek_spiflash_defconfig        |   2 +-
 configs/at91sam9rlek_dataflash_defconfig        |   2 +-
 configs/at91sam9rlek_mmc_defconfig              |   2 +-
 configs/at91sam9rlek_nandflash_defconfig        |   2 +-
 configs/at91sam9x5ek_dataflash_defconfig        |   2 +-
 configs/at91sam9x5ek_mmc_defconfig              |   2 +-
 configs/at91sam9x5ek_nandflash_defconfig        |   2 +-
 configs/at91sam9x5ek_spiflash_defconfig         |   2 +-
 configs/at91sam9xeek_dataflash_cs0_defconfig    |   2 +-
 configs/at91sam9xeek_dataflash_cs1_defconfig    |   2 +-
 configs/at91sam9xeek_nandflash_defconfig        |   2 +-
 configs/atngw100_defconfig                      |   3 +-
 configs/atngw100mkii_defconfig                  |   3 +-
 configs/atstk1002_defconfig                     |   3 +-
 configs/bayleybay_defconfig                     |   8 +-
 configs/beaver_defconfig                        |   4 +-
 configs/bf537-minotaur_defconfig                |   2 +-
 configs/bf537-srv1_defconfig                    |   2 +-
 configs/bf561-acvilon_defconfig                 |   2 +-
 configs/br4_defconfig                           |   2 +-
 configs/cairo_defconfig                         |   2 +-
 configs/calimain_defconfig                      |   2 +-
 configs/cardhu_defconfig                        |   4 +-
 configs/cgtqmx6qeval_defconfig                  |   2 +-
 configs/chromebook_jerry_defconfig              |  24 +-
 configs/chromebook_link_defconfig               |   6 +-
 configs/chromebox_panther_defconfig             |   6 +-
 configs/cm_fx6_defconfig                        |   2 +-
 configs/cm_t335_defconfig                       |   2 +-
 configs/cm_t3517_defconfig                      |   2 +-
 configs/cm_t35_defconfig                        |   2 +-
 configs/cm_t43_defconfig                        |   4 +-
 configs/cm_t54_defconfig                        |   2 +-
 configs/cobra5272_defconfig                     |   2 +-
 configs/colibri_t20_defconfig                   |   4 +-
 configs/colibri_t30_defconfig                   |   4 +-
 configs/colibri_vf_defconfig                    |   2 +-
 configs/colibri_vf_dtb_defconfig                |   2 +-
 configs/coreboot-x86_defconfig                  |   4 +-
 configs/corvus_defconfig                        |   2 +-
 configs/crownbay_defconfig                      |   8 +-
 configs/da830evm_defconfig                      |   2 +-
 configs/da850evm_defconfig                      |   2 +-
 configs/da850evm_direct_nor_defconfig           |   2 +-
 configs/dalmore_defconfig                       |   4 +-
 configs/dbau1000_defconfig                      |   3 +-
 configs/dbau1100_defconfig                      |   3 +-
 configs/dbau1500_defconfig                      |   3 +-
 configs/dbau1550_defconfig                      |   3 +-
 configs/dbau1550_el_defconfig                   |   3 +-
 configs/devkit3250_defconfig                    |   2 +-
 configs/dlvision-10g_defconfig                  |   1 +
 configs/dlvision_defconfig                      |   1 +
 configs/dockstar_defconfig                      |   2 +-
 configs/dra72_evm_defconfig                     |   3 +-
 configs/draco_defconfig                         |   2 +-
 configs/duovero_defconfig                       |   2 +-
 configs/e2220-1170_defconfig                    |   3 -
 configs/ea20_defconfig                          |   2 +-
 configs/eb_cpu5282_defconfig                    |   2 +-
 configs/eco5pk_defconfig                        |   2 +-
 configs/edminiv2_defconfig                      |   2 +-
 configs/ethernut5_defconfig                     |   2 +-
 configs/firefly-rk3288_defconfig                |  24 +-
 configs/flea3_defconfig                         |   2 +-
 configs/fx12mm_defconfig                        |   2 +-
 configs/goflexhome_defconfig                    |   2 +-
 configs/gose_defconfig                          |   2 +-
 configs/gr_cpci_ax2000_defconfig                |   1 +
 configs/gr_ep2s60_defconfig                     |   1 +
 configs/gr_xc3s_1500_defconfig                  |   1 +
 configs/grasshopper_defconfig                   |   3 +-
 configs/grsim_defconfig                         |   1 +
 configs/grsim_leon2_defconfig                   |   1 +
 configs/gt90h_v4_defconfig                      |   2 +-
 configs/gwventana_defconfig                     |   4 +-
 configs/h2200_defconfig                         |   2 +-
 configs/harmony_defconfig                       |   4 +-
 configs/hikey_defconfig                         |   3 -
 configs/ib62x0_defconfig                        |   2 +-
 configs/iconnect_defconfig                      |   2 +-
 configs/imx31_phycore_defconfig                 |   2 +-
 configs/inet97fv2_defconfig                     |   2 +-
 configs/inet98v_rev2_defconfig                  |   2 +-
 configs/inet9f_rev03_defconfig                  |   2 +-
 configs/integratorap_cm720t_defconfig           |   2 +-
 configs/integratorap_cm920t_defconfig           |   2 +-
 configs/integratorap_cm926ejs_defconfig         |   2 +-
 configs/integratorap_cm946es_defconfig          |   2 +-
 configs/integratorcp_cm1136_defconfig           |   2 +-
 configs/integratorcp_cm920t_defconfig           |   2 +-
 configs/integratorcp_cm926ejs_defconfig         |   2 +-
 configs/integratorcp_cm946es_defconfig          |   2 +-
 configs/io_defconfig                            |   1 +
 configs/iocon_defconfig                         |   1 +
 configs/ipam390_defconfig                       |   2 +-
 configs/jesurun_q5_defconfig                    |   2 +-
 configs/jetson-tk1_defconfig                    |   4 +-
 configs/k2e_evm_defconfig                       |   2 +-
 configs/k2hk_evm_defconfig                      |   2 +-
 configs/k2l_evm_defconfig                       |   2 +-
 configs/koelsch_defconfig                       |   2 +-
 configs/kwb_defconfig                           |   2 +-
 configs/kzm9g_defconfig                         |   2 +-
 configs/lager_defconfig                         |   2 +-
 configs/ls1021aqds_qspi_defconfig               |   2 +-
 configs/ls1021atwr_qspi_defconfig               |   2 +-
 configs/ls2085aqds_defconfig                    |   6 +-
 configs/ls2085ardb_defconfig                    |   6 +-
 configs/mcx_defconfig                           |   2 +-
 configs/medcom-wide_defconfig                   |   4 +-
 configs/microblaze-generic_defconfig            |   2 +-
 configs/minnowmax_defconfig                     |   8 +-
 configs/ml507_defconfig                         |   2 +-
 configs/mt_ventoux_defconfig                    |   2 +-
 configs/mx6ul_14x14_evk_defconfig               |   7 +-
 configs/mx6ul_9x9_evk_defconfig                 |   5 +-
 configs/mx7dsabresd_defconfig                   |  11 +-
 configs/nas220_defconfig                        |   2 +-
 configs/neo_defconfig                           |   1 +
 configs/nokia_rx51_defconfig                    |   2 +-
 configs/nyan-big_defconfig                      |  16 +-
 configs/odroid-xu3_defconfig                    |   6 +-
 configs/odroid_defconfig                        |   4 +-
 configs/omap3_evm_defconfig                     |   2 +-
 configs/omap3_evm_quick_mmc_defconfig           |   2 +-
 configs/omap3_evm_quick_nand_defconfig          |   2 +-
 configs/omap3_logic_defconfig                   |   2 +-
 configs/omap3_overo_defconfig                   |   2 +-
 configs/omap3_pandora_defconfig                 |   2 +-
 configs/omapl138_lcdk_defconfig                 |   2 +-
 configs/origen_defconfig                        |   2 +-
 configs/p2371-0000_defconfig                    |   2 -
 configs/p2571_defconfig                         |   2 -
 configs/paz00_defconfig                         |   4 +-
 configs/pb1000_defconfig                        |   3 +-
 configs/pcm030_defconfig                        |   2 +-
 configs/peach-pi_defconfig                      |  22 +-
 configs/peach-pit_defconfig                     |  22 +-
 configs/pepper_defconfig                        |   2 +-
 configs/platinum_picon_defconfig                |   2 +-
 configs/platinum_titanium_defconfig             |   2 +-
 configs/plutux_defconfig                        |   4 +-
 configs/pm9261_defconfig                        |   2 +-
 configs/pm9263_defconfig                        |   2 +-
 configs/pm9g45_defconfig                        |   2 +-
 configs/pogo_e02_defconfig                      |   2 +-
 configs/porter_defconfig                        |   2 +-
 configs/pov_protab2_ips9_defconfig              |   2 +-
 configs/pr1_defconfig                           |   2 +-
 configs/pxm2_defconfig                          |   2 +-
 configs/qemu-x86_defconfig                      |   2 +-
 configs/rastaban_defconfig                      |   2 +-
 configs/rpi_2_defconfig                         |   2 +-
 configs/rpi_defconfig                           |   2 +-
 configs/rut_defconfig                           |   2 +-
 configs/s5p_goni_defconfig                      |   2 +-
 configs/s5pc210_universal_defconfig             |   2 +-
 configs/sandbox_defconfig                       |  33 +-
 configs/seaboard_defconfig                      |   4 +-
 configs/secomx6quq7_defconfig                   |   2 +-
 configs/silk_defconfig                          |   2 +-
 configs/smartweb_defconfig                      |   1 -
 configs/smdk2410_defconfig                      |   2 +-
 configs/smdk5250_defconfig                      |   8 +-
 configs/smdk5420_defconfig                      |   8 +-
 configs/smdkc100_defconfig                      |   2 +-
 configs/smdkv310_defconfig                      |   2 +-
 configs/snapper9260_defconfig                   |   2 +-
 configs/sniper_defconfig                        |   2 +-
 configs/snow_defconfig                          |  32 +-
 configs/socfpga_arria5_defconfig                |   8 +-
 configs/socfpga_cyclone5_defconfig              |   8 +-
 configs/socfpga_de0_nano_soc_defconfig          |  18 +-
 configs/socfpga_mcvevk_defconfig                |  19 +-
 configs/socfpga_sockit_defconfig                |  24 +-
 configs/socfpga_socrates_defconfig              |   8 +-
 configs/spring_defconfig                        |  30 +-
 configs/stm32f429-discovery_defconfig           |   2 +-
 configs/stout_defconfig                         |   2 +-
 configs/stv0991_defconfig                       |   2 +-
 configs/tao3530_defconfig                       |   2 +-
 configs/taurus_defconfig                        |   2 +-
 configs/tb100_defconfig                         |   4 +-
 configs/tbs2910_defconfig                       |   2 +-
 configs/tec-ng_defconfig                        |   4 +-
 configs/tec_defconfig                           |   4 +-
 configs/thuban_defconfig                        |   2 +-
 configs/ti814x_evm_defconfig                    |   2 +-
 configs/ti816x_evm_defconfig                    |   2 +-
 configs/titanium_defconfig                      |   2 +-
 configs/trats2_defconfig                        |   2 +-
 configs/trats_defconfig                         |   2 +-
 configs/tricorder_defconfig                     |   2 +-
 configs/trimslice_defconfig                     |   4 +-
 configs/tseries_mmc_defconfig                   |   2 +-
 configs/tseries_nand_defconfig                  |   2 +-
 configs/tseries_spi_defconfig                   |   2 +-
 configs/twister_defconfig                       |   2 +-
 configs/udoo_defconfig                          |   6 +-
 configs/usb_a9263_dataflash_defconfig           |   2 +-
 configs/v5fx30teval_defconfig                   |   2 +-
 configs/vct_platinum_defconfig                  |   2 +-
 configs/vct_platinum_onenand_defconfig          |   2 +-
 configs/vct_platinum_onenand_small_defconfig    |   3 +-
 configs/vct_platinum_small_defconfig            |   3 +-
 configs/vct_platinumavc_defconfig               |   2 +-
 configs/vct_platinumavc_onenand_defconfig       |   2 +-
 configs/vct_platinumavc_onenand_small_defconfig |   3 +-
 configs/vct_platinumavc_small_defconfig         |   3 +-
 configs/vct_premium_defconfig                   |   2 +-
 configs/vct_premium_onenand_defconfig           |   2 +-
 configs/vct_premium_onenand_small_defconfig     |   3 +-
 configs/vct_premium_small_defconfig             |   3 +-
 configs/venice2_defconfig                       |   4 +-
 configs/ventana_defconfig                       |   4 +-
 configs/vexpress_aemv8a_juno_defconfig          |   4 +-
 configs/vexpress_aemv8a_semi_defconfig          |   4 +-
 configs/whistler_defconfig                      |   4 +-
 configs/wireless_space_defconfig                |   1 -
 configs/woodburn_defconfig                      |   2 +-
 configs/woodburn_sd_defconfig                   |   2 +-
 configs/work_92105_defconfig                    |   2 +-
 configs/x600_defconfig                          |   2 +-
 configs/xilinx-ppc405-generic_defconfig         |   2 +-
 configs/xilinx-ppc440-generic_defconfig         |   2 +-
 configs/zmx25_defconfig                         |   2 +-
 configs/zynq_microzed_defconfig                 |   2 +-
 configs/zynq_zc702_defconfig                    |   2 +-
 configs/zynq_zc706_defconfig                    |   2 +-
 configs/zynq_zc70x_defconfig                    |   2 +-
 configs/zynq_zc770_xm010_defconfig              |   2 +-
 configs/zynq_zc770_xm011_defconfig              |   2 +-
 configs/zynq_zc770_xm012_defconfig              |   2 +-
 configs/zynq_zc770_xm013_defconfig              |   2 +-
 configs/zynq_zed_defconfig                      |   2 +-
 configs/zynq_zybo_defconfig                     |   2 +-
 doc/README.vxworks                              |  82 ++++-
 doc/README.x86                                  |   2 +
 include/config_cmd_all.h                        |   1 -
 include/config_distro_defaults.h                |   1 -
 include/configs/B4860QDS.h                      |   1 -
 include/configs/BSC9131RDB.h                    |   1 -
 include/configs/BSC9132QDS.h                    |   1 -
 include/configs/C29XPCIE.h                      |   1 -
 include/configs/CPCI2DP.h                       |   1 -
 include/configs/CPCI4052.h                      |   1 -
 include/configs/M5208EVBE.h                     |   1 -
 include/configs/M52277EVB.h                     |   1 -
 include/configs/M5235EVB.h                      |   1 -
 include/configs/M5272C3.h                       |   1 -
 include/configs/M5275EVB.h                      |   1 -
 include/configs/M53017EVB.h                     |   1 -
 include/configs/M5329EVB.h                      |   1 -
 include/configs/M5373EVB.h                      |   1 -
 include/configs/M54418TWR.h                     |   1 -
 include/configs/M54451EVB.h                     |   1 -
 include/configs/M54455EVB.h                     |   1 -
 include/configs/M5475EVB.h                      |   1 -
 include/configs/M5485EVB.h                      |   1 -
 include/configs/MIP405.h                        |   1 -
 include/configs/MPC8536DS.h                     |   1 -
 include/configs/MPC8540ADS.h                    |   1 -
 include/configs/MPC8541CDS.h                    |   1 -
 include/configs/MPC8544DS.h                     |   1 -
 include/configs/MPC8548CDS.h                    |   1 -
 include/configs/MPC8555CDS.h                    |   1 -
 include/configs/MPC8560ADS.h                    |   1 -
 include/configs/MPC8568MDS.h                    |   1 -
 include/configs/MPC8569MDS.h                    |   1 -
 include/configs/MPC8572DS.h                     |   1 -
 include/configs/P1010RDB.h                      |   1 -
 include/configs/P1022DS.h                       |   1 -
 include/configs/P2041RDB.h                      |   1 -
 include/configs/PIP405.h                        |   1 -
 include/configs/PLU405.h                        |   1 -
 include/configs/PMC405DE.h                      |   1 -
 include/configs/PMC440.h                        |   1 -
 include/configs/T102xQDS.h                      |   1 -
 include/configs/T102xRDB.h                      |   1 -
 include/configs/T1040QDS.h                      |   1 -
 include/configs/T104xRDB.h                      |   1 -
 include/configs/T208xQDS.h                      |   1 -
 include/configs/T208xRDB.h                      |   1 -
 include/configs/T4240RDB.h                      |   1 -
 include/configs/TQM823L.h                       |   1 -
 include/configs/TQM823M.h                       |   1 -
 include/configs/TQM850L.h                       |   1 -
 include/configs/TQM850M.h                       |   1 -
 include/configs/TQM855L.h                       |   1 -
 include/configs/TQM855M.h                       |   1 -
 include/configs/TQM860L.h                       |   1 -
 include/configs/TQM860M.h                       |   1 -
 include/configs/TQM862L.h                       |   1 -
 include/configs/TQM862M.h                       |   1 -
 include/configs/TQM866M.h                       |   1 -
 include/configs/UCP1020.h                       |   1 -
 include/configs/VCMA9.h                         |   1 -
 include/configs/VOM405.h                        |   1 -
 include/configs/amcc-common.h                   |   1 -
 include/configs/arcangel4.h                     |   1 -
 include/configs/astro_mcf5373l.h                |   1 -
 include/configs/axs101.h                        |   1 -
 include/configs/bf537-minotaur.h                |   1 -
 include/configs/bf537-srv1.h                    |   1 -
 include/configs/bfin_adi_common.h               |   1 -
 include/configs/blackstamp.h                    |   1 -
 include/configs/blackvme.h                      |   1 -
 include/configs/controlcenterd.h                |   1 -
 include/configs/corenet_ds.h                    |   1 -
 include/configs/dbau1x00.h                      |   1 -
 include/configs/digsy_mtc.h                     |   1 -
 include/configs/dlvision-10g.h                  |   1 -
 include/configs/dlvision.h                      |   1 -
 include/configs/io.h                            |   1 -
 include/configs/iocon.h                         |   1 -
 include/configs/km/km_arm.h                     |   1 -
 include/configs/lsxl.h                          |   1 -
 include/configs/malta.h                         |   1 -
 include/configs/mecp5123.h                      |   1 -
 include/configs/motionpro.h                     |   1 -
 include/configs/munices.h                       |   1 -
 include/configs/neo.h                           |   1 -
 include/configs/nitrogen6x.h                    |   1 -
 include/configs/openrisc-generic.h              |   1 -
 include/configs/origen.h                        |   1 -
 include/configs/p1_p2_rdb_pc.h                  |   1 -
 include/configs/p1_twr.h                        |   1 -
 include/configs/pb1x00.h                        |   2 -
 include/configs/qemu-mips.h                     |   1 -
 include/configs/qemu-mips64.h                   |   1 -
 include/configs/qemu-ppce500.h                  |   1 -
 include/configs/sandbox.h                       |   1 -
 include/configs/sbc8548.h                       |   1 -
 include/configs/smdk2410.h                      |   1 -
 include/configs/smdkc100.h                      |   1 -
 include/configs/smdkv310.h                      |   1 -
 include/configs/t4qds.h                         |   1 -
 include/configs/tb100.h                         |   1 -
 include/configs/vct.h                           |   2 -
 include/configs/vme8349.h                       |   1 -
 include/configs/x86-common.h                    |   3 +-
 include/configs/xilinx-ppc.h                    |   1 -
 include/configs/xilinx_zynqmp.h                 |   1 -
 include/configs/xpedite1000.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 -
 include/vxworks.h                               |  51 +--
 448 files changed, 897 insertions(+), 899 deletions(-)
 create mode 100644 arch/x86/lib/e820.c
Signature · 1 line
1.8.2.1
author
#1 lore raw

PATCH v2 1/13 Reorder defconfigs with 'savedefconfig'

Some boards' defconfigs are disordered. Reorder them.

---

Changes in v2: None

 configs/A10-OLinuXino-Lime_defconfig            |  2 +-
 configs/Bananapi_defconfig                      |  2 +-
 configs/Bananapro_defconfig                     |  2 +-
 configs/Chuwi_V7_CW0825_defconfig               |  2 +-
 configs/M5208EVBE_defconfig                     |  2 +-
 configs/M52277EVB_defconfig                     |  2 +-
 configs/M5235EVB_defconfig                      |  2 +-
 configs/M5272C3_defconfig                       |  2 +-
 configs/M5275EVB_defconfig                      |  2 +-
 configs/M5282EVB_defconfig                      |  2 +-
 configs/M53017EVB_defconfig                     |  2 +-
 configs/M5329AFEE_defconfig                     |  2 +-
 configs/M5329BFEE_defconfig                     |  2 +-
 configs/M5373EVB_defconfig                      |  2 +-
 configs/M54418TWR_defconfig                     |  2 +-
 configs/M54418TWR_nand_mii_defconfig            |  2 +-
 configs/M54418TWR_nand_rmii_defconfig           |  2 +-
 configs/M54418TWR_nand_rmii_lowfreq_defconfig   |  2 +-
 configs/M54418TWR_serial_mii_defconfig          |  2 +-
 configs/M54418TWR_serial_rmii_defconfig         |  2 +-
 configs/M54451EVB_defconfig                     |  2 +-
 configs/M54455EVB_defconfig                     |  2 +-
 configs/M5475AFE_defconfig                      |  2 +-
 configs/M5475BFE_defconfig                      |  2 +-
 configs/M5475CFE_defconfig                      |  2 +-
 configs/M5475DFE_defconfig                      |  2 +-
 configs/M5475EFE_defconfig                      |  2 +-
 configs/M5475FFE_defconfig                      |  2 +-
 configs/M5475GFE_defconfig                      |  2 +-
 configs/M5485AFE_defconfig                      |  2 +-
 configs/M5485BFE_defconfig                      |  2 +-
 configs/M5485CFE_defconfig                      |  2 +-
 configs/M5485DFE_defconfig                      |  2 +-
 configs/M5485EFE_defconfig                      |  2 +-
 configs/M5485FFE_defconfig                      |  2 +-
 configs/M5485GFE_defconfig                      |  2 +-
 configs/M5485HFE_defconfig                      |  2 +-
 configs/MPC8349ITXGP_defconfig                  |  2 +-
 configs/MPC8349ITX_LOWBOOT_defconfig            |  2 +-
 configs/MPC8349ITX_defconfig                    |  2 +-
 configs/MSI_Primo81_defconfig                   |  2 +-
 configs/Mini-X_defconfig                        |  2 +-
 configs/PATI_defconfig                          |  2 +-
 configs/UCP1020_defconfig                       |  2 +-
 configs/VCMA9_defconfig                         |  2 +-
 configs/Wexler_TAB7200_defconfig                |  2 +-
 configs/ac14xx_defconfig                        |  2 +-
 configs/adp-ag101p_defconfig                    |  2 +-
 configs/alt_defconfig                           |  2 +-
 configs/am335x_boneblack_defconfig              |  2 +-
 configs/am335x_gp_evm_defconfig                 |  1 -
 configs/am335x_sl50_defconfig                   |  1 -
 configs/am3517_crane_defconfig                  |  2 +-
 configs/am3517_evm_defconfig                    |  2 +-
 configs/amcore_defconfig                        |  2 +-
 configs/apalis_t30_defconfig                    |  4 ++--
 configs/apf27_defconfig                         |  2 +-
 configs/arcangel4-be_defconfig                  |  2 +-
 configs/arcangel4_defconfig                     |  4 ++--
 configs/arndale_defconfig                       |  4 ++--
 configs/astro_mcf5373l_defconfig                |  2 +-
 configs/at91rm9200ek_defconfig                  |  2 +-
 configs/at91rm9200ek_ram_defconfig              |  2 +-
 configs/at91sam9260ek_dataflash_cs0_defconfig   |  2 +-
 configs/at91sam9260ek_dataflash_cs1_defconfig   |  2 +-
 configs/at91sam9260ek_nandflash_defconfig       |  2 +-
 configs/at91sam9261ek_dataflash_cs0_defconfig   |  2 +-
 configs/at91sam9261ek_dataflash_cs3_defconfig   |  2 +-
 configs/at91sam9261ek_nandflash_defconfig       |  2 +-
 configs/at91sam9263ek_dataflash_cs0_defconfig   |  2 +-
 configs/at91sam9263ek_dataflash_defconfig       |  2 +-
 configs/at91sam9263ek_nandflash_defconfig       |  2 +-
 configs/at91sam9263ek_norflash_boot_defconfig   |  2 +-
 configs/at91sam9263ek_norflash_defconfig        |  2 +-
 configs/at91sam9g10ek_dataflash_cs0_defconfig   |  2 +-
 configs/at91sam9g10ek_dataflash_cs3_defconfig   |  2 +-
 configs/at91sam9g10ek_nandflash_defconfig       |  2 +-
 configs/at91sam9g20ek_2mmc_defconfig            |  2 +-
 configs/at91sam9g20ek_2mmc_nandflash_defconfig  |  2 +-
 configs/at91sam9g20ek_dataflash_cs0_defconfig   |  2 +-
 configs/at91sam9g20ek_dataflash_cs1_defconfig   |  2 +-
 configs/at91sam9g20ek_nandflash_defconfig       |  2 +-
 configs/at91sam9m10g45ek_mmc_defconfig          |  2 +-
 configs/at91sam9m10g45ek_nandflash_defconfig    |  2 +-
 configs/at91sam9n12ek_mmc_defconfig             |  2 +-
 configs/at91sam9n12ek_nandflash_defconfig       |  2 +-
 configs/at91sam9n12ek_spiflash_defconfig        |  2 +-
 configs/at91sam9rlek_dataflash_defconfig        |  2 +-
 configs/at91sam9rlek_mmc_defconfig              |  2 +-
 configs/at91sam9rlek_nandflash_defconfig        |  2 +-
 configs/at91sam9x5ek_dataflash_defconfig        |  2 +-
 configs/at91sam9x5ek_mmc_defconfig              |  2 +-
 configs/at91sam9x5ek_nandflash_defconfig        |  2 +-
 configs/at91sam9x5ek_spiflash_defconfig         |  2 +-
 configs/at91sam9xeek_dataflash_cs0_defconfig    |  2 +-
 configs/at91sam9xeek_dataflash_cs1_defconfig    |  2 +-
 configs/at91sam9xeek_nandflash_defconfig        |  2 +-
 configs/atngw100_defconfig                      |  2 +-
 configs/atngw100mkii_defconfig                  |  2 +-
 configs/atstk1002_defconfig                     |  2 +-
 configs/bayleybay_defconfig                     |  8 +++----
 configs/beaver_defconfig                        |  4 ++--
 configs/bf537-minotaur_defconfig                |  2 +-
 configs/bf537-srv1_defconfig                    |  2 +-
 configs/bf561-acvilon_defconfig                 |  2 +-
 configs/br4_defconfig                           |  2 +-
 configs/cairo_defconfig                         |  2 +-
 configs/calimain_defconfig                      |  2 +-
 configs/cardhu_defconfig                        |  4 ++--
 configs/cgtqmx6qeval_defconfig                  |  2 +-
 configs/chromebook_jerry_defconfig              | 24 +++++++++----------
 configs/chromebook_link_defconfig               |  6 ++---
 configs/chromebox_panther_defconfig             |  6 ++---
 configs/cm_fx6_defconfig                        |  2 +-
 configs/cm_t335_defconfig                       |  2 +-
 configs/cm_t3517_defconfig                      |  2 +-
 configs/cm_t35_defconfig                        |  2 +-
 configs/cm_t43_defconfig                        |  4 ++--
 configs/cm_t54_defconfig                        |  2 +-
 configs/cobra5272_defconfig                     |  2 +-
 configs/colibri_t20_defconfig                   |  4 ++--
 configs/colibri_t30_defconfig                   |  4 ++--
 configs/colibri_vf_defconfig                    |  2 +-
 configs/colibri_vf_dtb_defconfig                |  2 +-
 configs/coreboot-x86_defconfig                  |  4 ++--
 configs/corvus_defconfig                        |  2 +-
 configs/crownbay_defconfig                      |  8 +++----
 configs/da830evm_defconfig                      |  2 +-
 configs/da850evm_defconfig                      |  2 +-
 configs/da850evm_direct_nor_defconfig           |  2 +-
 configs/dalmore_defconfig                       |  4 ++--
 configs/dbau1000_defconfig                      |  2 +-
 configs/dbau1100_defconfig                      |  2 +-
 configs/dbau1500_defconfig                      |  2 +-
 configs/dbau1550_defconfig                      |  2 +-
 configs/dbau1550_el_defconfig                   |  2 +-
 configs/devkit3250_defconfig                    |  2 +-
 configs/dockstar_defconfig                      |  2 +-
 configs/dra72_evm_defconfig                     |  3 +--
 configs/draco_defconfig                         |  2 +-
 configs/duovero_defconfig                       |  2 +-
 configs/e2220-1170_defconfig                    |  3 ---
 configs/ea20_defconfig                          |  2 +-
 configs/eb_cpu5282_defconfig                    |  2 +-
 configs/eco5pk_defconfig                        |  2 +-
 configs/edminiv2_defconfig                      |  2 +-
 configs/ethernut5_defconfig                     |  2 +-
 configs/firefly-rk3288_defconfig                | 24 +++++++++----------
 configs/flea3_defconfig                         |  2 +-
 configs/fx12mm_defconfig                        |  2 +-
 configs/goflexhome_defconfig                    |  2 +-
 configs/gose_defconfig                          |  2 +-
 configs/grasshopper_defconfig                   |  2 +-
 configs/gt90h_v4_defconfig                      |  2 +-
 configs/gwventana_defconfig                     |  4 ++--
 configs/h2200_defconfig                         |  2 +-
 configs/harmony_defconfig                       |  4 ++--
 configs/hikey_defconfig                         |  3 ---
 configs/ib62x0_defconfig                        |  2 +-
 configs/iconnect_defconfig                      |  2 +-
 configs/imx31_phycore_defconfig                 |  2 +-
 configs/inet97fv2_defconfig                     |  2 +-
 configs/inet98v_rev2_defconfig                  |  2 +-
 configs/inet9f_rev03_defconfig                  |  2 +-
 configs/integratorap_cm720t_defconfig           |  2 +-
 configs/integratorap_cm920t_defconfig           |  2 +-
 configs/integratorap_cm926ejs_defconfig         |  2 +-
 configs/integratorap_cm946es_defconfig          |  2 +-
 configs/integratorcp_cm1136_defconfig           |  2 +-
 configs/integratorcp_cm920t_defconfig           |  2 +-
 configs/integratorcp_cm926ejs_defconfig         |  2 +-
 configs/integratorcp_cm946es_defconfig          |  2 +-
 configs/ipam390_defconfig                       |  2 +-
 configs/jesurun_q5_defconfig                    |  2 +-
 configs/jetson-tk1_defconfig                    |  4 ++--
 configs/k2e_evm_defconfig                       |  2 +-
 configs/k2hk_evm_defconfig                      |  2 +-
 configs/k2l_evm_defconfig                       |  2 +-
 configs/koelsch_defconfig                       |  2 +-
 configs/kwb_defconfig                           |  2 +-
 configs/kzm9g_defconfig                         |  2 +-
 configs/lager_defconfig                         |  2 +-
 configs/ls1021aqds_qspi_defconfig               |  2 +-
 configs/ls1021atwr_qspi_defconfig               |  2 +-
 configs/ls2085aqds_defconfig                    |  6 ++---
 configs/ls2085ardb_defconfig                    |  6 ++---
 configs/mcx_defconfig                           |  2 +-
 configs/medcom-wide_defconfig                   |  4 ++--
 configs/microblaze-generic_defconfig            |  2 +-
 configs/minnowmax_defconfig                     |  8 +++----
 configs/ml507_defconfig                         |  2 +-
 configs/mt_ventoux_defconfig                    |  2 +-
 configs/mx6ul_14x14_evk_defconfig               |  7 +++---
 configs/mx6ul_9x9_evk_defconfig                 |  5 ++--
 configs/mx7dsabresd_defconfig                   | 11 ++++-----
 configs/nas220_defconfig                        |  2 +-
 configs/nokia_rx51_defconfig                    |  2 +-
 configs/nyan-big_defconfig                      | 16 ++++++-------
 configs/odroid-xu3_defconfig                    |  6 ++---
 configs/odroid_defconfig                        |  4 ++--
 configs/omap3_evm_defconfig                     |  2 +-
 configs/omap3_evm_quick_mmc_defconfig           |  2 +-
 configs/omap3_evm_quick_nand_defconfig          |  2 +-
 configs/omap3_logic_defconfig                   |  2 +-
 configs/omap3_overo_defconfig                   |  2 +-
 configs/omap3_pandora_defconfig                 |  2 +-
 configs/omapl138_lcdk_defconfig                 |  2 +-
 configs/origen_defconfig                        |  2 +-
 configs/p2371-0000_defconfig                    |  2 --
 configs/p2571_defconfig                         |  2 --
 configs/paz00_defconfig                         |  4 ++--
 configs/pb1000_defconfig                        |  2 +-
 configs/pcm030_defconfig                        |  2 +-
 configs/peach-pi_defconfig                      | 22 ++++++++---------
 configs/peach-pit_defconfig                     | 22 ++++++++---------
 configs/pepper_defconfig                        |  2 +-
 configs/platinum_picon_defconfig                |  2 +-
 configs/platinum_titanium_defconfig             |  2 +-
 configs/plutux_defconfig                        |  4 ++--
 configs/pm9261_defconfig                        |  2 +-
 configs/pm9263_defconfig                        |  2 +-
 configs/pm9g45_defconfig                        |  2 +-
 configs/pogo_e02_defconfig                      |  2 +-
 configs/porter_defconfig                        |  2 +-
 configs/pov_protab2_ips9_defconfig              |  2 +-
 configs/pr1_defconfig                           |  2 +-
 configs/pxm2_defconfig                          |  2 +-
 configs/qemu-x86_defconfig                      |  2 +-
 configs/rastaban_defconfig                      |  2 +-
 configs/rpi_2_defconfig                         |  2 +-
 configs/rpi_defconfig                           |  2 +-
 configs/rut_defconfig                           |  2 +-
 configs/s5p_goni_defconfig                      |  2 +-
 configs/s5pc210_universal_defconfig             |  2 +-
 configs/sandbox_defconfig                       | 32 ++++++++++++-------------
 configs/seaboard_defconfig                      |  4 ++--
 configs/secomx6quq7_defconfig                   |  2 +-
 configs/silk_defconfig                          |  2 +-
 configs/smartweb_defconfig                      |  1 -
 configs/smdk2410_defconfig                      |  2 +-
 configs/smdk5250_defconfig                      |  8 +++----
 configs/smdk5420_defconfig                      |  8 +++----
 configs/smdkc100_defconfig                      |  2 +-
 configs/smdkv310_defconfig                      |  2 +-
 configs/snapper9260_defconfig                   |  2 +-
 configs/sniper_defconfig                        |  2 +-
 configs/snow_defconfig                          | 32 ++++++++++++-------------
 configs/socfpga_arria5_defconfig                |  8 +++----
 configs/socfpga_cyclone5_defconfig              |  8 +++----
 configs/socfpga_de0_nano_soc_defconfig          | 18 ++++++--------
 configs/socfpga_mcvevk_defconfig                | 19 ++++++---------
 configs/socfpga_sockit_defconfig                | 24 +++++++------------
 configs/socfpga_socrates_defconfig              |  8 +++----
 configs/spring_defconfig                        | 30 +++++++++++------------
 configs/stm32f429-discovery_defconfig           |  2 +-
 configs/stout_defconfig                         |  2 +-
 configs/stv0991_defconfig                       |  2 +-
 configs/tao3530_defconfig                       |  2 +-
 configs/taurus_defconfig                        |  2 +-
 configs/tb100_defconfig                         |  4 ++--
 configs/tbs2910_defconfig                       |  2 +-
 configs/tec-ng_defconfig                        |  4 ++--
 configs/tec_defconfig                           |  4 ++--
 configs/thuban_defconfig                        |  2 +-
 configs/ti814x_evm_defconfig                    |  2 +-
 configs/ti816x_evm_defconfig                    |  2 +-
 configs/titanium_defconfig                      |  2 +-
 configs/trats2_defconfig                        |  2 +-
 configs/trats_defconfig                         |  2 +-
 configs/tricorder_defconfig                     |  2 +-
 configs/trimslice_defconfig                     |  4 ++--
 configs/tseries_mmc_defconfig                   |  2 +-
 configs/tseries_nand_defconfig                  |  2 +-
 configs/tseries_spi_defconfig                   |  2 +-
 configs/twister_defconfig                       |  2 +-
 configs/udoo_defconfig                          |  6 ++---
 configs/usb_a9263_dataflash_defconfig           |  2 +-
 configs/v5fx30teval_defconfig                   |  2 +-
 configs/vct_platinum_defconfig                  |  2 +-
 configs/vct_platinum_onenand_defconfig          |  2 +-
 configs/vct_platinum_onenand_small_defconfig    |  2 +-
 configs/vct_platinum_small_defconfig            |  2 +-
 configs/vct_platinumavc_defconfig               |  2 +-
 configs/vct_platinumavc_onenand_defconfig       |  2 +-
 configs/vct_platinumavc_onenand_small_defconfig |  2 +-
 configs/vct_platinumavc_small_defconfig         |  2 +-
 configs/vct_premium_defconfig                   |  2 +-
 configs/vct_premium_onenand_defconfig           |  2 +-
 configs/vct_premium_onenand_small_defconfig     |  2 +-
 configs/vct_premium_small_defconfig             |  2 +-
 configs/venice2_defconfig                       |  4 ++--
 configs/ventana_defconfig                       |  4 ++--
 configs/vexpress_aemv8a_juno_defconfig          |  4 ++--
 configs/vexpress_aemv8a_semi_defconfig          |  4 ++--
 configs/whistler_defconfig                      |  4 ++--
 configs/wireless_space_defconfig                |  1 -
 configs/woodburn_defconfig                      |  2 +-
 configs/woodburn_sd_defconfig                   |  2 +-
 configs/work_92105_defconfig                    |  2 +-
 configs/x600_defconfig                          |  2 +-
 configs/xilinx-ppc405-generic_defconfig         |  2 +-
 configs/xilinx-ppc440-generic_defconfig         |  2 +-
 configs/zmx25_defconfig                         |  2 +-
 configs/zynq_microzed_defconfig                 |  2 +-
 configs/zynq_zc702_defconfig                    |  2 +-
 configs/zynq_zc706_defconfig                    |  2 +-
 configs/zynq_zc70x_defconfig                    |  2 +-
 configs/zynq_zc770_xm010_defconfig              |  2 +-
 configs/zynq_zc770_xm011_defconfig              |  2 +-
 configs/zynq_zc770_xm012_defconfig              |  2 +-
 configs/zynq_zc770_xm013_defconfig              |  2 +-
 configs/zynq_zed_defconfig                      |  2 +-
 configs/zynq_zybo_defconfig                     |  2 +-
 313 files changed, 482 insertions(+), 527 deletions(-)
configs/A10-OLinuXino-Lime_defconfig +1 -1
index ee219f8..f4ff7c5 100644
@@ -3,8 +3,8 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=480
 CONFIG_DRAM_EMR1=4
-CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_SYS_CLK_FREQ=912000000
+CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
configs/Bananapi_defconfig +1 -1
index 560295f..794b727 100644
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
-CONFIG_GMAC_TX_DELAY=3
 CONFIG_VIDEO_COMPOSITE=y
+CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
configs/Bananapro_defconfig +1 -1
index 346db34..e56ca71 100644
@@ -4,8 +4,8 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
 CONFIG_USB1_VBUS_PIN="PH0"
 CONFIG_USB2_VBUS_PIN="PH1"
-CONFIG_GMAC_TX_DELAY=3
 CONFIG_VIDEO_COMPOSITE=y
+CONFIG_GMAC_TX_DELAY=3
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
configs/Chuwi_V7_CW0825_defconfig +1 -1
index 7f1c4eb..1725f65 100644
@@ -18,7 +18,7 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_USB_MUSB_HOST=y
 CONFIG_VIDEO_LCD_SPI_CS="PA0"
 CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
 CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
-CONFIG_USB_MUSB_HOST=y
configs/M5208EVBE_defconfig +1 -1
index 6a46194..f30a7fb 100644
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5208EVBE=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M52277EVB_defconfig +1 -1
index 608edc5..ccb8823 100644
@@ -1,8 +1,8 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M52277EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000"
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="-> "
configs/M5235EVB_defconfig +1 -1
index e9c2b7c..a10ae8d 100644
@@ -1,7 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5235EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFE00000"
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="-> "
configs/M5272C3_defconfig +1 -1
index 6ad4e13..6e9609f 100644
@@ -1,6 +1,6 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5272C3=y
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="-> "
configs/M5275EVB_defconfig +1 -1
index b29021b..5eb2373 100644
@@ -1,6 +1,6 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5275EVB=y
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="-> "
configs/M5282EVB_defconfig +1 -1
index 322ee9a..e0af388 100644
@@ -1,6 +1,6 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5282EVB=y
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="-> "
configs/M53017EVB_defconfig +1 -1
index 3e72290..ca538f4 100644
@@ -1,4 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M53017EVB=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5329AFEE_defconfig +1 -1
index 1d2bb81..d5c6c7b 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5329EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=0"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5329BFEE_defconfig +1 -1
index 915734c..3524206 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5329EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5373EVB_defconfig +1 -1
index eb7a96a..2fdff5b 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5373EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M54418TWR_defconfig +1 -1
index a5c35d1..bc47ed6 100644
@@ -1,10 +1,10 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="-> "
configs/M54418TWR_nand_mii_defconfig +1 -1
index 20eadcf..949be9a 100644
@@ -1,10 +1,10 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000"
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="-> "
configs/M54418TWR_nand_rmii_defconfig +1 -1
index d47127c..4035ea9 100644
@@ -1,10 +1,10 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="-> "
configs/M54418TWR_nand_rmii_lowfreq_defconfig +1 -1
index 700745d..d89a587 100644
@@ -1,10 +1,10 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="-> "
configs/M54418TWR_serial_mii_defconfig +1 -1
index 4450084..cd383c2 100644
@@ -1,10 +1,10 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000"
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="-> "
configs/M54418TWR_serial_rmii_defconfig +1 -1
index a5c35d1..bc47ed6 100644
@@ -1,10 +1,10 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="-> "
configs/M54451EVB_defconfig +1 -1
index 0b446b8..2115263 100644
@@ -1,8 +1,8 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54451EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000"
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="-> "
configs/M54455EVB_defconfig +1 -1
index c7a0164..20bf103 100644
@@ -1,8 +1,8 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=33333333"
+CONFIG_SYS_PROMPT="-> "
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="-> "
configs/M5475AFE_defconfig +1 -1
index b29d1a6..11d14e6 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5475BFE_defconfig +1 -1
index e62fbf6..24f4256 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5475CFE_defconfig +1 -1
index 195b4e3..a899601 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5475DFE_defconfig +1 -1
index 314ced6..66523cc 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5475EFE_defconfig +1 -1
index 279808f..410e150 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5475FFE_defconfig +1 -1
index a00100e..b590fd9 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5475GFE_defconfig +1 -1
index 1ea82a7..ea41ec2 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5475EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=133333333,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5485AFE_defconfig +1 -1
index 70cfa8f..e3f2f9e 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5485BFE_defconfig +1 -1
index 377b87f..b3ec7ae 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5485CFE_defconfig +1 -1
index faa0196..6637fdc 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5485DFE_defconfig +1 -1
index 71a028f..34dd51e 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_USBCTRL"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5485EFE_defconfig +1 -1
index 784803e..1f5c4ea 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_VIDEO,SYS_USBCTRL"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5485FFE_defconfig +1 -1
index 8a831e3..737411b 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=32,SYS_VIDEO,SYS_USBCTRL,SYS_DRAMSZ1=64"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5485GFE_defconfig +1 -1
index 00c7479..2def6ea 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/M5485HFE_defconfig +1 -1
index 887bd4d..4263f40 100644
@@ -1,5 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
configs/MPC8349ITXGP_defconfig +1 -1
index 4578b32..1a85eea 100644
@@ -2,5 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITXGP,SYS_TEXT_BASE=0xFE000000"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="MPC8349E-mITX-GP> "
+# CONFIG_CMD_SETEXPR is not set
configs/MPC8349ITX_LOWBOOT_defconfig +1 -1
index c5fbeb9..9aabd6a 100644
@@ -2,5 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX,SYS_TEXT_BASE=0xFE000000"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="MPC8349E-mITX> "
+# CONFIG_CMD_SETEXPR is not set
configs/MPC8349ITX_defconfig +1 -1
index a895c53..a5309de 100644
@@ -2,5 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX"
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="MPC8349E-mITX> "
+# CONFIG_CMD_SETEXPR is not set
configs/MSI_Primo81_defconfig +1 -1
index 3b8e043..9d667b7 100644
@@ -17,10 +17,10 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_AXP221_DLDO1_VOLT=3300
+CONFIG_USB_MUSB_HOST=y
 CONFIG_VIDEO_LCD_SSD2828_TX_CLK=27
 CONFIG_VIDEO_LCD_SSD2828_RESET="PA26"
 CONFIG_VIDEO_LCD_SPI_CS="PH9"
 CONFIG_VIDEO_LCD_SPI_SCLK="PH10"
 CONFIG_VIDEO_LCD_SPI_MOSI="PH11"
 CONFIG_VIDEO_LCD_SPI_MISO="PH12"
-CONFIG_USB_MUSB_HOST=y
configs/Mini-X_defconfig +1 -1
index 31d6217..314f97b 100644
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
-CONFIG_VIDEO_COMPOSITE=y
 CONFIG_USB0_VBUS_PIN="PB9"
+CONFIG_VIDEO_COMPOSITE=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
configs/PATI_defconfig +1 -1
index 6c1bf17..ae95732 100644
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_5xx=y
 CONFIG_TARGET_PATI=y
+CONFIG_SYS_PROMPT="pati=> "
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
@@ -13,4 +14,3 @@ CONFIG_TARGET_PATI=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="pati=> "
configs/UCP1020_defconfig +1 -1
index 6718865..fa54286 100644
@@ -1,10 +1,10 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_UCP1020=y
+CONFIG_SYS_PROMPT="B$ "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b"
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="B$ "
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
configs/VCMA9_defconfig +1 -1
index e9b28a8..927967d 100644
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VCMA9=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="VCMA9 # "
+# CONFIG_CMD_SETEXPR is not set
configs/Wexler_TAB7200_defconfig +1 -1
index 02504f9..a54ad4f 100644
@@ -10,7 +10,6 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:210,up:22,lo
 CONFIG_VIDEO_LCD_POWER="PH8"
 CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wexler-tab7200"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
@@ -19,3 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_MUSB_HOST=y
configs/ac14xx_defconfig +1 -1
index 238630e..608b56a 100644
@@ -1,5 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_AC14XX=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="ac14xx> "
+# CONFIG_CMD_SETEXPR is not set
configs/adp-ag101p_defconfig +1 -1
index 92aa0be..4216cd7 100644
@@ -1,4 +1,4 @@
 CONFIG_NDS32=y
 CONFIG_TARGET_ADP_AG101P=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="NDS32 # "
+# CONFIG_CMD_SETEXPR is not set
configs/alt_defconfig +1 -1
index d994d78..479b4a5 100644
@@ -16,6 +16,6 @@ CONFIG_TARGET_ALT=y
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SH_SDHI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
-CONFIG_SH_SDHI=y
configs/am335x_boneblack_defconfig +1 -1
index f1ff65f..6b1a554 100644
@@ -7,5 +7,5 @@ CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SPI_FLASH=y
 CONFIG_DFU_TFTP=y
+CONFIG_SPI_FLASH=y
configs/am335x_gp_evm_defconfig +0 -1
index 62d3b6b..65c7b90 100644
@@ -9,6 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_SPI_FLASH=y
 CONFIG_RSA=y
configs/am335x_sl50_defconfig +0 -1
index 0ddccc8..608804c 100644
@@ -4,7 +4,6 @@ CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
-CONFIG_CONS_INDEX=1
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
configs/am3517_crane_defconfig +1 -1
index 806dc3a..48a184f 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_AM3517_CRANE=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="AM3517_CRANE # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
@@ -9,4 +10,3 @@ CONFIG_SPL=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="AM3517_CRANE # "
configs/am3517_evm_defconfig +1 -1
index 95b6754..8857b9f 100644
@@ -3,9 +3,9 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_AM3517_EVM=y
 CONFIG_SPL=y
 CONFIG_FIT=y
+CONFIG_SYS_PROMPT="AM3517_EVM # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="AM3517_EVM # "
configs/amcore_defconfig +1 -1
index dc16d5b..ad69f0a 100644
@@ -1,9 +1,9 @@
 CONFIG_M68K=y
 CONFIG_TARGET_AMCORE=y
+CONFIG_SYS_PROMPT="amcore $ "
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="amcore $ "
configs/apalis_t30_defconfig +2 -2
index c0830db..8971d29 100644
@@ -1,17 +1,17 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_APALIS_T30=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
+CONFIG_SYS_PROMPT="Apalis T30 # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Apalis T30 # "
configs/apf27_defconfig +1 -1
index 4503235..3a7a8c1 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_APF27=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="BIOS> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
-CONFIG_SYS_PROMPT="BIOS> "
configs/arcangel4-be_defconfig +1 -1
index 7335aac..4c6fcb0 100644
@@ -1,6 +1,7 @@
 CONFIG_ARC=y
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_TARGET_ARCANGEL4=y
+CONFIG_DM_SERIAL=y
 CONFIG_SYS_CLK_FREQ=70000000
 CONFIG_SYS_TEXT_BASE=0x81000000
 CONFIG_DEFAULT_DEVICE_TREE="arcangel4"
@@ -10,5 +11,4 @@ CONFIG_DEFAULT_DEVICE_TREE="arcangel4"
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM=y
-CONFIG_DM_SERIAL=y
 CONFIG_USE_PRIVATE_LIBGCC=y
configs/arcangel4_defconfig +2 -2
index cd9aafd..2157e0c 100644
@@ -1,14 +1,14 @@
 CONFIG_ARC=y
 CONFIG_TARGET_ARCANGEL4=y
+CONFIG_DM_SERIAL=y
 CONFIG_SYS_CLK_FREQ=70000000
 CONFIG_SYS_TEXT_BASE=0x81000000
 CONFIG_DEFAULT_DEVICE_TREE="arcangel4"
+CONFIG_SYS_PROMPT="arcangel4# "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
 CONFIG_DM=y
-CONFIG_DM_SERIAL=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="arcangel4# "
configs/arndale_defconfig +2 -2
index 3a1049f..6cc6642 100644
@@ -1,12 +1,13 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ARNDALE=y
+CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="ARNDALE # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
@@ -15,4 +16,3 @@ CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_SYS_PROMPT="ARNDALE # "
configs/astro_mcf5373l_defconfig +1 -1
index 8676120..f787bb7 100644
@@ -1,6 +1,6 @@
 CONFIG_M68K=y
 CONFIG_TARGET_ASTRO_MCF5373L=y
+CONFIG_SYS_PROMPT="URMEL > "
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="URMEL > "
configs/at91rm9200ek_defconfig +1 -1
index 10df5f8..e743b53 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91RM9200EK=y
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91rm9200ek_ram_defconfig +1 -1
index 2765e9d..2043923 100644
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91RM9200EK=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9260ek_dataflash_cs0_defconfig +1 -1
index 9909bc8..3c52fef 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9260ek_dataflash_cs1_defconfig +1 -1
index 8fdbd88..3b98493 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9260ek_nandflash_defconfig +1 -1
index e4fc8d7..0eac59b 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9261ek_dataflash_cs0_defconfig +1 -1
index e182f70..b902f60 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9261ek_dataflash_cs3_defconfig +1 -1
index b3a35dd..c370ae7 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9261ek_nandflash_defconfig +1 -1
index 58aa38f..d7a98c6 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9263ek_dataflash_cs0_defconfig +1 -1
index 82e1b86..f2edb9f 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9263ek_dataflash_defconfig +1 -1
index 82e1b86..f2edb9f 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9263ek_nandflash_defconfig +1 -1
index bac882e..c69e740 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9263ek_norflash_boot_defconfig +1 -1
index 75f0ec6..b5cd0da 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9263ek_norflash_defconfig +1 -1
index 5bcdab0..790fcc2 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9263EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9g10ek_dataflash_cs0_defconfig +1 -1
index 80e6a8a..a18d776 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9g10ek_dataflash_cs3_defconfig +1 -1
index e6c9f61..7c4a62c 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9g10ek_nandflash_defconfig +1 -1
index 0adaf11..98a14f4 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9g20ek_2mmc_defconfig +1 -1
index 40cd6b1..4c669f4 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9g20ek_2mmc_nandflash_defconfig +1 -1
index 6f59305..8c39f19 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9g20ek_dataflash_cs0_defconfig +1 -1
index b63c6d6..ed2cbf9 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9g20ek_dataflash_cs1_defconfig +1 -1
index aad9c1e..06d52de 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9g20ek_nandflash_defconfig +1 -1
index f247084..8bc3fee 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9m10g45ek_mmc_defconfig +1 -1
index f88b48b..6e4e6a4 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9M10G45EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -10,4 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9m10g45ek_nandflash_defconfig +1 -1
index 7675f52..825129c 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9M10G45EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -10,4 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9n12ek_mmc_defconfig +1 -1
index 1702a32..7c2af16 100644
@@ -2,9 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9n12ek_nandflash_defconfig +1 -1
index 9f87469..3aa3cb1 100644
@@ -3,9 +3,9 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9n12ek_spiflash_defconfig +1 -1
index a7d0581..b01fdc1 100644
@@ -3,9 +3,9 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9N12EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9rlek_dataflash_defconfig +1 -1
index ed2f5d2..e1ca59d 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9RLEK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH"
 CONFIG_HUSH_PARSER=y
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -12,4 +13,3 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9rlek_mmc_defconfig +1 -1
index 760cf92..7202997 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9RLEK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_MMC"
 CONFIG_HUSH_PARSER=y
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -12,4 +13,3 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9rlek_nandflash_defconfig +1 -1
index 191a261..220f95f 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9RLEK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_NANDFLASH"
 CONFIG_HUSH_PARSER=y
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -12,4 +13,3 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9x5ek_dataflash_defconfig +1 -1
index 38607d0..998f11d 100644
@@ -2,10 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9x5ek_mmc_defconfig +1 -1
index 8776627..78b73cf 100644
@@ -2,10 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9x5ek_nandflash_defconfig +1 -1
index cedc560..d1a8c6c 100644
@@ -3,10 +3,10 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9x5ek_spiflash_defconfig +1 -1
index 3896300..51b7e05 100644
@@ -3,10 +3,10 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9xeek_dataflash_cs0_defconfig +1 -1
index fbdb564..14e49bc 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9xeek_dataflash_cs1_defconfig +1 -1
index 4f0cc11..d04c6e6 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/at91sam9xeek_nandflash_defconfig +1 -1
index 3dde55c..795e1c2 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9260EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/atngw100_defconfig +1 -1
index 51facf7..043f6bf 100644
@@ -1,5 +1,6 @@
 CONFIG_AVR32=y
 CONFIG_TARGET_ATNGW100=y
+CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
@@ -9,4 +10,3 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/atngw100mkii_defconfig +1 -1
index b7099f5..c8d9107 100644
@@ -1,5 +1,6 @@
 CONFIG_AVR32=y
 CONFIG_TARGET_ATNGW100MKII=y
+CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
@@ -8,4 +9,3 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/atstk1002_defconfig +1 -1
index 78e2256..d525868 100644
@@ -1,5 +1,6 @@
 CONFIG_AVR32=y
 CONFIG_TARGET_ATSTK1002=y
+CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
@@ -8,4 +9,3 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/bayleybay_defconfig +4 -4
index 2ea30c8..56316ee 100644
@@ -18,15 +18,15 @@ CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
 CONFIG_CPU=y
-CONFIG_DM_PCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
+CONFIG_DM_PCI=y
+CONFIG_DM_RTC=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_DM_RTC=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_SYS_VSNPRINTF=y
configs/beaver_defconfig +2 -2
index 02e19d2..4a6f6e4 100644
@@ -1,17 +1,17 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_BEAVER=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
+CONFIG_SYS_PROMPT="Tegra30 (Beaver) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Tegra30 (Beaver) # "
configs/bf537-minotaur_defconfig +1 -1
index 212f2bb..f71af52 100644
@@ -1,8 +1,8 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_MINOTAUR=y
+CONFIG_SYS_PROMPT="minotaur> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="minotaur> "
configs/bf537-srv1_defconfig +1 -1
index 52abf99..3db7400 100644
@@ -1,8 +1,8 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_SRV1=y
+CONFIG_SYS_PROMPT="srv1> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="srv1> "
configs/bf561-acvilon_defconfig +1 -1
index 1409901..c546421 100644
@@ -1,9 +1,9 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF561_ACVILON=y
+CONFIG_SYS_PROMPT="Acvilon> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
-CONFIG_SYS_PROMPT="Acvilon> "
configs/br4_defconfig +1 -1
index 540dbef..5a680a0 100644
@@ -1,9 +1,9 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BR4=y
+CONFIG_SYS_PROMPT="br4>"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
-CONFIG_SYS_PROMPT="br4>"
configs/cairo_defconfig +1 -1
index 756457c..b1df103 100644
@@ -2,9 +2,9 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_CAIRO=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="Cairo # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_NET is not set
-CONFIG_SYS_PROMPT="Cairo # "
configs/calimain_defconfig +1 -1
index 4d952cd..271b556 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_CALIMAIN=y
+CONFIG_SYS_PROMPT="Calimain > "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR="\x0b"
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="Calimain > "
configs/cardhu_defconfig +2 -2
index 5c298d7..722bbeb 100644
@@ -1,17 +1,17 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_CARDHU=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"
+CONFIG_SYS_PROMPT="Tegra30 (Cardhu) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Tegra30 (Cardhu) # "
configs/cgtqmx6qeval_defconfig +1 -1
index 0289a3f..fdbcc22 100644
@@ -2,9 +2,9 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_CGTQMX6EVAL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6Q"
+CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "
 CONFIG_DM=y
 CONFIG_DM_THERMAL=y
configs/chromebook_jerry_defconfig +11 -13
index 389dfd2..3ded392 100644
@@ -11,33 +11,31 @@ CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_CLK=y
-CONFIG_SPL_CLK=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_RESET=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_LED=y
 CONFIG_SPL_LED=y
 CONFIG_LED_GPIO=y
-CONFIG_DEBUG_UART=y
-CONFIG_DEBUG_UART_BASE=0xff690000
-CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART_SHIFT=2
-CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_RESET=y
+CONFIG_DM_MMC=y
+CONFIG_ROCKCHIP_DWMMC=y
 CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SIMPLE=y
 CONFIG_SPL_PINCTRL=y
-CONFIG_SPL_PINCTRL_SIMPLE=y
 CONFIG_ROCKCHIP_PINCTRL=y
-CONFIG_ROCKCHIP_GPIO=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_ACT8846=y
 CONFIG_DM_REGULATOR=y
 CONFIG_REGULATOR_ACT8846=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
-CONFIG_DM_MMC=y
-CONFIG_ROCKCHIP_DWMMC=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_BASE=0xff690000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y
configs/chromebook_link_defconfig +3 -3
index 9855736..1c10124 100644
@@ -14,17 +14,17 @@ CONFIG_CMD_BOOTSTAGE=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_OF_CONTROL=y
-CONFIG_DM_PCI=y
-CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
+CONFIG_SPI_FLASH=y
+CONFIG_DM_PCI=y
+CONFIG_DM_RTC=y
 CONFIG_DM_TPM=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
-CONFIG_DM_RTC=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_SYS_VSNPRINTF=y
 CONFIG_TPM=y
configs/chromebox_panther_defconfig +3 -3
index c75b20d..70a22a9 100644
@@ -14,17 +14,17 @@ CONFIG_CMD_BOOTSTAGE=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_OF_CONTROL=y
-CONFIG_DM_PCI=y
-CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
+CONFIG_SPI_FLASH=y
+CONFIG_DM_PCI=y
+CONFIG_DM_RTC=y
 CONFIG_DM_TPM=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
-CONFIG_DM_RTC=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_SYS_VSNPRINTF=y
 CONFIG_TPM=y
configs/cm_fx6_defconfig +1 -1
index b50abab..bcd1820 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_CM_FX6=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
+CONFIG_SYS_PROMPT="CM-FX6 # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_LOADB is not set
@@ -28,5 +29,4 @@ CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
-CONFIG_SYS_PROMPT="CM-FX6 # "
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
configs/cm_t335_defconfig +1 -1
index 4f4bd0b..7288484 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_CM_T335=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="CM-T335 # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="CM-T335 # "
configs/cm_t3517_defconfig +1 -1
index 1eb4250..d224b20 100644
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_CM_T3517=y
+CONFIG_SYS_PROMPT="CM-T3517 # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="CM-T3517 # "
configs/cm_t35_defconfig +1 -1
index 99dd2f4..57ab275 100644
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_CM_T35=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="CM-T3x # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="CM-T3x # "
configs/cm_t43_defconfig +2 -2
index 19ac18a..c0cdb48 100644
@@ -1,10 +1,10 @@
 CONFIG_ARM=y
 CONFIG_TARGET_CM_T43=y
+CONFIG_DM_GPIO=y
 CONFIG_SPL=y
+# CONFIG_CMD_FLASH is not set
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_FPGA is not set
-# CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_DM=y
-CONFIG_DM_GPIO=y
configs/cm_t54_defconfig +1 -1
index fc72ffa..f81aac4 100644
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_CM_T54=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="CM-T54 # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="CM-T54 # "
configs/cobra5272_defconfig +1 -1
index 77ad34d..5cb6a80 100644
@@ -1,6 +1,6 @@
 CONFIG_M68K=y
 CONFIG_TARGET_COBRA5272=y
+CONFIG_SYS_PROMPT="COBRA > "
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="COBRA > "
configs/colibri_t20_defconfig +2 -2
index 0d28b06..5104e95 100644
@@ -1,15 +1,15 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_COLIBRI_T20=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
+CONFIG_SYS_PROMPT="Colibri T20 # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Colibri T20 # "
configs/colibri_t30_defconfig +2 -2
index d1ed09d..738b041 100644
@@ -1,15 +1,15 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_COLIBRI_T30=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
+CONFIG_SYS_PROMPT="Colibri T30 # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Colibri T30 # "
configs/colibri_vf_defconfig +1 -1
index 74af563..9bc7e92 100644
@@ -1,9 +1,9 @@
 CONFIG_ARM=y
 CONFIG_TARGET_COLIBRI_VF=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
+CONFIG_SYS_PROMPT="Colibri VFxx # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
-CONFIG_SYS_PROMPT="Colibri VFxx # "
configs/colibri_vf_dtb_defconfig +1 -1
index 54c3f2d..8658258 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_COLIBRI_VF=y
 CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
+CONFIG_SYS_PROMPT="Colibri VFxx # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
@@ -9,4 +10,3 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_NAND_VF610_NFC=y
 CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
-CONFIG_SYS_PROMPT="Colibri VFxx # "
configs/coreboot-x86_defconfig +2 -2
index e95f96d..438e43b 100644
@@ -12,15 +12,15 @@ CONFIG_CMD_BOOTSTAGE=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_OF_CONTROL=y
-CONFIG_DM_PCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
+CONFIG_DM_PCI=y
+CONFIG_DM_RTC=y
 CONFIG_DM_TPM=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_DM_RTC=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_SYS_VSNPRINTF=y
 CONFIG_TPM=y
configs/corvus_defconfig +1 -1
index 1fed14e..c9410db 100644
@@ -3,10 +3,10 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_CORVUS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/crownbay_defconfig +4 -4
index f328159..d036c05 100644
@@ -17,15 +17,15 @@ CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
 CONFIG_CPU=y
-CONFIG_DM_PCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
 CONFIG_PCH_GBE=y
-CONFIG_VIDEO_VESA=y
-CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+CONFIG_DM_PCI=y
+CONFIG_DM_RTC=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_DM_RTC=y
+CONFIG_VIDEO_VESA=y
+CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_SYS_VSNPRINTF=y
configs/da830evm_defconfig +1 -1
index d37ede3..3dda857 100644
@@ -1,9 +1,9 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA830EVM=y
+CONFIG_SYS_PROMPT="U-Boot > "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot > "
configs/da850evm_defconfig +1 -1
index 557c0d5..3f2c3c8 100644
@@ -3,8 +3,8 @@ CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA850EVM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
+CONFIG_SYS_PROMPT="U-Boot > "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot > "
configs/da850evm_direct_nor_defconfig +1 -1
index 79b877f..6b0bde2 100644
@@ -2,6 +2,6 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA850EVM=y
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
+CONFIG_SYS_PROMPT="U-Boot > "
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot > "
configs/dalmore_defconfig +2 -2
index 4c1b573..e63a5c1 100644
@@ -1,18 +1,18 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA114=y
 CONFIG_TARGET_DALMORE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
+CONFIG_SYS_PROMPT="Tegra114 (Dalmore) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Tegra114 (Dalmore) # "
configs/dbau1000_defconfig +1 -1
index 5dc12d2..5ffe104 100644
@@ -1,6 +1,7 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="DBAU1000"
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
@@ -10,4 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="DBAU1000"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="DbAu1xx0 # "
configs/dbau1100_defconfig +1 -1
index 522b9bc..84e369a 100644
@@ -1,6 +1,7 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1100=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
@@ -10,4 +11,3 @@ CONFIG_DBAU1100=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="DbAu1xx0 # "
configs/dbau1500_defconfig +1 -1
index 2fdddc7..8a9583b 100644
@@ -1,6 +1,7 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1500=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
@@ -10,4 +11,3 @@ CONFIG_DBAU1500=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="DbAu1xx0 # "
configs/dbau1550_defconfig +1 -1
index 07be3f1..333a922 100644
@@ -1,6 +1,7 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1550=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
@@ -8,4 +9,3 @@ CONFIG_DBAU1550=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="DbAu1xx0 # "
configs/dbau1550_el_defconfig +1 -1
index 7bd1e0c..5970e43 100644
@@ -2,6 +2,7 @@ CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1550=y
 CONFIG_SYS_LITTLE_ENDIAN=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
@@ -9,4 +10,3 @@ CONFIG_SYS_LITTLE_ENDIAN=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="DbAu1xx0 # "
configs/devkit3250_defconfig +1 -1
index 7246da5..6465299 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_DEVKIT3250=y
+CONFIG_DM_GPIO=y
 CONFIG_SPL=y
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_DM=y
-CONFIG_DM_GPIO=y
configs/dockstar_defconfig +1 -1
index e4da466..819cf1f 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DOCKSTAR=y
+CONFIG_SYS_PROMPT="DockStar> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="DockStar> "
configs/dra72_evm_defconfig +1 -2
index 3205e72..b5bd798 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_DRA7XX_EVM=y
+CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="dra72-evm"
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
@@ -10,8 +11,6 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
-CONFIG_DM_GPIO=y
configs/draco_defconfig +1 -1
index d2fc98d..b5f0a50 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_DRACO=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="U-Boot# "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
@@ -8,4 +9,3 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot# "
configs/duovero_defconfig +1 -1
index d3de28a..cc0e9a3 100644
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_OMAP44XX=y
 CONFIG_TARGET_DUOVERO=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="duovero # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="duovero # "
configs/e2220-1170_defconfig +0 -3
index 72e5ab3..a27a597 100644
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
 CONFIG_TEGRA210=y
-CONFIG_TARGET_E2220_1170=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -9,9 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_USE_PRIVATE_LIBGCC=y
configs/ea20_defconfig +1 -1
index 1d7494f..3d5a1c4 100644
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_EA20=y
+CONFIG_SYS_PROMPT="ea20 > "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="ea20 > "
configs/eb_cpu5282_defconfig +1 -1
index 0044de6..52f4a24 100644
@@ -1,6 +1,6 @@
 CONFIG_M68K=y
 CONFIG_TARGET_EB_CPU5282=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400"
+CONFIG_SYS_PROMPT="\nEB+CPU5282> "
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="\nEB+CPU5282> "
configs/eco5pk_defconfig +1 -1
index 8b5874d..759e7e9 100644
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_ECO5PK=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="ECO5-PK # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="ECO5-PK # "
configs/edminiv2_defconfig +1 -1
index b2a2506..d2c3f22 100644
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_ORION5X=y
 CONFIG_TARGET_EDMINIV2=y
 CONFIG_SPL=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="EDMiniV2> "
+# CONFIG_CMD_SETEXPR is not set
configs/ethernut5_defconfig +1 -1
index d97008a..2645d90 100644
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_ETHERNUT5=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/firefly-rk3288_defconfig +12 -12
index 5fe90b5..edb2db2 100644
@@ -11,32 +11,32 @@ CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_CLK=y
-CONFIG_SPL_CLK=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_RESET=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
-CONFIG_DEBUG_UART=y
-CONFIG_DEBUG_UART_BASE=0xff690000
-CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_DEBUG_UART_SHIFT=2
-CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_RESET=y
+CONFIG_DM_MMC=y
+CONFIG_ROCKCHIP_DWMMC=y
 CONFIG_PINCTRL=y
-CONFIG_SPL_PINCTRL=y
 # CONFIG_PINCTRL_FULL is not set
+CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
 CONFIG_ROCKCHIP_PINCTRL=y
-CONFIG_ROCKCHIP_GPIO=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_ACT8846=y
 CONFIG_DM_REGULATOR=y
 CONFIG_REGULATOR_ACT8846=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y
-CONFIG_DM_MMC=y
-CONFIG_ROCKCHIP_DWMMC=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_BASE=0xff690000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_ERRNO_STR=y
configs/flea3_defconfig +1 -1
index c9e4a28..05bb8b4 100644
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_FLEA3=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="flea3 U-Boot > "
+# CONFIG_CMD_SETEXPR is not set
configs/fx12mm_defconfig +1 -1
index 0213681..da5df04 100644
@@ -2,8 +2,8 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_FX12MM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,INIT_TLB=board/xilinx/ppc405-generic/init.o"
+CONFIG_SYS_PROMPT="FX12MM:/# "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="FX12MM:/# "
configs/goflexhome_defconfig +1 -1
index 059ce80..3f4cd1d 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GOFLEXHOME=y
+CONFIG_SYS_PROMPT="GoFlexHome> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="GoFlexHome> "
configs/gose_defconfig +1 -1
index 72aee1c..b0dfa90 100644
@@ -16,6 +16,6 @@ CONFIG_TARGET_GOSE=y
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SH_SDHI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
-CONFIG_SH_SDHI=y
configs/grasshopper_defconfig +1 -1
index eefc5f2..92a73e2 100644
@@ -1,9 +1,9 @@
 CONFIG_AVR32=y
 CONFIG_TARGET_GRASSHOPPER=y
+CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/gt90h_v4_defconfig +1 -1
index 3b72dc2..e9aecc3 100644
@@ -13,7 +13,6 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0
 CONFIG_VIDEO_LCD_POWER="PH7"
 CONFIG_VIDEO_LCD_BL_EN="PH6"
 CONFIG_VIDEO_LCD_BL_PWM="PH0"
-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-gt90h-v4"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
@@ -24,3 +23,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 CONFIG_AXP221_DCDC2_VOLT=1100
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
+CONFIG_USB_MUSB_HOST=y
configs/gwventana_defconfig +2 -2
index e45b077..5bb371c 100644
@@ -1,14 +1,14 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_GW_VENTANA=y
+CONFIG_DM_SERIAL=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x18000000
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_PROMPT="Ventana > "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
-CONFIG_DM_SERIAL=y
-CONFIG_SYS_PROMPT="Ventana > "
configs/h2200_defconfig +1 -1
index 07b1706..d112cf1 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_H2200=y
+CONFIG_SYS_PROMPT="> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
@@ -17,4 +18,3 @@ CONFIG_TARGET_H2200=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
-CONFIG_SYS_PROMPT="> "
configs/harmony_defconfig +2 -2
index c9c0618..79e91e0 100644
@@ -1,16 +1,16 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_HARMONY=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony"
+CONFIG_SYS_PROMPT="Tegra20 (Harmony) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Tegra20 (Harmony) # "
configs/hikey_defconfig +0 -3
index aa4fb0d..64a5929 100644
@@ -1,5 +1,2 @@
-# 96boards HiKey
 CONFIG_ARM=y
-CONFIG_TARGET_HIKEY=y
-CONFIG_NET=y
 # CONFIG_CMD_IMLS is not set
configs/ib62x0_defconfig +1 -1
index b3fa890..194ef02 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_IB62X0=y
+CONFIG_SYS_PROMPT="ib62x0 => "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="ib62x0 => "
configs/iconnect_defconfig +1 -1
index 4c34290..af1c1fc 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_ICONNECT=y
+CONFIG_SYS_PROMPT="iconnect => "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="iconnect => "
configs/imx31_phycore_defconfig +1 -1
index e801ee7..6f3ae10 100644
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_IMX31_PHYCORE=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="uboot> "
+# CONFIG_CMD_SETEXPR is not set
configs/inet97fv2_defconfig +1 -1
index d7ddee1..71f9d4f 100644
@@ -10,7 +10,6 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:209,up:22,lo
 CONFIG_VIDEO_LCD_POWER="PH8"
 CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet97fv2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
@@ -18,3 +17,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_USB_MUSB_HOST=y
configs/inet98v_rev2_defconfig +1 -1
index c23245a..4760047 100644
@@ -12,7 +12,6 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:45,ri:209,up:22,lo
 CONFIG_VIDEO_LCD_POWER="AXP0-0"
 CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-98v-rev2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
@@ -20,3 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_USB_MUSB_HOST=y
configs/inet9f_rev03_defconfig +1 -1
index fdfb02a..b51c367 100644
@@ -10,7 +10,6 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:209,up:22,lo
 CONFIG_VIDEO_LCD_POWER="PH8"
 CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
-CONFIG_USB_MUSB_HOST=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet9f-rev03"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
@@ -18,3 +17,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_USB_MUSB_HOST=y
configs/integratorap_cm720t_defconfig +1 -1
index 50c6005..5541f8e 100644
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM720T=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="Integrator-AP # "
+# CONFIG_CMD_SETEXPR is not set
configs/integratorap_cm920t_defconfig +1 -1
index ab0cdbd..de094b1 100644
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM920T=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="Integrator-AP # "
+# CONFIG_CMD_SETEXPR is not set
configs/integratorap_cm926ejs_defconfig +1 -1
index 317c6d8..cf75425 100644
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM926EJ_S=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="Integrator-AP # "
+# CONFIG_CMD_SETEXPR is not set
configs/integratorap_cm946es_defconfig +1 -1
index 5ce1c00..cd1b1c3 100644
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM946ES=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="Integrator-AP # "
+# CONFIG_CMD_SETEXPR is not set
configs/integratorcp_cm1136_defconfig +1 -1
index ddd2ce7..292a0fb 100644
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM1136=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="Integrator-CP # "
+# CONFIG_CMD_SETEXPR is not set
configs/integratorcp_cm920t_defconfig +1 -1
index 036b32e..20cd404 100644
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM920T=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="Integrator-CP # "
+# CONFIG_CMD_SETEXPR is not set
configs/integratorcp_cm926ejs_defconfig +1 -1
index 6fc2a84..1091be3 100644
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM926EJ_S=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="Integrator-CP # "
+# CONFIG_CMD_SETEXPR is not set
configs/integratorcp_cm946es_defconfig +1 -1
index e077a5e..a4aeba4 100644
@@ -2,5 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM946ES=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="Integrator-CP # "
+# CONFIG_CMD_SETEXPR is not set
configs/ipam390_defconfig +1 -1
index c416340..a353beb 100644
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_IPAM390=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="U-Boot > "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot > "
configs/jesurun_q5_defconfig +1 -1
index 46c38e5..cedf63d 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=312
+CONFIG_USB0_VBUS_PIN="PB9"
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-jesurun-q5"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
@@ -12,4 +13,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(19)"
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
-CONFIG_USB0_VBUS_PIN="PB9"
configs/jetson-tk1_defconfig +2 -2
index 8930ebe..6df5c7e 100644
@@ -1,18 +1,18 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA124=y
 CONFIG_TARGET_JETSON_TK1=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
+CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # "
configs/k2e_evm_defconfig +1 -1
index c4cbadd..4637087 100644
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2E_EVM=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="K2E EVM # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="K2E EVM # "
configs/k2hk_evm_defconfig +1 -1
index a604939..d0a0cbf 100644
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2HK_EVM=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="K2HK EVM # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="K2HK EVM # "
configs/k2l_evm_defconfig +1 -1
index a687e0c..8d6bdbd 100644
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2L_EVM=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="K2L EVM # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="K2L EVM # "
configs/koelsch_defconfig +1 -1
index df49a71..848aa55 100644
@@ -16,6 +16,6 @@ CONFIG_TARGET_KOELSCH=y
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SH_SDHI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
-CONFIG_SH_SDHI=y
configs/kwb_defconfig +1 -1
index 928c4bf..f82fcf3 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_KWB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
+CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
@@ -14,4 +15,3 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
configs/kzm9g_defconfig +1 -1
index 0669bbc..476f5f0 100644
@@ -1,5 +1,5 @@
 CONFIG_ARM=y
 CONFIG_RMOBILE=y
 CONFIG_TARGET_KZM9G=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="KZM-A9-GT# "
+# CONFIG_CMD_SETEXPR is not set
configs/lager_defconfig +1 -1
index 6b86f00..a43aca3 100644
@@ -16,6 +16,6 @@ CONFIG_TARGET_LAGER=y
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SH_SDHI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
-CONFIG_SH_SDHI=y
configs/ls1021aqds_qspi_defconfig +1 -1
index 7318eeb..44c7f50 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
+CONFIG_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds"
 CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
-CONFIG_DM_SPI=y
configs/ls1021atwr_qspi_defconfig +1 -1
index 4e5f100..5bb52bb 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
+CONFIG_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr"
 CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
 # CONFIG_CMD_IMLS is not set
@@ -9,4 +10,3 @@ CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
-CONFIG_DM_SPI=y
configs/ls2085aqds_defconfig +3 -3
index fb5ab2f..0c770e4 100644
@@ -1,13 +1,13 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085AQDS=y
-CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2085a-qds"
 # CONFIG_SYS_MALLOC_F is not set
+CONFIG_DM_SPI=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2085a-qds"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
-CONFIG_DM_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
-CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/ls2085ardb_defconfig +3 -3
index e80b3c1..7956533 100644
@@ -1,13 +1,13 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085ARDB=y
-CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2085a-rdb"
 # CONFIG_SYS_MALLOC_F is not set
+CONFIG_DM_SPI=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2085a-rdb"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
-CONFIG_DM_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
-CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y
configs/mcx_defconfig +1 -1
index 1f38640..fe80d6c 100644
@@ -2,9 +2,9 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_MCX=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="mcx # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="mcx # "
configs/medcom-wide_defconfig +2 -2
index c0ba9d1..df9560e 100644
@@ -1,16 +1,16 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_MEDCOM_WIDE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide"
+CONFIG_SYS_PROMPT="Tegra20 (Medcom-Wide) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Tegra20 (Medcom-Wide) # "
configs/microblaze-generic_defconfig +1 -1
index 53829d4..da589a0 100644
@@ -2,7 +2,7 @@ CONFIG_MICROBLAZE=y
 CONFIG_TARGET_MICROBLAZE_GENERIC=y
 CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic"
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="U-Boot-mONStR> "
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
-CONFIG_SYS_PROMPT="U-Boot-mONStR> "
configs/minnowmax_defconfig +4 -4
index f3cf91b..0d5bd4e 100644
@@ -17,17 +17,17 @@ CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
 CONFIG_CPU=y
-CONFIG_DM_PCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
+CONFIG_DM_PCI=y
+CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
+CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_DM_RTC=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_SYS_VSNPRINTF=y
configs/ml507_defconfig +1 -1
index 44b7c31..d1e4e30 100644
@@ -2,8 +2,8 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ML507=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o"
+CONFIG_SYS_PROMPT="ml507:/# "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="ml507:/# "
configs/mt_ventoux_defconfig +1 -1
index d5d26cf..27f2ecd 100644
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_MT_VENTOUX=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="mt_ventoux => "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="mt_ventoux => "
configs/mx6ul_14x14_evk_defconfig +3 -4
index 57dbad2..6787f00 100644
@@ -1,8 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
-CONFIG_CMD_NET=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_DHCP=y
+CONFIG_TARGET_MX6UL_14X14_EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
-CONFIG_TARGET_MX6UL_14X14_EVK=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
configs/mx6ul_9x9_evk_defconfig +2 -3
index e54609d..8b4c68c 100644
@@ -1,8 +1,7 @@
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6UL_9X9_EVK=y
 CONFIG_SPL=y
-CONFIG_CMD_NET=y
-CONFIG_CMD_PING=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
 CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
configs/mx7dsabresd_defconfig +4 -7
index bb95424..60aacb2 100644
@@ -1,14 +1,11 @@
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg,MX7D"
 CONFIG_ARM=y
 CONFIG_ARCH_MX7=y
 CONFIG_TARGET_MX7DSABRESD=y
-CONFIG_SYS_MALLOC_F=y
-CONFIG_SYS_MALLOC_F_LEN=0x400
-CONFIG_CMD_NET=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_DHCP=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg,MX7D"
 # CONFIG_CMD_BOOTD is not set
-# CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
configs/nas220_defconfig +1 -1
index 257c305..6748a6e 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NAS220=y
+CONFIG_SYS_PROMPT="nas220> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="nas220> "
configs/nokia_rx51_defconfig +1 -1
index 3dd24e0..b3d9682 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_NOKIA_RX51=y
+CONFIG_SYS_PROMPT="Nokia RX-51 # "
 CONFIG_AUTOBOOT_KEYED=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -10,4 +11,3 @@ CONFIG_AUTOBOOT_KEYED=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="Nokia RX-51 # "
configs/nyan-big_defconfig +8 -8
index 6464c37..2dd2930 100644
@@ -1,8 +1,10 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA124=y
 CONFIG_TARGET_NYAN_BIG=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
+CONFIG_SYS_PROMPT="Tegra124 (Nyan-big) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
@@ -11,19 +13,17 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
-CONFIG_SPL_DM=y
-CONFIG_SPI_FLASH=y
+CONFIG_CROS_EC_KEYB=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y
-CONFIG_CROS_EC_KEYB=y
+CONFIG_SPI_FLASH=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_DM_TPM=y
 CONFIG_TPM_TIS_I2C=y
-CONFIG_TEGRA114_SPI=y
-CONFIG_DISPLAY_PORT=y
-CONFIG_VIDEO_TEGRA124=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_TPM=y
+CONFIG_DISPLAY_PORT=y
+CONFIG_VIDEO_TEGRA124=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Tegra124 (Nyan-big) # "
+CONFIG_TPM=y
configs/odroid-xu3_defconfig +3 -3
index 9c3b6d6..479af9e 100644
@@ -1,15 +1,15 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ODROID_XU3=y
+CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SYS_PROMPT="ODROID-XU3 # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
-CONFIG_VIDEO_BRIDGE=y
-CONFIG_SYS_PROMPT="ODROID-XU3 # "
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_BRIDGE=y
configs/odroid_defconfig +2 -2
index 5c355ba..1e321d3 100644
@@ -1,8 +1,10 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ODROID=y
+CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SYS_PROMPT="Odroid # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
@@ -11,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX77686=y
@@ -20,4 +21,3 @@ CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_ERRNO_STR=y
-CONFIG_SYS_PROMPT="Odroid # "
configs/omap3_evm_defconfig +1 -1
index de8fbd9..168b9a8 100644
@@ -2,9 +2,9 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_EVM=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="OMAP3_EVM # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="OMAP3_EVM # "
configs/omap3_evm_quick_mmc_defconfig +1 -1
index 7d15b16..1b6aa7c 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="OMAP3_EVM # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
@@ -23,4 +24,3 @@ CONFIG_SPL=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
-CONFIG_SYS_PROMPT="OMAP3_EVM # "
configs/omap3_evm_quick_nand_defconfig +1 -1
index cd30134..48c2bb1 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="OMAP3_EVM # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
@@ -23,4 +24,3 @@ CONFIG_SPL=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
-CONFIG_SYS_PROMPT="OMAP3_EVM # "
configs/omap3_logic_defconfig +1 -1
index 5d0ac9e..3f8a154 100644
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_LOGIC=y
+CONFIG_SYS_PROMPT="OMAP Logic # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
-CONFIG_SYS_PROMPT="OMAP Logic # "
configs/omap3_overo_defconfig +1 -1
index 5d03485..3350212 100644
@@ -2,10 +2,10 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_OVERO=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="Overo # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="Overo # "
configs/omap3_pandora_defconfig +1 -1
index 4fb7899..e165145 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_PANDORA=y
+CONFIG_SYS_PROMPT="Pandora # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
@@ -8,4 +9,3 @@ CONFIG_TARGET_OMAP3_PANDORA=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SYS_PROMPT="Pandora # "
configs/omapl138_lcdk_defconfig +1 -1
index 4cff178..8aa410d 100644
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_OMAPL138_LCDK=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="U-Boot > "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot > "
configs/origen_defconfig +1 -1
index 6ddfc97..95c8ebc 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ORIGEN=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="ORIGEN # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
@@ -12,4 +13,3 @@ CONFIG_SPL=y
 CONFIG_OF_CONTROL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_SYS_PROMPT="ORIGEN # "
configs/p2371-0000_defconfig +0 -2
index 71a9a75..6545d5d 100644
@@ -9,9 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_USE_PRIVATE_LIBGCC=y
configs/p2571_defconfig +0 -2
index 877a905..391a3e7 100644
@@ -9,9 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_USE_PRIVATE_LIBGCC=y
configs/paz00_defconfig +2 -2
index 5cba318..5d076f7 100644
@@ -1,16 +1,16 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_PAZ00=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00"
+CONFIG_SYS_PROMPT="Tegra20 (Paz00) MOD # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Tegra20 (Paz00) MOD # "
configs/pb1000_defconfig +1 -1
index c6221a3..f24cd07 100644
@@ -1,6 +1,7 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_PB1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="PB1000"
+CONFIG_SYS_PROMPT="Pb1x00 # "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
@@ -10,4 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="PB1000"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Pb1x00 # "
configs/pcm030_defconfig +1 -1
index 6305092..9da4bb0 100644
@@ -1,5 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_PCM030=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="uboot> "
+# CONFIG_CMD_SETEXPR is not set
configs/peach-pi_defconfig +11 -11
index 56a5185..dfdf61b 100644
@@ -1,39 +1,39 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_PEACH_PI=y
+CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="Peach-Pi # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
-CONFIG_SPI_FLASH=y
-CONFIG_CMD_CROS_EC=y
-CONFIG_CROS_EC=y
-CONFIG_CROS_EC_SPI=y
-CONFIG_CROS_EC_KEYB=y
-CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_CROS_EC_KEYB=y
+CONFIG_CMD_CROS_EC=y
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_SPI=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_TPS65090=y
 CONFIG_DM_REGULATOR=y
 CONFIG_REGULATOR_TPS65090=y
-CONFIG_VIDEO_BRIDGE=y
-CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
+CONFIG_DM_TPM=y
+CONFIG_TPM_TIS_I2C=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_TPM=y
 CONFIG_ERRNO_STR=y
-CONFIG_SYS_PROMPT="Peach-Pi # "
configs/peach-pit_defconfig +11 -11
index 1934bf3..01c4f37 100644
@@ -1,39 +1,39 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_PEACH_PIT=y
+CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="Peach-Pit # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
-CONFIG_SPI_FLASH=y
-CONFIG_CMD_CROS_EC=y
-CONFIG_CROS_EC=y
-CONFIG_CROS_EC_SPI=y
-CONFIG_CROS_EC_KEYB=y
-CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_CROS_EC_KEYB=y
+CONFIG_CMD_CROS_EC=y
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_SPI=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_PMIC=y
 CONFIG_PMIC_TPS65090=y
 CONFIG_DM_REGULATOR=y
 CONFIG_REGULATOR_TPS65090=y
-CONFIG_VIDEO_BRIDGE=y
-CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
+CONFIG_DM_TPM=y
+CONFIG_TPM_TIS_I2C=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_TPM=y
 CONFIG_ERRNO_STR=y
-CONFIG_SYS_PROMPT="Peach-Pit # "
configs/pepper_defconfig +1 -1
index 787c5f9..f86b1b7 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PEPPER=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="pepper# "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="pepper# "
configs/platinum_picon_defconfig +1 -1
index 2e4e879..29ae5af 100644
@@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_PLATINUM_PICON=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
+CONFIG_SYS_PROMPT="picon > "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="picon > "
configs/platinum_titanium_defconfig +1 -1
index 0c8e32f..16d3184 100644
@@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_PLATINUM_TITANIUM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_PROMPT="titanium > "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="titanium > "
configs/plutux_defconfig +2 -2
index 07fa7f9..b6b07d8 100644
@@ -1,16 +1,16 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_PLUTUX=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux"
+CONFIG_SYS_PROMPT="Tegra20 (Plutux) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Tegra20 (Plutux) # "
configs/pm9261_defconfig +1 -1
index 0a7716e..83e2573 100644
@@ -2,10 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_PM9261=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261"
+CONFIG_SYS_PROMPT="pm9261> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="pm9261> "
configs/pm9263_defconfig +1 -1
index 45e060b..44c78e1 100644
@@ -2,10 +2,10 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_PM9263=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263"
+CONFIG_SYS_PROMPT="u-boot-pm9263> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="u-boot-pm9263> "
configs/pm9g45_defconfig +1 -1
index 3f34b3c..5a70de1 100644
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_PM9G45=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45"
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="U-Boot> "
configs/pogo_e02_defconfig +1 -1
index 50a058e..234833b 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_POGO_E02=y
+CONFIG_SYS_PROMPT="PogoE02> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="PogoE02> "
configs/porter_defconfig +1 -1
index dc8b5ca..b7c99de 100644
@@ -16,6 +16,6 @@ CONFIG_TARGET_PORTER=y
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SH_SDHI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
-CONFIG_SH_SDHI=y
configs/pov_protab2_ips9_defconfig +1 -1
index 3107f31..c5249d6 100644
@@ -7,10 +7,10 @@ CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_USB0_ID_DET="PH4"
 CONFIG_VIDEO_LCD_MODE="x:1024,y:768,depth:18,pclk_khz:100000,le:480,ri:260,up:6,lo:16,hs:320,vs:10,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_DCLK_PHASE=0
-CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_VIDEO_LCD_POWER="PH8"
 CONFIG_VIDEO_LCD_BL_EN="PH7"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
+CONFIG_VIDEO_LCD_PANEL_LVDS=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-pov-protab2-ips9"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
configs/pr1_defconfig +1 -1
index 583f132..03a3286 100644
@@ -1,9 +1,9 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_PR1=y
+CONFIG_SYS_PROMPT="pr1>"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y
-CONFIG_SYS_PROMPT="pr1>"
configs/pxm2_defconfig +1 -1
index 41c2849..b1b709f 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PXM2=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="U-Boot# "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
@@ -8,4 +9,3 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot# "
configs/qemu-x86_defconfig +1 -1
index 0675646..f4cc862 100644
@@ -17,9 +17,9 @@ CONFIG_CPU=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_DM_RTC=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_111=y
-CONFIG_DM_RTC=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_SYS_VSNPRINTF=y
configs/rastaban_defconfig +1 -1
index 7a3ac70..1d8064a 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_RASTABAN=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="U-Boot# "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
@@ -8,4 +9,3 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot# "
configs/rpi_2_defconfig +1 -1
index 4b92045..334a1b7 100644
@@ -1,9 +1,9 @@
 CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
 CONFIG_TARGET_RPI_2=y
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_PHYS_TO_BUS=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/rpi_defconfig +1 -1
index 195ff99..8cce790 100644
@@ -1,9 +1,9 @@
 CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
 CONFIG_TARGET_RPI=y
+CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_PHYS_TO_BUS=y
-CONFIG_SYS_PROMPT="U-Boot> "
configs/rut_defconfig +1 -1
index 774957c..8bb8d88 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_RUT=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="U-Boot# "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
@@ -8,4 +9,3 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SYS_PROMPT="U-Boot# "
configs/s5p_goni_defconfig +1 -1
index 5c873f7..fc0a45e 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_S5PC1XX=y
 CONFIG_TARGET_S5P_GONI=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"
+CONFIG_SYS_PROMPT="Goni # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FLASH is not set
@@ -10,4 +11,3 @@ CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 # CONFIG_CMD_MISC is not set
-CONFIG_SYS_PROMPT="Goni # "
configs/s5pc210_universal_defconfig +1 -1
index 36d294c..61f6d1f 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_S5PC210_UNIVERSAL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
+CONFIG_SYS_PROMPT="Universal # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
@@ -11,4 +12,3 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
 CONFIG_OF_CONTROL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_SYS_PROMPT="Universal # "
configs/sandbox_defconfig +16 -16
index e9e1597..ae96b63 100644
@@ -15,44 +15,44 @@ CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
-CONFIG_CLK=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_DEVRES=y
-CONFIG_DM_PCI=y
-CONFIG_PCI_SANDBOX=y
-CONFIG_SPI_FLASH_SANDBOX=y
-CONFIG_SPI_FLASH=y
+CONFIG_CLK=y
+CONFIG_SANDBOX_GPIO=y
+CONFIG_SYS_I2C_SANDBOX=y
+CONFIG_CROS_EC_KEYB=y
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SANDBOX=y
 CONFIG_RESET=y
+CONFIG_DM_MMC=y
+CONFIG_SPI_FLASH_SANDBOX=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
-CONFIG_CROS_EC_KEYB=y
-CONFIG_LED=y
-CONFIG_LED_GPIO=y
-CONFIG_SANDBOX_SERIAL=y
-CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_SANDBOX=y
-CONFIG_SYS_I2C_SANDBOX=y
-CONFIG_SANDBOX_SPI=y
+CONFIG_DM_PCI=y
+CONFIG_PCI_SANDBOX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCONF=y
 CONFIG_PINCTRL_SANDBOX=y
-CONFIG_SANDBOX_GPIO=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_SANDBOX=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_SANDBOX=y
 CONFIG_RAM=y
+CONFIG_DM_RTC=y
+CONFIG_SANDBOX_SERIAL=y
 CONFIG_SOUND=y
 CONFIG_SOUND_SANDBOX=y
+CONFIG_SANDBOX_SPI=y
+CONFIG_DM_TPM=y
+CONFIG_TPM_TIS_SANDBOX=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EMUL=y
 CONFIG_USB_STORAGE=y
-CONFIG_DM_MMC=y
-CONFIG_DM_RTC=y
 CONFIG_SYS_VSNPRINTF=y
 CONFIG_CMD_DHRYSTONE=y
 CONFIG_TPM=y
configs/seaboard_defconfig +2 -2
index 54afbdb..a5023c9 100644
@@ -1,16 +1,16 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
 CONFIG_TEGRA20=y
 CONFIG_TARGET_SEABOARD=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
+CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # "
configs/secomx6quq7_defconfig +1 -1
index c97172d..57bad8b 100644
@@ -5,6 +5,6 @@ CONFIG_SECOMX6_UQ7=y
 CONFIG_SECOMX6Q=y
 CONFIG_SECOMX6_2GB=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
+CONFIG_SYS_PROMPT="SECO MX6Q uQ7 U-Boot > "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
-CONFIG_SYS_PROMPT="SECO MX6Q uQ7 U-Boot > "
configs/silk_defconfig +1 -1
index e4e4ebc..5afcde3 100644
@@ -16,6 +16,6 @@ CONFIG_TARGET_SILK=y
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SH_SDHI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
-CONFIG_SH_SDHI=y
configs/smartweb_defconfig +0 -1
index 8f12f30..ee4340f 100644
@@ -3,5 +3,4 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SMARTWEB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
-CONFIG_CMD_NET=y
 CONFIG_SYS_PROMPT="U-Boot> "
configs/smdk2410_defconfig +1 -1
index 51f348e..bb80d55 100644
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SMDK2410=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="SMDK2410 # "
+# CONFIG_CMD_SETEXPR is not set
configs/smdk5250_defconfig +4 -4
index c9fd79f..0aca5b4 100644
@@ -1,21 +1,21 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_SMDK5250=y
+CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="SMDK5250 # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
-CONFIG_SPI_FLASH=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX77686=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_MAX77686=y
-CONFIG_VIDEO_BRIDGE=y
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
@@ -23,5 +23,5 @@ CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_BRIDGE=y
 CONFIG_ERRNO_STR=y
-CONFIG_SYS_PROMPT="SMDK5250 # "
configs/smdk5420_defconfig +4 -4
index e90c765..60bcf0a 100644
@@ -1,16 +1,16 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_SMDK5420=y
+CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="SMDK5420 # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SPI_FLASH=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
-CONFIG_VIDEO_BRIDGE=y
-CONFIG_SYS_PROMPT="SMDK5420 # "
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_BRIDGE=y
configs/smdkc100_defconfig +1 -1
index 676781e..cbd8cc3 100644
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_S5PC1XX=y
 CONFIG_TARGET_SMDKC100=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
+CONFIG_SYS_PROMPT="SMDKC100 # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="SMDKC100 # "
configs/smdkv310_defconfig +1 -1
index 7833f62..851fc5c 100644
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_SMDKV310=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310"
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="SMDKV310 # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
@@ -10,4 +11,3 @@ CONFIG_SPL=y
 # CONFIG_CMD_MISC is not set
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_SYS_PROMPT="SMDKV310 # "
configs/snapper9260_defconfig +1 -1
index 31cc5a0..0635d6c 100644
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_SNAPPER9260=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
+CONFIG_SYS_PROMPT="Snapper> "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
@@ -10,4 +11,3 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_SYS_PROMPT="Snapper> "
configs/sniper_defconfig +1 -1
index dd66ca0..7afaa49 100644
@@ -2,9 +2,9 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_SNIPER=y
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="Sniper # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
-CONFIG_SYS_PROMPT="Sniper # "
configs/snow_defconfig +16 -16
index 32c7c5d..c4e2f61 100644
@@ -1,8 +1,10 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_SNOW=y
+CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="snow # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
@@ -10,22 +12,15 @@ CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
-CONFIG_SPI_FLASH=y
-CONFIG_CMD_CROS_EC=y
-CONFIG_CROS_EC=y
-CONFIG_CROS_EC_I2C=y
-CONFIG_CROS_EC_KEYB=y
-CONFIG_DEBUG_UART=y
-CONFIG_DEBUG_UART_S5P=y
-CONFIG_DEBUG_UART_BASE=0x12c30000
-CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_CROS_EC_KEYB=y
+CONFIG_CMD_CROS_EC=y
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_I2C=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX77686=y
 CONFIG_PMIC_S5M8767=y
@@ -34,16 +29,21 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_REGULATOR_S5M8767=y
 CONFIG_REGULATOR_TPS65090=y
-CONFIG_VIDEO_BRIDGE=y
-CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
-CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y
-CONFIG_SYS_PROMPT="snow # "
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_S5P=y
+CONFIG_DEBUG_UART_BASE=0x12c30000
+CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
+CONFIG_DM_TPM=y
+CONFIG_TPM_TIS_I2C=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
+CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y
 CONFIG_TPM=y
 CONFIG_ERRNO_STR=y
configs/socfpga_arria5_defconfig +3 -5
index cb460e8..afdf237 100644
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPL_DM=y
+CONFIG_DM_GPIO=y
 CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
 CONFIG_SPL=y
@@ -8,11 +10,7 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_OF_CONTROL=y
-CONFIG_SPL_DM=y
+CONFIG_DWAPB_GPIO=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_DM_GPIO=y
-CONFIG_DWAPB_GPIO=y
configs/socfpga_cyclone5_defconfig +3 -5
index 8a7f8cc..fcd12d9 100644
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPL_DM=y
+CONFIG_DM_GPIO=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
 CONFIG_SPL=y
@@ -8,11 +10,7 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_OF_CONTROL=y
-CONFIG_SPL_DM=y
+CONFIG_DWAPB_GPIO=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_DM_GPIO=y
-CONFIG_DWAPB_GPIO=y
configs/socfpga_de0_nano_soc_defconfig +7 -11
index 2b0d510..5dc74b7 100644
@@ -1,20 +1,16 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
-CONFIG_TARGET_SOCFPGA_CYCLONE5=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPL_DM=y
+CONFIG_DM_GPIO=y
 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
 CONFIG_SPL=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
-CONFIG_OF_CONTROL=y
+CONFIG_SPL_SIMPLE_BUS=y
+CONFIG_DWAPB_GPIO=y
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_DM_GPIO=y
-CONFIG_DWAPB_GPIO=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_SPL_SIMPLE_BUS=y
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_ADDR=0x00800000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
configs/socfpga_mcvevk_defconfig +7 -12
index 36ec320..b90bce7 100644
@@ -1,21 +1,16 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
-CONFIG_TARGET_SOCFPGA_CYCLONE5=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPL_DM=y
+CONFIG_DM_GPIO=y
 CONFIG_TARGET_SOCFPGA_DENX_MCVEVK=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
 CONFIG_SPL=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
-CONFIG_OF_CONTROL=y
+CONFIG_SPL_SIMPLE_BUS=y
+CONFIG_DWAPB_GPIO=y
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_DM_GPIO=y
-CONFIG_DWAPB_GPIO=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_DM_SEQ_ALIAS=y
-CONFIG_SPL_SIMPLE_BUS=y
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_ADDR=0x00800000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
configs/socfpga_sockit_defconfig +8 -16
index 01723c5..11a4786 100644
@@ -1,26 +1,18 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
-CONFIG_TARGET_SOCFPGA_CYCLONE5=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPL_DM=y
+CONFIG_DM_GPIO=y
 CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
 CONFIG_SPL=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
-CONFIG_OF_CONTROL=y
+CONFIG_SPL_SIMPLE_BUS=y
+CONFIG_DWAPB_GPIO=y
 CONFIG_SPI_FLASH=y
-CONFIG_SPI_FLASH_USE_4K_SECTORS=n
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_DM_ETH=y
-CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_DM_GPIO=y
-CONFIG_DWAPB_GPIO=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_DM_SEQ_ALIAS=y
-CONFIG_SPL_SIMPLE_BUS=y
-CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_ADDR=0x00800000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
configs/socfpga_socrates_defconfig +3 -5
index d767579..04bacd0 100644
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPL_DM=y
+CONFIG_DM_GPIO=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
 CONFIG_SPL=y
@@ -8,11 +10,7 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_OF_CONTROL=y
-CONFIG_SPL_DM=y
+CONFIG_DWAPB_GPIO=y
 CONFIG_SPI_FLASH=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_DM_GPIO=y
-CONFIG_DWAPB_GPIO=y
configs/spring_defconfig +15 -15
index b20bfed..4acadf3 100644
@@ -1,8 +1,10 @@
 CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_SPRING=y
+CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-spring"
 CONFIG_SPL=y
+CONFIG_SYS_PROMPT="spring # "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_SOUND=y
@@ -10,22 +12,15 @@ CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_TPM=y
 CONFIG_CMD_TPM_TEST=y
-CONFIG_SPI_FLASH=y
-CONFIG_CMD_CROS_EC=y
-CONFIG_CROS_EC=y
-CONFIG_CROS_EC_I2C=y
-CONFIG_CROS_EC_KEYB=y
-CONFIG_DEBUG_UART=y
-CONFIG_DEBUG_UART_S5P=y
-CONFIG_DEBUG_UART_BASE=0x12c30000
-CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_DM_TPM=y
-CONFIG_TPM_TIS_I2C=y
-CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_CROS_EC_LDO=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y
+CONFIG_CROS_EC_KEYB=y
+CONFIG_CMD_CROS_EC=y
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_I2C=y
+CONFIG_SPI_FLASH=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX77686=y
 CONFIG_PMIC_S5M8767=y
@@ -34,15 +29,20 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_REGULATOR_S5M8767=y
 CONFIG_REGULATOR_TPS65090=y
-CONFIG_VIDEO_BRIDGE=y
-CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
-CONFIG_SYS_PROMPT="spring # "
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_S5P=y
+CONFIG_DEBUG_UART_BASE=0x12c30000
+CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
 CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
+CONFIG_DM_TPM=y
+CONFIG_TPM_TIS_I2C=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_BRIDGE=y
+CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_TPM=y
 CONFIG_ERRNO_STR=y
configs/stm32f429-discovery_defconfig +1 -1
index 0c54d5b..7512457 100644
@@ -1,4 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_STM32F429_DISCOVERY=y
-# CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_PROMPT="U-Boot > "
+# CONFIG_CMD_SETEXPR is not set
configs/stout_defconfig +1 -1
index fbfe919..fcfc5c1 100644
@@ -16,6 +16,6 @@ CONFIG_TARGET_STOUT=y
 # CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_MISC is not set
+CONFIG_SH_SDHI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
-CONFIG_SH_SDHI=y
configs/stv0991_defconfig +1 -1
index 0eeb7f6..60de787 100644

Lines of this file are not shown. View the raw message.

configs/tao3530_defconfig +1 -1
index 779f400..b2977f3 100644

Lines of this file are not shown. View the raw message.

configs/taurus_defconfig +1 -1
index 838d0ed..ec1566f 100644

Lines of this file are not shown. View the raw message.

configs/tb100_defconfig +2 -2
index acd1f3a..ca34bbb 100644

Lines of this file are not shown. View the raw message.

configs/tbs2910_defconfig +1 -1
index 822aec3..ffc419d 100644

Lines of this file are not shown. View the raw message.

configs/tec-ng_defconfig +2 -2
index 4e8f5c6..de74dc9 100644

Lines of this file are not shown. View the raw message.

configs/tec_defconfig +2 -2
index 84fa0be..2163ec8 100644

Lines of this file are not shown. View the raw message.

configs/thuban_defconfig +1 -1
index e2a6b0c..6b8e6b1 100644

Lines of this file are not shown. View the raw message.

configs/ti814x_evm_defconfig +1 -1
index f7d1e11..781e270 100644

Lines of this file are not shown. View the raw message.

configs/ti816x_evm_defconfig +1 -1
index 1fd2719..294d775 100644

Lines of this file are not shown. View the raw message.

configs/titanium_defconfig +1 -1
index de3c78d..45c49ce 100644

Lines of this file are not shown. View the raw message.

configs/trats2_defconfig +1 -1
index 4b290db..e6b9381 100644

Lines of this file are not shown. View the raw message.

configs/trats_defconfig +1 -1
index 9c24cae..8234046 100644

Lines of this file are not shown. View the raw message.

configs/tricorder_defconfig +1 -1
index 1da9e94..bc30837 100644

Lines of this file are not shown. View the raw message.

configs/trimslice_defconfig +2 -2
index a1bcb11..18292e2 100644

Lines of this file are not shown. View the raw message.

configs/tseries_mmc_defconfig +1 -1
index a083ee0..b4a4873 100644

Lines of this file are not shown. View the raw message.

configs/tseries_nand_defconfig +1 -1
index aa66a0e..8177a51 100644

Lines of this file are not shown. View the raw message.

configs/tseries_spi_defconfig +1 -1
index 1cb90d6..1c2a0ba 100644

Lines of this file are not shown. View the raw message.

configs/twister_defconfig +1 -1
index c3edd34..b817a55 100644

Lines of this file are not shown. View the raw message.

configs/udoo_defconfig +3 -3
index e4f1d8d..223917d 100644

Lines of this file are not shown. View the raw message.

configs/usb_a9263_dataflash_defconfig +1 -1
index 8cf3c4c..edf2b83 100644

Lines of this file are not shown. View the raw message.

configs/v5fx30teval_defconfig +1 -1
index e77dce9..3e2ce7d 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinum_defconfig +1 -1
index 9a46dcb..0c30ae9 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinum_onenand_defconfig +1 -1
index 8c8d69a..e26c2f6 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinum_onenand_small_defconfig +1 -1
index 4e6cbc7..33ce32a 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinum_small_defconfig +1 -1
index f896822..ceb61e1 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinumavc_defconfig +1 -1
index 6e867b2..103434c 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinumavc_onenand_defconfig +1 -1
index 55f8c91..e387b82 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinumavc_onenand_small_defconfig +1 -1
index 343ab8f..1958fcd 100644

Lines of this file are not shown. View the raw message.

configs/vct_platinumavc_small_defconfig +1 -1
index b4acc4a..0ac2def 100644

Lines of this file are not shown. View the raw message.

configs/vct_premium_defconfig +1 -1
index d71dd53..2ae4975 100644

Lines of this file are not shown. View the raw message.

configs/vct_premium_onenand_defconfig +1 -1
index 6923db8..9768dbc 100644

Lines of this file are not shown. View the raw message.

configs/vct_premium_onenand_small_defconfig +1 -1
index 04a2855..471a005 100644

Lines of this file are not shown. View the raw message.

configs/vct_premium_small_defconfig +1 -1
index 265a6a5..68c0d9a 100644

Lines of this file are not shown. View the raw message.

configs/venice2_defconfig +2 -2
index ce2d493..263ec63 100644

Lines of this file are not shown. View the raw message.

configs/ventana_defconfig +2 -2
index d347317..79c125e 100644

Lines of this file are not shown. View the raw message.

configs/vexpress_aemv8a_juno_defconfig +2 -2
index 3390f0e..bc3e05a 100644

Lines of this file are not shown. View the raw message.

configs/vexpress_aemv8a_semi_defconfig +2 -2
index 9890e64..a082d27 100644

Lines of this file are not shown. View the raw message.

configs/whistler_defconfig +2 -2
index e3ce9fd..969f73c 100644

Lines of this file are not shown. View the raw message.

configs/wireless_space_defconfig +0 -1
index 63013f6..5551d27 100644

Lines of this file are not shown. View the raw message.

configs/woodburn_defconfig +1 -1
index 3b463c1..233b650 100644

Lines of this file are not shown. View the raw message.

configs/woodburn_sd_defconfig +1 -1
index 59f2ad0..aa831d9 100644

Lines of this file are not shown. View the raw message.

configs/work_92105_defconfig +1 -1
index 2d3d9f3..0169f30 100644

Lines of this file are not shown. View the raw message.

configs/x600_defconfig +1 -1
index 6be6cc3..61d91d4 100644

Lines of this file are not shown. View the raw message.

configs/xilinx-ppc405-generic_defconfig +1 -1
index 98030d0..53fafc3 100644

Lines of this file are not shown. View the raw message.

configs/xilinx-ppc440-generic_defconfig +1 -1
index de69773..79be48a 100644

Lines of this file are not shown. View the raw message.

configs/zmx25_defconfig +1 -1
index c759cdf..f853308 100644

Lines of this file are not shown. View the raw message.

configs/zynq_microzed_defconfig +1 -1
index 3e141a8..a6757ac 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc702_defconfig +1 -1
index f94bdde..8a388f3 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc706_defconfig +1 -1
index 49efc6b..f1009ee 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc70x_defconfig +1 -1
index 633c521..6465040 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc770_xm010_defconfig +1 -1
index c608029..cafbb09 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc770_xm011_defconfig +1 -1
index 123e461..e6e1c30 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc770_xm012_defconfig +1 -1
index 3da5168..9a44009 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zc770_xm013_defconfig +1 -1
index 015ec79..95e32a5 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zed_defconfig +1 -1
index ce414b7..43520d0 100644

Lines of this file are not shown. View the raw message.

configs/zynq_zybo_defconfig +1 -1
index defcac9..46379e5 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.8.2.1

Part of the diff is not shown here. View the raw message.

author
#2 lore raw

PATCH v2 2/13 x86: fsp: Report correct number of E820 table entries

In reply to Bin Meng

The logic to calculate the number of E820 table entries is wrong when walking through the FSP HOB tables. Fix it.

---
Simon, I think we need get this fix in v2015.10 release.

Changes in v2: None

 arch/x86/lib/fsp/fsp_dram.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/lib/fsp/fsp_dram.c +2 -1
index 28552fa..e51ca96 100644
@@ -72,9 +72,10 @@ unsigned install_e820_map(unsigned max_entries, struct e820entry *entries)
 				entries[num_entries].type = E820_RAM;
 			else if (res_desc->type == RES_MEM_RESERVED)
 				entries[num_entries].type = E820_RESERVED;
+
+			num_entries++;
 		}
 		hdr = get_next_hob(hdr);
-		num_entries++;
 	}
 
 	/* Mark PCIe ECAM address range as reserved */
Signature · 1 line
1.8.2.1
#3 lore raw

PATCH v2 2/13 x86: fsp: Report correct number of E820 table entries

Quoted 6 lines · Bin Meng

The logic to calculate the number of E820 table entries is wrong when walking through the FSP HOB tables. Fix it.

Quoted 7 lines

---
Simon, I think we need get this fix in v2015.10 release.

Changes in v2: None

 arch/x86/lib/fsp/fsp_dram.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
#4 lore raw

PATCH v2 2/13 x86: fsp: Report correct number of E820 table entries

Hi Tom,

Quoted 10 lines · Simon Glass
Quoted 9 lines · Bin Meng

The logic to calculate the number of E820 table entries is wrong when walking through the FSP HOB tables. Fix it.

---
Simon, I think we need get this fix in v2015.10 release.

Quoted 6 lines
Quoted 4 lines

Changes in v2: None

 arch/x86/lib/fsp/fsp_dram.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Are you able to pick this one up if it is not too late?

Regards,
Simon

#5 lore raw

PATCH v2 2/13 x86: fsp: Report correct number of E820 table entries

Quoted 13 lines · Simon Glass

Hi Tom,

Quoted 10 lines · Simon Glass
Quoted 9 lines · Bin Meng

The logic to calculate the number of E820 table entries is wrong when walking through the FSP HOB tables. Fix it.

---
Simon, I think we need get this fix in v2015.10 release.

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

Changes in v2: None

 arch/x86/lib/fsp/fsp_dram.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Are you able to pick this one up if it is not too late?

Is this the only x86 patch that should come in?

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151018/e0aea932/attachment.sig>
#6 lore raw

PATCH v2 2/13 x86: fsp: Report correct number of E820 table entries

Hi Tom,

Quoted 16 lines · Tom Rini
Quoted 15 lines · Simon Glass

Hi Tom,

Quoted 12 lines · Simon Glass
Quoted 11 lines · Bin Meng

The logic to calculate the number of E820 table entries is wrong when walking through the FSP HOB tables. Fix it.

---
Simon, I think we need get this fix in v2015.10 release.

Changes in v2: None

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
 arch/x86/lib/fsp/fsp_dram.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Are you able to pick this one up if it is not too late?

Is this the only x86 patch that should come in?

Yes, that's it.

Regards,
Simon

#7 lore raw

PATCH v2 2/13 x86: fsp: Report correct number of E820 table entries

In reply to Simon Glass
Quoted 21 lines · Simon Glass

Hi Tom,

Quoted 10 lines · Simon Glass
Quoted 9 lines · Bin Meng

The logic to calculate the number of E820 table entries is wrong when walking through the FSP HOB tables. Fix it.

---
Simon, I think we need get this fix in v2015.10 release.

Quoted 6 lines
Quoted 4 lines

Changes in v2: None

 arch/x86/lib/fsp/fsp_dram.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Are you able to pick this one up if it is not too late?

...

$ git am -3 U-Boot-v2-02-13-x86-fsp-Report-correct-number-of-E820-table-entries.patch
Applying: x86: fsp: Report correct number of E820 table entries
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
$
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151018/c13537b9/attachment.sig>
#8 lore raw

PATCH v2 2/13 x86: fsp: Report correct number of E820 table entries

Hi Tom,

Quoted 23 lines · Tom Rini
Quoted 13 lines · Simon Glass

Hi Tom,

Quoted 10 lines · Simon Glass
Quoted 9 lines · Bin Meng

The logic to calculate the number of E820 table entries is wrong when walking through the FSP HOB tables. Fix it.

---
Simon, I think we need get this fix in v2015.10 release.

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

Changes in v2: None

 arch/x86/lib/fsp/fsp_dram.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Are you able to pick this one up if it is not too late?

Quoted 7 lines

...

$ git am -3 U-Boot-v2-02-13-x86-fsp-Report-correct-number-of-E820-table-entries.patch
Applying: x86: fsp: Report correct number of E820 table entries
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
$

Sorry, I must have applied it in a moment of delirium.

Regards,
Simon

author
#9 lore raw

PATCH v2 3/13 x86: Initialize GDT entry 1 to be the 32-bit CS as well

In reply to Bin Meng

Some OS (like VxWorks) requires GDT entry 1 to be the 32-bit CS.

---

Changes in v2: None

 arch/x86/cpu/cpu.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/cpu/cpu.c +6 -1
index 1b76ca1..812c5e4 100644
@@ -142,7 +142,12 @@ void arch_setup_gd(gd_t *new_gd)
 
 	gdt_addr = new_gd->arch.gdt;
 
-	/* CS: code, read/execute, 4 GB, base 0 */
+	/*
+	 * CS: code, read/execute, 4 GB, base 0
+	 *
+	 * Some OS (like VxWorks) requires GDT entry 1 to be the 32-bit CS
+	 */
+	gdt_addr[X86_GDT_ENTRY_UNUSED] = GDT_ENTRY(0xc09b, 0, 0xfffff);
 	gdt_addr[X86_GDT_ENTRY_32BIT_CS] = GDT_ENTRY(0xc09b, 0, 0xfffff);
 
 	/* DS: data, read/write, 4 GB, base 0 */
Signature · 1 line
1.8.2.1
author
#11 lore raw

PATCH v2 4/13 x86: Move install_e820_map() out of zimage.c

In reply to Bin Meng

install_e820_map() has nothing to do with zimage related codes. Move it to a dedicated place.

---

Changes in v2:
- New patch to move install_e820_map() out of zimage.c

 arch/x86/include/asm/e820.h   |  3 +++
 arch/x86/include/asm/zimage.h |  3 ---
 arch/x86/lib/Makefile         |  1 +
 arch/x86/lib/e820.c           | 37 +++++++++++++++++++++++++++++++++++++
 arch/x86/lib/zimage.c         | 26 --------------------------
 5 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 arch/x86/lib/e820.c
arch/x86/include/asm/e820.h +3 -0
index 21bc633..351f021 100644
@@ -23,4 +23,7 @@ struct e820entry {
 
 #endif /* __ASSEMBLY__ */
 
+/* Implementation defined function to install an e820 map */
+unsigned install_e820_map(unsigned max_entries, struct e820entry *);
+
 #endif /* _ASM_X86_E820_H */
arch/x86/include/asm/zimage.h +0 -3
index bf351ed..94fa2a7 100644
@@ -31,9 +31,6 @@
 #define BZIMAGE_LOAD_ADDR  0x100000
 #define ZIMAGE_LOAD_ADDR   0x10000
 
-/* Implementation defined function to install an e820 map. */
-unsigned install_e820_map(unsigned max_entries, struct e820entry *);
-
 struct boot_params *load_zimage(char *image, unsigned long kernel_size,
 				ulong *load_addressp);
 int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
arch/x86/lib/Makefile +1 -0
index 6ecd6db..169062e 100644
@@ -12,6 +12,7 @@ obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-y	+= cmd_boot.o
 obj-$(CONFIG_HAVE_FSP) += cmd_hob.o
 obj-$(CONFIG_EFI) += efi/
+obj-y	+= e820.o
 obj-y	+= gcc.o
 obj-y	+= init_helpers.o
 obj-y	+= interrupts.o
arch/x86/lib/e820.c new file +37 -0
new file mode 100644
index 0000000..5babfde
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2015, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/e820.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * Install a default e820 table with 4 entries as follows:
+ *
+ *	0x000000-0x0a0000	Useable RAM
+ *	0x0a0000-0x100000	Reserved for ISA
+ *	0x100000-gd->ram_size	Useable RAM
+ *	CONFIG_PCIE_ECAM_BASE	PCIe ECAM
+ */
+__weak unsigned install_e820_map(unsigned max_entries,
+				 struct e820entry *entries)
+{
+	entries[0].addr = 0;
+	entries[0].size = ISA_START_ADDRESS;
+	entries[0].type = E820_RAM;
+	entries[1].addr = ISA_START_ADDRESS;
+	entries[1].size = ISA_END_ADDRESS - ISA_START_ADDRESS;
+	entries[1].type = E820_RESERVED;
+	entries[2].addr = ISA_END_ADDRESS;
+	entries[2].size = gd->ram_size - ISA_END_ADDRESS;
+	entries[2].type = E820_RAM;
+	entries[3].addr = CONFIG_PCIE_ECAM_BASE;
+	entries[3].size = CONFIG_PCIE_ECAM_SIZE;
+	entries[3].type = E820_RESERVED;
+
+	return 4;
+}
arch/x86/lib/zimage.c +0 -26
index a1ec57e..1b33c77 100644
@@ -42,32 +42,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define COMMAND_LINE_SIZE	2048
 
-/*
- * Install a default e820 table with 3 entries as follows:
- *
- *	0x000000-0x0a0000	Useable RAM
- *	0x0a0000-0x100000	Reserved for ISA
- *	0x100000-gd->ram_size	Useable RAM
- */
-__weak unsigned install_e820_map(unsigned max_entries,
-				 struct e820entry *entries)
-{
-	entries[0].addr = 0;
-	entries[0].size = ISA_START_ADDRESS;
-	entries[0].type = E820_RAM;
-	entries[1].addr = ISA_START_ADDRESS;
-	entries[1].size = ISA_END_ADDRESS - ISA_START_ADDRESS;
-	entries[1].type = E820_RESERVED;
-	entries[2].addr = ISA_END_ADDRESS;
-	entries[2].size = gd->ram_size - ISA_END_ADDRESS;
-	entries[2].type = E820_RAM;
-	entries[3].addr = CONFIG_PCIE_ECAM_BASE;
-	entries[3].size = CONFIG_PCIE_ECAM_SIZE;
-	entries[3].type = E820_RESERVED;
-
-	return 4;
-}
-
 static void build_command_line(char *command_line, int auto_boot)
 {
 	char *env_command_line;
Signature · 1 line
1.8.2.1
#12 lore raw

PATCH v2 4/13 x86: Move install_e820_map() out of zimage.c

Quoted 11 lines · Bin Meng

install_e820_map() has nothing to do with zimage related codes. Move it to a dedicated place.

---

Changes in v2:
- New patch to move install_e820_map() out of zimage.c

Quoted 8 lines
 arch/x86/include/asm/e820.h   |  3 +++
 arch/x86/include/asm/zimage.h |  3 ---
 arch/x86/lib/Makefile         |  1 +
 arch/x86/lib/e820.c           | 37 +++++++++++++++++++++++++++++++++++++
 arch/x86/lib/zimage.c         | 26 --------------------------
 5 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 arch/x86/lib/e820.c
author
#13 lore raw

PATCH v2 5/13 x86: Remove quotation mark in CONFIG_HOSTNAME

In reply to Bin Meng

CONFIG_HOSTNAME is an environment varible, so that quotation mark is not needed.

---

Changes in v2:
- New patch to remove quotation mark in CONFIG_HOSTNAME

 include/configs/x86-common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/x86-common.h +1 -1
index 3f153f2..44765f6 100644
@@ -217,7 +217,7 @@
 
 /* Default environment */
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_HOSTNAME		"x86"
+#define CONFIG_HOSTNAME		x86
 #define CONFIG_BOOTFILE		"bzImage"
 #define CONFIG_LOADADDR		0x1000000
 
Signature · 1 line
1.8.2.1
#14 lore raw

PATCH v2 5/13 x86: Remove quotation mark in CONFIG_HOSTNAME

Quoted 6 lines · Bin Meng

CONFIG_HOSTNAME is an environment varible, so that quotation mark is not needed.

Quoted 7 lines

---

Changes in v2:
- New patch to remove quotation mark in CONFIG_HOSTNAME

 include/configs/x86-common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 2 lines
author
#15 lore raw

PATCH v2 6/13 cmd: Convert CONFIG_CMD_ELF to Kconfig

In reply to Bin Meng

Convert CONFIG_CMD_ELF to Kconfig and tidy up affected boards.

---

Changes in v2:
- Split the defconfig reorder to another patch, making this patch as CONFIG_CMD_ELF mods only
- Update sparc and avr32 boards to unset CONFIG_CMD_ELF

 common/Kconfig                                  | 6 ++++++
 configs/atngw100_defconfig                      | 1 +
 configs/atngw100mkii_defconfig                  | 1 +
 configs/atstk1002_defconfig                     | 1 +
 configs/dbau1000_defconfig                      | 1 +
 configs/dbau1100_defconfig                      | 1 +
 configs/dbau1500_defconfig                      | 1 +
 configs/dbau1550_defconfig                      | 1 +
 configs/dbau1550_el_defconfig                   | 1 +
 configs/dlvision-10g_defconfig                  | 1 +
 configs/dlvision_defconfig                      | 1 +
 configs/gr_cpci_ax2000_defconfig                | 1 +
 configs/gr_ep2s60_defconfig                     | 1 +
 configs/gr_xc3s_1500_defconfig                  | 1 +
 configs/grasshopper_defconfig                   | 1 +
 configs/grsim_defconfig                         | 1 +
 configs/grsim_leon2_defconfig                   | 1 +
 configs/io_defconfig                            | 1 +
 configs/iocon_defconfig                         | 1 +
 configs/neo_defconfig                           | 1 +
 configs/pb1000_defconfig                        | 1 +
 configs/sandbox_defconfig                       | 1 +
 configs/vct_platinum_onenand_small_defconfig    | 1 +
 configs/vct_platinum_small_defconfig            | 1 +
 configs/vct_platinumavc_onenand_small_defconfig | 1 +
 configs/vct_platinumavc_small_defconfig         | 1 +
 configs/vct_premium_onenand_small_defconfig     | 1 +
 configs/vct_premium_small_defconfig             | 1 +
 include/config_cmd_all.h                        | 1 -
 include/config_distro_defaults.h                | 1 -
 include/configs/B4860QDS.h                      | 1 -
 include/configs/BSC9131RDB.h                    | 1 -
 include/configs/BSC9132QDS.h                    | 1 -
 include/configs/C29XPCIE.h                      | 1 -
 include/configs/CPCI2DP.h                       | 1 -
 include/configs/CPCI4052.h                      | 1 -
 include/configs/M5208EVBE.h                     | 1 -
 include/configs/M52277EVB.h                     | 1 -
 include/configs/M5235EVB.h                      | 1 -
 include/configs/M5272C3.h                       | 1 -
 include/configs/M5275EVB.h                      | 1 -
 include/configs/M53017EVB.h                     | 1 -
 include/configs/M5329EVB.h                      | 1 -
 include/configs/M5373EVB.h                      | 1 -
 include/configs/M54418TWR.h                     | 1 -
 include/configs/M54451EVB.h                     | 1 -
 include/configs/M54455EVB.h                     | 1 -
 include/configs/M5475EVB.h                      | 1 -
 include/configs/M5485EVB.h                      | 1 -
 include/configs/MIP405.h                        | 1 -
 include/configs/MPC8536DS.h                     | 1 -
 include/configs/MPC8540ADS.h                    | 1 -
 include/configs/MPC8541CDS.h                    | 1 -
 include/configs/MPC8544DS.h                     | 1 -
 include/configs/MPC8548CDS.h                    | 1 -
 include/configs/MPC8555CDS.h                    | 1 -
 include/configs/MPC8560ADS.h                    | 1 -
 include/configs/MPC8568MDS.h                    | 1 -
 include/configs/MPC8569MDS.h                    | 1 -
 include/configs/MPC8572DS.h                     | 1 -
 include/configs/P1010RDB.h                      | 1 -
 include/configs/P1022DS.h                       | 1 -
 include/configs/P2041RDB.h                      | 1 -
 include/configs/PIP405.h                        | 1 -
 include/configs/PLU405.h                        | 1 -
 include/configs/PMC405DE.h                      | 1 -
 include/configs/PMC440.h                        | 1 -
 include/configs/T102xQDS.h                      | 1 -
 include/configs/T102xRDB.h                      | 1 -
 include/configs/T1040QDS.h                      | 1 -
 include/configs/T104xRDB.h                      | 1 -
 include/configs/T208xQDS.h                      | 1 -
 include/configs/T208xRDB.h                      | 1 -
 include/configs/T4240RDB.h                      | 1 -
 include/configs/TQM823L.h                       | 1 -
 include/configs/TQM823M.h                       | 1 -
 include/configs/TQM850L.h                       | 1 -
 include/configs/TQM850M.h                       | 1 -
 include/configs/TQM855L.h                       | 1 -
 include/configs/TQM855M.h                       | 1 -
 include/configs/TQM860L.h                       | 1 -
 include/configs/TQM860M.h                       | 1 -
 include/configs/TQM862L.h                       | 1 -
 include/configs/TQM862M.h                       | 1 -
 include/configs/TQM866M.h                       | 1 -
 include/configs/UCP1020.h                       | 1 -
 include/configs/VCMA9.h                         | 1 -
 include/configs/VOM405.h                        | 1 -
 include/configs/amcc-common.h                   | 1 -
 include/configs/arcangel4.h                     | 1 -
 include/configs/astro_mcf5373l.h                | 1 -
 include/configs/axs101.h                        | 1 -
 include/configs/bf537-minotaur.h                | 1 -
 include/configs/bf537-srv1.h                    | 1 -
 include/configs/bfin_adi_common.h               | 1 -
 include/configs/blackstamp.h                    | 1 -
 include/configs/blackvme.h                      | 1 -
 include/configs/controlcenterd.h                | 1 -
 include/configs/corenet_ds.h                    | 1 -
 include/configs/dbau1x00.h                      | 1 -
 include/configs/digsy_mtc.h                     | 1 -
 include/configs/dlvision-10g.h                  | 1 -
 include/configs/dlvision.h                      | 1 -
 include/configs/io.h                            | 1 -
 include/configs/iocon.h                         | 1 -
 include/configs/km/km_arm.h                     | 1 -
 include/configs/lsxl.h                          | 1 -
 include/configs/malta.h                         | 1 -
 include/configs/mecp5123.h                      | 1 -
 include/configs/motionpro.h                     | 1 -
 include/configs/munices.h                       | 1 -
 include/configs/neo.h                           | 1 -
 include/configs/nitrogen6x.h                    | 1 -
 include/configs/openrisc-generic.h              | 1 -
 include/configs/origen.h                        | 1 -
 include/configs/p1_p2_rdb_pc.h                  | 1 -
 include/configs/p1_twr.h                        | 1 -
 include/configs/pb1x00.h                        | 2 --
 include/configs/qemu-mips.h                     | 1 -
 include/configs/qemu-mips64.h                   | 1 -
 include/configs/qemu-ppce500.h                  | 1 -
 include/configs/sandbox.h                       | 1 -
 include/configs/sbc8548.h                       | 1 -
 include/configs/smdk2410.h                      | 1 -
 include/configs/smdkc100.h                      | 1 -
 include/configs/smdkv310.h                      | 1 -
 include/configs/t4qds.h                         | 1 -
 include/configs/tb100.h                         | 1 -
 include/configs/vct.h                           | 2 --
 include/configs/vme8349.h                       | 1 -
 include/configs/x86-common.h                    | 1 -
 include/configs/xilinx-ppc.h                    | 1 -
 include/configs/xilinx_zynqmp.h                 | 1 -
 include/configs/xpedite1000.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 -
 140 files changed, 33 insertions(+), 114 deletions(-)
common/Kconfig +6 -0
index 2c42b8e..0d44993 100644
@@ -148,6 +148,12 @@ config CMD_BOOTM
 	help
 	  Boot an application image from the memory.
 
+config CMD_ELF
+	bool "bootelf, bootvx"
+	default y
+	help
+	  Boot an ELF/vxWorks image from the memory.
+
 config CMD_GO
 	bool "go"
 	default y
configs/atngw100_defconfig +1 -0
index 043f6bf..5b01c18 100644
@@ -5,6 +5,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
configs/atngw100mkii_defconfig +1 -0
index c8d9107..48ea9ba 100644
@@ -5,6 +5,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
configs/atstk1002_defconfig +1 -0
index d525868..1b108e5 100644
@@ -5,6 +5,7 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SOURCE is not set
configs/dbau1000_defconfig +1 -0
index 5ffe104..c69d404 100644
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="DBAU1000"
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_LOADB is not set
configs/dbau1100_defconfig +1 -0
index 84e369a..2e38812 100644
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1100=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_LOADB is not set
configs/dbau1500_defconfig +1 -0
index 8a9583b..f61e7b6 100644
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1500=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_LOADB is not set
configs/dbau1550_defconfig +1 -0
index 333a922..7f1bdf4 100644
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1550=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_FPGA is not set
configs/dbau1550_el_defconfig +1 -0
index 5970e43..6cd0161 100644
@@ -4,6 +4,7 @@ CONFIG_DBAU1550=y
 CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_FPGA is not set
configs/dlvision-10g_defconfig +1 -0
index 4ed14f8..04037ba 100644
@@ -3,4 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_DLVISION_10G=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_NFS is not set
configs/dlvision_defconfig +1 -0
index 7982c17..97bdd51 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_DLVISION=y
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_NFS is not set
configs/gr_cpci_ax2000_defconfig +1 -0
index f003d77..ddac3ab 100644
@@ -1,4 +1,5 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_CPCI_AX2000=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_SETEXPR is not set
configs/gr_ep2s60_defconfig +1 -0
index bbf1808..0064554 100644
@@ -1,4 +1,5 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_EP2S60=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_SETEXPR is not set
configs/gr_xc3s_1500_defconfig +1 -0
index 5c1442d..a05b709 100644
@@ -1,4 +1,5 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_XC3S_1500=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+# CONFIG_CMD_ELF is not sets
 # CONFIG_CMD_SETEXPR is not set
configs/grasshopper_defconfig +1 -0
index 92a73e2..6c5c9e3 100644
@@ -5,5 +5,6 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_SETEXPR is not set
configs/grsim_defconfig +1 -0
index b83abb6..f0fa23f 100644
@@ -2,6 +2,7 @@ CONFIG_SPARC=y
 CONFIG_TARGET_GRSIM=y
 CONFIG_SYS_TEXT_BASE=0x00000000
 # CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_EDITENV is not set
configs/grsim_leon2_defconfig +1 -0
index 756a786..9c9c968 100644
@@ -2,6 +2,7 @@ CONFIG_SPARC=y
 CONFIG_TARGET_GRSIM_LEON2=y
 CONFIG_SYS_TEXT_BASE=0x00000000
 # CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_EDITENV is not set
configs/io_defconfig +1 -0
index 722d95a..7b71805 100644
@@ -3,4 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_IO=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_NFS is not set
configs/iocon_defconfig +1 -0
index 89e5cf5..63f0c37 100644
@@ -3,4 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_IOCON=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_NFS is not set
configs/neo_defconfig +1 -0
index 77eefe9..1ef57ad 100644
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_NEO=y
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_NFS is not set
configs/pb1000_defconfig +1 -0
index f24cd07..131014d 100644
@@ -3,6 +3,7 @@ CONFIG_TARGET_PB1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="PB1000"
 CONFIG_SYS_PROMPT="Pb1x00 # "
 # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
 # CONFIG_CMD_LOADB is not set
configs/sandbox_defconfig +1 -0
index ae96b63..3fd7813 100644
@@ -3,6 +3,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
configs/vct_platinum_onenand_small_defconfig +1 -0
index 33ce32a..47985cd 100644
@@ -6,6 +6,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
configs/vct_platinum_small_defconfig +1 -0
index ceb61e1..f85d3f7 100644
@@ -5,6 +5,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
configs/vct_platinumavc_onenand_small_defconfig +1 -0
index 1958fcd..77dd414 100644
@@ -6,6 +6,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
configs/vct_platinumavc_small_defconfig +1 -0
index 0ac2def..8fe82fc 100644
@@ -5,6 +5,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
configs/vct_premium_onenand_small_defconfig +1 -0
index 471a005..ac6f422 100644
@@ -6,6 +6,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
configs/vct_premium_small_defconfig +1 -0
index 68c0d9a..3297434 100644
@@ -5,6 +5,7 @@ CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
 # CONFIG_CMD_CRC32 is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
include/config_cmd_all.h +0 -1
index 4c46dda..8832552 100644
@@ -29,7 +29,6 @@
 #define CONFIG_CMD_DOC		/* Disk-On-Chip Support		*/
 #define CONFIG_CMD_DTT		/* Digital Therm and Thermostat */
 #define CONFIG_CMD_EEPROM	/* EEPROM read/write support	*/
-#define CONFIG_CMD_ELF		/* ELF (VxWorks) load/boot cmd	*/
 #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
 #define CONFIG_CMD_FDC		/* Floppy Disk Support		*/
include/config_distro_defaults.h +0 -1
index d8165cc..9d1de55 100644
@@ -49,7 +49,6 @@
 #define CONFIG_CMD_BOOTZ
 #endif
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_FAT
include/configs/B4860QDS.h +0 -1
index 1e458f4..858e25d 100644
@@ -756,7 +756,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
include/configs/BSC9131RDB.h +0 -1
index a7c9277..226a170 100644
@@ -342,7 +342,6 @@ extern unsigned long get_sdram_size(void);
  */
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ERRATA
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_IRQ
include/configs/BSC9132QDS.h +0 -1
index 804493e..e545447 100644
@@ -580,7 +580,6 @@ combinations. this should be removed later
  */
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
include/configs/C29XPCIE.h +0 -1
index 6c39b1e..f574994 100644
@@ -494,7 +494,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_ERRATA
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
include/configs/CPCI2DP.h +0 -1
index 638a586..ce7bc35 100644
@@ -55,7 +55,6 @@
  */
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_EEPROM
include/configs/CPCI4052.h +0 -1
index 9c25751..2827a04 100644
@@ -72,7 +72,6 @@
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
include/configs/M5208EVBE.h +0 -1
index 5e15dd9..b38a349 100644
@@ -23,7 +23,6 @@
 
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
include/configs/M52277EVB.h +0 -1
index d1cadc0..ffee225 100644
@@ -39,7 +39,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_REGINFO
include/configs/M5235EVB.h +0 -1
index 1472672..2a198e5 100644
@@ -37,7 +37,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
include/configs/M5272C3.h +0 -1
index 006f2d8..718f31f 100644
@@ -59,7 +59,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 
 
 #define CONFIG_BOOTDELAY	5
include/configs/M5275EVB.h +0 -1
index 116e8e2..195595f 100644
@@ -58,7 +58,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_DHCP
 
include/configs/M53017EVB.h +0 -1
index a48ae6b..42cbb0f 100644
@@ -29,7 +29,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
include/configs/M5329EVB.h +0 -1
index e806b7a..b2d544c 100644
@@ -29,7 +29,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
include/configs/M5373EVB.h +0 -1
index 1df98f7..a906204 100644
@@ -29,7 +29,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
include/configs/M54418TWR.h +0 -1
index db0ddcd..927b7da 100644
@@ -41,7 +41,6 @@
 #define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_JFFS2
 #undef CONFIG_CMD_UBI
include/configs/M54451EVB.h +0 -1
index de747a4..61ebb24 100644
@@ -42,7 +42,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #undef CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
include/configs/M54455EVB.h +0 -1
index 06da5f0..f813dab 100644
@@ -42,7 +42,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
include/configs/M5475EVB.h +0 -1
index e30b645..81ecbc8 100644
@@ -31,7 +31,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
include/configs/M5485EVB.h +0 -1
index 051c940..8621d7a 100644
@@ -31,7 +31,6 @@
 /* Command line configuration */
 #define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PCI
include/configs/MIP405.h +0 -1
index cb21b73..0757e67 100644
@@ -55,7 +55,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
include/configs/MPC8536DS.h +0 -1
index 1312438..7c51eef 100644
@@ -638,7 +638,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
include/configs/MPC8540ADS.h +0 -1
index a42c936..dc6e395 100644
@@ -353,7 +353,6 @@
  */
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 
 #if defined(CONFIG_PCI)
include/configs/MPC8541CDS.h +0 -1
index 8942aae..bf03603 100644
@@ -372,7 +372,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
include/configs/MPC8544DS.h +0 -1
index 67fac70..bef28b3 100644
@@ -387,7 +387,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
include/configs/MPC8548CDS.h +0 -1
index 842afe1..2bea604 100644
@@ -496,7 +496,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
include/configs/MPC8555CDS.h +0 -1
index 2e8db5a..80b14cb 100644
@@ -370,7 +370,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
include/configs/MPC8560ADS.h +0 -1
index fabe6bf..e1bc8cc 100644
@@ -389,7 +389,6 @@
  */
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
include/configs/MPC8568MDS.h +0 -1
index 7a2131b..064bd85 100644
@@ -392,7 +392,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
include/configs/MPC8569MDS.h +0 -1
index 9e38724..0af670b 100644
@@ -482,7 +482,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
include/configs/MPC8572DS.h +0 -1
index f3334ad..4b5467b 100644
@@ -597,7 +597,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_PCI)
include/configs/P1010RDB.h +0 -1
index 8ac7000..b85e195 100644
@@ -813,7 +813,6 @@ extern unsigned long get_sdram_size(void);
  */
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_ERRATA
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
include/configs/P1022DS.h +0 -1
index 06b293f..95c81ab 100644
@@ -678,7 +678,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_I2C
include/configs/P2041RDB.h +0 -1
index 5468495..de205e8 100644
@@ -618,7 +618,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
include/configs/PIP405.h +0 -1
index c9d08e6..4601bc8 100644
@@ -53,7 +53,6 @@
 #define CONFIG_CMD_SCSI
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_SDRAM
include/configs/PLU405.h +0 -1
index 3a71ff8..d5d3092 100644
@@ -66,7 +66,6 @@
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_I2C
include/configs/PMC405DE.h +0 -1
index 5712298..2f35ca9 100644
@@ -59,7 +59,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
include/configs/PMC440.h +0 -1
index 9ed6c61..4555039 100644
@@ -276,7 +276,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
include/configs/T102xQDS.h +0 -1
index 92f51f6..c9e5ea9 100644
@@ -850,7 +850,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
include/configs/T102xRDB.h +0 -1
index 324f710..0601d73 100644
@@ -852,7 +852,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
include/configs/T1040QDS.h +0 -1
index 1f46160..4b735b5 100644
@@ -723,7 +723,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
include/configs/T104xRDB.h +0 -1
index cd5b3e2..e09d933 100644
@@ -787,7 +787,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
 #define CONFIG_CMD_DATE
 #endif
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
include/configs/T208xQDS.h +0 -1
index 23ca0cf..a804cbe 100644
@@ -792,7 +792,6 @@ unsigned long get_board_ddr_clk(void);
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
include/configs/T208xRDB.h +0 -1
index ef42b88..307a0ea 100644
@@ -748,7 +748,6 @@ unsigned long get_board_ddr_clk(void);
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_I2C
include/configs/T4240RDB.h +0 -1
index d43f6b7..754d182 100644
@@ -318,7 +318,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
include/configs/TQM823L.h +0 -1
index 9b9217e..cea3149 100644
@@ -109,7 +109,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
include/configs/TQM823M.h +0 -1
index 5240e0f..85215b1 100644
@@ -107,7 +107,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
include/configs/TQM850L.h +0 -1
index edadf55..97a9fa7 100644
@@ -97,7 +97,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
include/configs/TQM850M.h +0 -1
index 166bb2c..636ffc8 100644
@@ -97,7 +97,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
include/configs/TQM855L.h +0 -1
index 8b16ad2..3c82c73 100644
@@ -100,7 +100,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
include/configs/TQM855M.h +0 -1
index 8a05fa4..66f9a88 100644
@@ -129,7 +129,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_IDE
include/configs/TQM860L.h +0 -1
index bf3a25b..3e20c71 100644
@@ -100,7 +100,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
include/configs/TQM860M.h +0 -1
index 47e5c6c..be1cd3a 100644
@@ -100,7 +100,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
include/configs/TQM862L.h +0 -1
index fa892a9..f07b903 100644
@@ -103,7 +103,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
include/configs/TQM862M.h +0 -1
index 13319f2..c887a39 100644
@@ -103,7 +103,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
include/configs/TQM866M.h +0 -1
index 0e378f2..a037b4f 100644
@@ -143,7 +143,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
include/configs/UCP1020.h +0 -1
index 629be99..0801117 100644
@@ -494,7 +494,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
include/configs/VCMA9.h +0 -1
index 5b2e092..bfcfb40 100644
@@ -55,7 +55,6 @@
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_BSP
include/configs/VOM405.h +0 -1
index ddd6377..99ee78b 100644
@@ -62,7 +62,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
include/configs/amcc-common.h +0 -1
index 37dac7d..c5ef650 100644
@@ -60,7 +60,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DIAG
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
include/configs/arcangel4.h +0 -1
index a342d7e..63f61ae 100644
@@ -41,7 +41,6 @@
 /*
  * Command line configuration
  */
-#define CONFIG_CMD_ELF
 
 #define CONFIG_OF_LIBFDT
 
include/configs/astro_mcf5373l.h +0 -1
index 1c3a1c9..8606151 100644
@@ -61,7 +61,6 @@
 
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #if ENABLE_JFFS
 #define CONFIG_CMD_JFFS2
include/configs/axs101.h +0 -1
index 7cb8853..450291c 100644
@@ -123,7 +123,6 @@
  */
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MMC
include/configs/bf537-minotaur.h +0 -1
index 6674d28..c57c862 100644
@@ -153,7 +153,6 @@
 #define CONFIG_CMD_BOOTLDR
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_SF
 
include/configs/bf537-srv1.h +0 -1
index 15d912e..90aeeec 100644
@@ -152,7 +152,6 @@
 #define CONFIG_CMD_BOOTLDR
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_SF
 
include/configs/bfin_adi_common.h +0 -1
index 7b2faf2..a075050 100644
@@ -80,7 +80,6 @@
 # define CONFIG_CMD_BOOTLDR
 # define CONFIG_CMD_CACHE
 # define CONFIG_CMD_CPLBINFO
-# define CONFIG_CMD_ELF
 # define CONFIG_CMD_GPIO
 # define CONFIG_CMD_KGDB
 # define CONFIG_CMD_LDRINFO
include/configs/blackstamp.h +0 -1
index c0197ca..3b7a47f 100644
@@ -117,7 +117,6 @@
 #define CONFIG_CMD_CPLBINFO
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_SF
-#define CONFIG_CMD_ELF
 
 #define CONFIG_BOOTDELAY     5
 #define CONFIG_BOOTCOMMAND   "run ramboot"
include/configs/blackvme.h +0 -1
index 4752b07..5b15e0e 100644
@@ -156,7 +156,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_CPLBINFO
 #define CONFIG_CMD_SF
-#define CONFIG_CMD_ELF
 
 /*
  * Default: boot from SPI flash.
include/configs/controlcenterd.h +0 -1
index 9a1f6d0..c879048 100644
@@ -388,7 +388,6 @@
 
 #ifndef CONFIG_TRAILBLAZER
 
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
include/configs/corenet_ds.h +0 -1
index 2919220..878fda2 100644
@@ -628,7 +628,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
include/configs/dbau1x00.h +0 -1
index 46e3a6c..3be44d4 100644
@@ -75,7 +75,6 @@
  * Command line configuration.
  */
 #undef CONFIG_CMD_BEDBUG
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_FAT
 #undef CONFIG_CMD_MII
 
include/configs/digsy_mtc.h +0 -1
index a7af351..02b8f91 100644
@@ -107,7 +107,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DIAG
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
include/configs/dlvision-10g.h +0 -1
index e6bfe58..e39f8ba 100644
@@ -68,7 +68,6 @@
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
 
include/configs/dlvision.h +0 -1
index 0299d16..3c05534 100644
@@ -64,7 +64,6 @@
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
 
include/configs/io.h +0 -1
index f5b09b6..7d863fa 100644
@@ -68,7 +68,6 @@
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
 
include/configs/iocon.h +0 -1
index f7ae663..a4d05e5 100644
@@ -64,7 +64,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_FPGAD
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
 
include/configs/km/km_arm.h +0 -1
index 15fca1a..5e0f483 100644
@@ -122,7 +122,6 @@
 /*
  * Commands configuration
  */
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_MTDPARTS
 
 /*
include/configs/lsxl.h +0 -1
index 1837258..a57e328 100644
@@ -55,7 +55,6 @@
  */
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
include/configs/malta.h +0 -1
index 2f33f63..4d3751a 100644
@@ -122,7 +122,6 @@
  */
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
include/configs/mecp5123.h +0 -1
index a8b4b24..84f1a40 100644
@@ -309,7 +309,6 @@
 #undef CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_ELF
 #define CONFIG_DOS_PARTITION
 
 /*
include/configs/motionpro.h +0 -1
index 3b97d91..6eb6e51 100644
@@ -41,7 +41,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
include/configs/munices.h +0 -1
index b1b6acd..072bd95 100644
@@ -28,7 +28,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
include/configs/neo.h +0 -1
index 33cee43..f178366 100644
@@ -67,7 +67,6 @@
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_IRQ
 
include/configs/nitrogen6x.h +0 -1
index dd4cb0f..e735d0d 100644
@@ -328,7 +328,6 @@
 #define CONFIG_PCIE_IMX
 #endif
 
-#define CONFIG_CMD_ELF
 
 #define CONFIG_USB_GADGET
 #define CONFIG_CMD_USB_MASS_STORAGE
include/configs/openrisc-generic.h +0 -1
index 23929c2..d53e419 100644
@@ -115,7 +115,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_BSP
 
 #define CONFIG_CMD_MII
include/configs/origen.h +0 -1
index 21d8e7a..ef80bf6 100644
@@ -51,7 +51,6 @@
 #define S5P_CHECK_LPA			0xABAD0000
 
 #undef CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FS_GENERIC
include/configs/p1_p2_rdb_pc.h +0 -1
index af89e6b..362cf30 100644
@@ -895,7 +895,6 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_REGINFO
 
 /*
include/configs/p1_twr.h +0 -1
index e9cc274..588a6c5 100644
@@ -425,7 +425,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_REGINFO
 
 /*
include/configs/pb1x00.h +0 -2
index 516d381..41b7393 100644
@@ -168,13 +168,11 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 
 #undef CONFIG_CMD_FAT
 #undef CONFIG_CMD_IDE
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_BEDBUG
 
 #endif	/* __CONFIG_H */
include/configs/qemu-mips.h +0 -1
index a7ec8f5..9395bda 100644
@@ -45,7 +45,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_DHCP
include/configs/qemu-mips64.h +0 -1
index 4de15bf..53ff802 100644
@@ -45,7 +45,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_DHCP
include/configs/qemu-ppce500.h +0 -1
index 45f5e78..5cd0906 100644
@@ -158,7 +158,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
include/configs/sandbox.h +0 -1
index 32e3a9b..c96ec90 100644
@@ -141,7 +141,6 @@
 #define CONFIG_IP_DEFRAG
 
 /* Can't boot elf images */
-#undef CONFIG_CMD_ELF
 
 #define CONFIG_CMD_HASH
 #define CONFIG_HASH_VERIFY
include/configs/sbc8548.h +0 -1
index 0717156..87e562e 100644
@@ -539,7 +539,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_PCI)
include/configs/smdk2410.h +0 -1
index a6bfa76..fb38502 100644
@@ -79,7 +79,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
include/configs/smdkc100.h +0 -1
index 4ec9c65..1d9ce92 100644
@@ -68,7 +68,6 @@
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_ONENAND
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_MTDPARTS
 
include/configs/smdkv310.h +0 -1
index dbba88b..217cfc0 100644
@@ -43,7 +43,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
 
 /* MMC SPL */
include/configs/t4qds.h +0 -1
index d3138fe..26028df 100644
@@ -273,7 +273,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ERRATA
 #define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_IRQ
include/configs/tb100.h +0 -1
index 41c2c72..e3c41ef 100644
@@ -69,7 +69,6 @@
  * Command line configuration
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_PING
 
 #define CONFIG_OF_LIBFDT
include/configs/vct.h +0 -2
index 80f6a60..92726c8 100644
@@ -84,7 +84,6 @@
  * Commands
  */
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
 
@@ -288,7 +287,6 @@ int vct_gpio_get(int pin);
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_FAT
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_I2C
include/configs/vme8349.h +0 -1
index bc4a998..a6f5d6a 100644
@@ -373,7 +373,6 @@
     #undef CONFIG_CMD_ENV
 #endif
 
-#define CONFIG_CMD_ELF
 /* Pass Ethernet MAC to VxWorks */
 #define CONFIG_SYS_VXWORKS_MAC_PTR	0x000043f0
 
include/configs/x86-common.h +0 -1
index 44765f6..faadab8 100644
@@ -115,7 +115,6 @@
 #define CONFIG_CMD_EXT2
 
 #define CONFIG_CMD_ZBOOT
-#define CONFIG_CMD_ELF
 
 #define CONFIG_BOOTARGS		\
 	"root=/dev/sdb3 init=/sbin/init rootwait ro"
include/configs/xilinx-ppc.h +0 -1
index 309d68d..6bd6be8 100644
@@ -29,7 +29,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DIAG
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 #undef CONFIG_CMD_JFFS2
include/configs/xilinx_zynqmp.h +0 -1
index da87188..ed09b7f 100644
@@ -73,7 +73,6 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_FS_GENERIC
 #define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_ELF
 #define CONFIG_MP
 
 #define CONFIG_CMD_MII
include/configs/xpedite1000.h +0 -1
index 4fafb5a..37a31c4 100644
@@ -191,7 +191,6 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_JFFS2
include/configs/xpedite517x.h +0 -1
index 669aa53..c65d58f 100644
@@ -533,7 +533,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_CMD_DS4510_INFO
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_JFFS2
include/configs/xpedite520x.h +0 -1
index 34a124c..e48960b 100644
@@ -315,7 +315,6 @@
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
include/configs/xpedite537x.h +0 -1
index 58ace2c..c9ddd15 100644
@@ -388,7 +388,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_CMD_DS4510_INFO
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
include/configs/xpedite550x.h +0 -1
index 765aaad..4b33696 100644
@@ -372,7 +372,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
include/configs/zmx25.h +0 -1
index 81b9ce4..b7134eb 100644
@@ -84,7 +84,6 @@
  */
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_USB
 
include/configs/zynq-common.h +0 -1
index e7ab50a..873c42d 100644
@@ -289,7 +289,6 @@
 /* Boot FreeBSD/vxWorks from an ELF image */
 #if defined(CONFIG_ZYNQ_BOOT_FREEBSD)
 # define CONFIG_API
-# define CONFIG_CMD_ELF
 # define CONFIG_SYS_MMC_MAX_DEVICE	1
 #endif
 
Signature · 1 line
1.8.2.1
#16 lore raw

PATCH v2 6/13 cmd: Convert CONFIG_CMD_ELF to Kconfig

Quoted 1,835 lines · Bin Meng

Convert CONFIG_CMD_ELF to Kconfig and tidy up affected boards.

---

Changes in v2:
- Split the defconfig reorder to another patch, making this patch as CONFIG_CMD_ELF mods only
- Update sparc and avr32 boards to unset CONFIG_CMD_ELF

  common/Kconfig                                  | 6 ++++++
  configs/atngw100_defconfig                      | 1 +
  configs/atngw100mkii_defconfig                  | 1 +
  configs/atstk1002_defconfig                     | 1 +
  configs/dbau1000_defconfig                      | 1 +
  configs/dbau1100_defconfig                      | 1 +
  configs/dbau1500_defconfig                      | 1 +
  configs/dbau1550_defconfig                      | 1 +
  configs/dbau1550_el_defconfig                   | 1 +
  configs/dlvision-10g_defconfig                  | 1 +
  configs/dlvision_defconfig                      | 1 +
  configs/gr_cpci_ax2000_defconfig                | 1 +
  configs/gr_ep2s60_defconfig                     | 1 +
  configs/gr_xc3s_1500_defconfig                  | 1 +
  configs/grasshopper_defconfig                   | 1 +
  configs/grsim_defconfig                         | 1 +
  configs/grsim_leon2_defconfig                   | 1 +
  configs/io_defconfig                            | 1 +
  configs/iocon_defconfig                         | 1 +
  configs/neo_defconfig                           | 1 +
  configs/pb1000_defconfig                        | 1 +
  configs/sandbox_defconfig                       | 1 +
  configs/vct_platinum_onenand_small_defconfig    | 1 +
  configs/vct_platinum_small_defconfig            | 1 +
  configs/vct_platinumavc_onenand_small_defconfig | 1 +
  configs/vct_platinumavc_small_defconfig         | 1 +
  configs/vct_premium_onenand_small_defconfig     | 1 +
  configs/vct_premium_small_defconfig             | 1 +
  include/config_cmd_all.h                        | 1 -
  include/config_distro_defaults.h                | 1 -
  include/configs/B4860QDS.h                      | 1 -
  include/configs/BSC9131RDB.h                    | 1 -
  include/configs/BSC9132QDS.h                    | 1 -
  include/configs/C29XPCIE.h                      | 1 -
  include/configs/CPCI2DP.h                       | 1 -
  include/configs/CPCI4052.h                      | 1 -
  include/configs/M5208EVBE.h                     | 1 -
  include/configs/M52277EVB.h                     | 1 -
  include/configs/M5235EVB.h                      | 1 -
  include/configs/M5272C3.h                       | 1 -
  include/configs/M5275EVB.h                      | 1 -
  include/configs/M53017EVB.h                     | 1 -
  include/configs/M5329EVB.h                      | 1 -
  include/configs/M5373EVB.h                      | 1 -
  include/configs/M54418TWR.h                     | 1 -
  include/configs/M54451EVB.h                     | 1 -
  include/configs/M54455EVB.h                     | 1 -
  include/configs/M5475EVB.h                      | 1 -
  include/configs/M5485EVB.h                      | 1 -
  include/configs/MIP405.h                        | 1 -
  include/configs/MPC8536DS.h                     | 1 -
  include/configs/MPC8540ADS.h                    | 1 -
  include/configs/MPC8541CDS.h                    | 1 -
  include/configs/MPC8544DS.h                     | 1 -
  include/configs/MPC8548CDS.h                    | 1 -
  include/configs/MPC8555CDS.h                    | 1 -
  include/configs/MPC8560ADS.h                    | 1 -
  include/configs/MPC8568MDS.h                    | 1 -
  include/configs/MPC8569MDS.h                    | 1 -
  include/configs/MPC8572DS.h                     | 1 -
  include/configs/P1010RDB.h                      | 1 -
  include/configs/P1022DS.h                       | 1 -
  include/configs/P2041RDB.h                      | 1 -
  include/configs/PIP405.h                        | 1 -
  include/configs/PLU405.h                        | 1 -
  include/configs/PMC405DE.h                      | 1 -
  include/configs/PMC440.h                        | 1 -
  include/configs/T102xQDS.h                      | 1 -
  include/configs/T102xRDB.h                      | 1 -
  include/configs/T1040QDS.h                      | 1 -
  include/configs/T104xRDB.h                      | 1 -
  include/configs/T208xQDS.h                      | 1 -
  include/configs/T208xRDB.h                      | 1 -
  include/configs/T4240RDB.h                      | 1 -
  include/configs/TQM823L.h                       | 1 -
  include/configs/TQM823M.h                       | 1 -
  include/configs/TQM850L.h                       | 1 -
  include/configs/TQM850M.h                       | 1 -
  include/configs/TQM855L.h                       | 1 -
  include/configs/TQM855M.h                       | 1 -
  include/configs/TQM860L.h                       | 1 -
  include/configs/TQM860M.h                       | 1 -
  include/configs/TQM862L.h                       | 1 -
  include/configs/TQM862M.h                       | 1 -
  include/configs/TQM866M.h                       | 1 -
  include/configs/UCP1020.h                       | 1 -
  include/configs/VCMA9.h                         | 1 -
  include/configs/VOM405.h                        | 1 -
  include/configs/amcc-common.h                   | 1 -
  include/configs/arcangel4.h                     | 1 -
  include/configs/astro_mcf5373l.h                | 1 -
  include/configs/axs101.h                        | 1 -
  include/configs/bf537-minotaur.h                | 1 -
  include/configs/bf537-srv1.h                    | 1 -
  include/configs/bfin_adi_common.h               | 1 -
  include/configs/blackstamp.h                    | 1 -
  include/configs/blackvme.h                      | 1 -
  include/configs/controlcenterd.h                | 1 -
  include/configs/corenet_ds.h                    | 1 -
  include/configs/dbau1x00.h                      | 1 -
  include/configs/digsy_mtc.h                     | 1 -
  include/configs/dlvision-10g.h                  | 1 -
  include/configs/dlvision.h                      | 1 -
  include/configs/io.h                            | 1 -
  include/configs/iocon.h                         | 1 -
  include/configs/km/km_arm.h                     | 1 -
  include/configs/lsxl.h                          | 1 -
  include/configs/malta.h                         | 1 -
  include/configs/mecp5123.h                      | 1 -
  include/configs/motionpro.h                     | 1 -
  include/configs/munices.h                       | 1 -
  include/configs/neo.h                           | 1 -
  include/configs/nitrogen6x.h                    | 1 -
  include/configs/openrisc-generic.h              | 1 -
  include/configs/origen.h                        | 1 -
  include/configs/p1_p2_rdb_pc.h                  | 1 -
  include/configs/p1_twr.h                        | 1 -
  include/configs/pb1x00.h                        | 2 --
  include/configs/qemu-mips.h                     | 1 -
  include/configs/qemu-mips64.h                   | 1 -
  include/configs/qemu-ppce500.h                  | 1 -
  include/configs/sandbox.h                       | 1 -
  include/configs/sbc8548.h                       | 1 -
  include/configs/smdk2410.h                      | 1 -
  include/configs/smdkc100.h                      | 1 -
  include/configs/smdkv310.h                      | 1 -
  include/configs/t4qds.h                         | 1 -
  include/configs/tb100.h                         | 1 -
  include/configs/vct.h                           | 2 --
  include/configs/vme8349.h                       | 1 -
  include/configs/x86-common.h                    | 1 -
  include/configs/xilinx-ppc.h                    | 1 -
  include/configs/xilinx_zynqmp.h                 | 1 -
  include/configs/xpedite1000.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 -
  140 files changed, 33 insertions(+), 114 deletions(-)
common/Kconfig +6 -0
index 2c42b8e..0d44993 100644
@@ -148,6 +148,12 @@ config CMD_BOOTM
  	help
  	  Boot an application image from the memory.
 
+config CMD_ELF
+	bool "bootelf, bootvx"
+	default y
+	help
+	  Boot an ELF/vxWorks image from the memory.
+
  config CMD_GO
  	bool "go"
  	default y
configs/atngw100_defconfig +1 -0
index 043f6bf..5b01c18 100644
@@ -5,6 +5,7 @@ CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
  CONFIG_AUTOBOOT_DELAY_STR="d"
  CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_XIMG is not set
  # CONFIG_CMD_FPGA is not set
  # CONFIG_CMD_SOURCE is not set
configs/atngw100mkii_defconfig +1 -0
index c8d9107..48ea9ba 100644
@@ -5,6 +5,7 @@ CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
  CONFIG_AUTOBOOT_DELAY_STR="d"
  CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_XIMG is not set
  # CONFIG_CMD_FPGA is not set
  # CONFIG_CMD_SETEXPR is not set
configs/atstk1002_defconfig +1 -0
index d525868..1b108e5 100644
@@ -5,6 +5,7 @@ CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
  CONFIG_AUTOBOOT_DELAY_STR="d"
  CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_XIMG is not set
  # CONFIG_CMD_FPGA is not set
  # CONFIG_CMD_SOURCE is not set
configs/dbau1000_defconfig +1 -0
index 5ffe104..c69d404 100644
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
  CONFIG_SYS_EXTRA_OPTIONS="DBAU1000"
  CONFIG_SYS_PROMPT="DbAu1xx0 # "
  # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_RUN is not set
  # CONFIG_CMD_SAVEENV is not set
  # CONFIG_CMD_LOADB is not set
configs/dbau1100_defconfig +1 -0
index 84e369a..2e38812 100644
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
  CONFIG_DBAU1100=y
  CONFIG_SYS_PROMPT="DbAu1xx0 # "
  # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_RUN is not set
  # CONFIG_CMD_SAVEENV is not set
  # CONFIG_CMD_LOADB is not set
configs/dbau1500_defconfig +1 -0
index 8a9583b..f61e7b6 100644
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
  CONFIG_DBAU1500=y
  CONFIG_SYS_PROMPT="DbAu1xx0 # "
  # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_RUN is not set
  # CONFIG_CMD_SAVEENV is not set
  # CONFIG_CMD_LOADB is not set
configs/dbau1550_defconfig +1 -0
index 333a922..7f1bdf4 100644
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
  CONFIG_DBAU1550=y
  CONFIG_SYS_PROMPT="DbAu1xx0 # "
  # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_RUN is not set
  # CONFIG_CMD_SAVEENV is not set
  # CONFIG_CMD_FPGA is not set
configs/dbau1550_el_defconfig +1 -0
index 5970e43..6cd0161 100644
@@ -4,6 +4,7 @@ CONFIG_DBAU1550=y
  CONFIG_SYS_LITTLE_ENDIAN=y
  CONFIG_SYS_PROMPT="DbAu1xx0 # "
  # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_RUN is not set
  # CONFIG_CMD_SAVEENV is not set
  # CONFIG_CMD_FPGA is not set
configs/dlvision-10g_defconfig +1 -0
index 4ed14f8..04037ba 100644
@@ -3,4 +3,5 @@ CONFIG_4xx=y
  CONFIG_TARGET_DLVISION_10G=y
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_NFS is not set
configs/dlvision_defconfig +1 -0
index 7982c17..97bdd51 100644
@@ -1,4 +1,5 @@
  CONFIG_PPC=y
  CONFIG_4xx=y
  CONFIG_TARGET_DLVISION=y
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_NFS is not set
configs/gr_cpci_ax2000_defconfig +1 -0
index f003d77..ddac3ab 100644
@@ -1,4 +1,5 @@
  CONFIG_SPARC=y
  CONFIG_TARGET_GR_CPCI_AX2000=y
  CONFIG_SYS_TEXT_BASE=0x00000000
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_SETEXPR is not set
configs/gr_ep2s60_defconfig +1 -0
index bbf1808..0064554 100644
@@ -1,4 +1,5 @@
  CONFIG_SPARC=y
  CONFIG_TARGET_GR_EP2S60=y
  CONFIG_SYS_TEXT_BASE=0x00000000
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_SETEXPR is not set
configs/gr_xc3s_1500_defconfig +1 -0
index 5c1442d..a05b709 100644
@@ -1,4 +1,5 @@
  CONFIG_SPARC=y
  CONFIG_TARGET_GR_XC3S_1500=y
  CONFIG_SYS_TEXT_BASE=0x00000000
+# CONFIG_CMD_ELF is not sets
  # CONFIG_CMD_SETEXPR is not set
configs/grasshopper_defconfig +1 -0
index 92a73e2..6c5c9e3 100644
@@ -5,5 +5,6 @@ CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
  CONFIG_AUTOBOOT_DELAY_STR="d"
  CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_FPGA is not set
  # CONFIG_CMD_SETEXPR is not set
configs/grsim_defconfig +1 -0
index b83abb6..f0fa23f 100644
@@ -2,6 +2,7 @@ CONFIG_SPARC=y
  CONFIG_TARGET_GRSIM=y
  CONFIG_SYS_TEXT_BASE=0x00000000
  # CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_IMI is not set
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_EDITENV is not set
configs/grsim_leon2_defconfig +1 -0
index 756a786..9c9c968 100644
@@ -2,6 +2,7 @@ CONFIG_SPARC=y
  CONFIG_TARGET_GRSIM_LEON2=y
  CONFIG_SYS_TEXT_BASE=0x00000000
  # CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_IMI is not set
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_EDITENV is not set
configs/io_defconfig +1 -0
index 722d95a..7b71805 100644
@@ -3,4 +3,5 @@ CONFIG_4xx=y
  CONFIG_TARGET_IO=y
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_NFS is not set
configs/iocon_defconfig +1 -0
index 89e5cf5..63f0c37 100644
@@ -3,4 +3,5 @@ CONFIG_4xx=y
  CONFIG_TARGET_IOCON=y
  CONFIG_AUTOBOOT_KEYED=y
  CONFIG_AUTOBOOT_STOP_STR=" "
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_NFS is not set
configs/neo_defconfig +1 -0
index 77eefe9..1ef57ad 100644
@@ -1,4 +1,5 @@
  CONFIG_PPC=y
  CONFIG_4xx=y
  CONFIG_TARGET_NEO=y
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_NFS is not set
configs/pb1000_defconfig +1 -0
index f24cd07..131014d 100644
@@ -3,6 +3,7 @@ CONFIG_TARGET_PB1X00=y
  CONFIG_SYS_EXTRA_OPTIONS="PB1000"
  CONFIG_SYS_PROMPT="Pb1x00 # "
  # CONFIG_CMD_BDI is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_RUN is not set
  # CONFIG_CMD_SAVEENV is not set
  # CONFIG_CMD_LOADB is not set
configs/sandbox_defconfig +1 -0
index ae96b63..3fd7813 100644
@@ -3,6 +3,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sandbox"
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_SIGNATURE=y
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
  # CONFIG_CMD_SETEXPR is not set
configs/vct_platinum_onenand_small_defconfig +1 -0
index 33ce32a..47985cd 100644
@@ -6,6 +6,7 @@ CONFIG_VCT_SMALL_IMAGE=y
  CONFIG_SYS_PROMPT="$ "
  # CONFIG_CMD_BDI is not set
  # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_CRC32 is not set
  # CONFIG_CMD_LOADB is not set
configs/vct_platinum_small_defconfig +1 -0
index ceb61e1..f85d3f7 100644
@@ -5,6 +5,7 @@ CONFIG_VCT_SMALL_IMAGE=y
  CONFIG_SYS_PROMPT="$ "
  # CONFIG_CMD_BDI is not set
  # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_CRC32 is not set
  # CONFIG_CMD_LOADB is not set
  # CONFIG_CMD_LOADS is not set
configs/vct_platinumavc_onenand_small_defconfig +1 -0
index 1958fcd..77dd414 100644
@@ -6,6 +6,7 @@ CONFIG_VCT_SMALL_IMAGE=y
  CONFIG_SYS_PROMPT="$ "
  # CONFIG_CMD_BDI is not set
  # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_CRC32 is not set
  # CONFIG_CMD_LOADB is not set
configs/vct_platinumavc_small_defconfig +1 -0
index 0ac2def..8fe82fc 100644
@@ -5,6 +5,7 @@ CONFIG_VCT_SMALL_IMAGE=y
  CONFIG_SYS_PROMPT="$ "
  # CONFIG_CMD_BDI is not set
  # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_CRC32 is not set
  # CONFIG_CMD_LOADB is not set
  # CONFIG_CMD_LOADS is not set
configs/vct_premium_onenand_small_defconfig +1 -0
index 471a005..ac6f422 100644
@@ -6,6 +6,7 @@ CONFIG_VCT_SMALL_IMAGE=y
  CONFIG_SYS_PROMPT="$ "
  # CONFIG_CMD_BDI is not set
  # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_CRC32 is not set
  # CONFIG_CMD_LOADB is not set
configs/vct_premium_small_defconfig +1 -0
index 68c0d9a..3297434 100644
@@ -5,6 +5,7 @@ CONFIG_VCT_SMALL_IMAGE=y
  CONFIG_SYS_PROMPT="$ "
  # CONFIG_CMD_BDI is not set
  # CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_ELF is not set
  # CONFIG_CMD_CRC32 is not set
  # CONFIG_CMD_LOADB is not set
  # CONFIG_CMD_LOADS is not set
include/config_cmd_all.h +0 -1
index 4c46dda..8832552 100644
@@ -29,7 +29,6 @@
  #define CONFIG_CMD_DOC		/* Disk-On-Chip Support		*/
  #define CONFIG_CMD_DTT		/* Digital Therm and Thermostat */
  #define CONFIG_CMD_EEPROM	/* EEPROM read/write support	*/
-#define CONFIG_CMD_ELF		/* ELF (VxWorks) load/boot cmd	*/
  #define CONFIG_CMD_EXT2		/* EXT2 Support			*/
  #define CONFIG_CMD_FAT		/* FAT support			*/
  #define CONFIG_CMD_FDC		/* Floppy Disk Support		*/
include/config_distro_defaults.h +0 -1
index d8165cc..9d1de55 100644
@@ -49,7 +49,6 @@
  #define CONFIG_CMD_BOOTZ
  #endif
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_EXT4
  #define CONFIG_CMD_FAT
include/configs/B4860QDS.h +0 -1
index 1e458f4..858e25d 100644
@@ -756,7 +756,6 @@ unsigned long get_board_ddr_clk(void);
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_IRQ
include/configs/BSC9131RDB.h +0 -1
index a7c9277..226a170 100644
@@ -342,7 +342,6 @@ extern unsigned long get_sdram_size(void);
   */
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_ERRATA
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_IRQ
include/configs/BSC9132QDS.h +0 -1
index 804493e..e545447 100644
@@ -580,7 +580,6 @@ combinations. this should be removed later
   */
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_IRQ
include/configs/C29XPCIE.h +0 -1
index 6c39b1e..f574994 100644
@@ -494,7 +494,6 @@
   * Command line configuration.
   */
  #define CONFIG_CMD_ERRATA
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PING
include/configs/CPCI2DP.h +0 -1
index 638a586..ce7bc35 100644
@@ -55,7 +55,6 @@
   */
  #define CONFIG_CMD_PCI
  #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_BSP
  #define CONFIG_CMD_EEPROM
include/configs/CPCI4052.h +0 -1
index 9c25751..2827a04 100644
@@ -72,7 +72,6 @@
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_FAT
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
include/configs/M5208EVBE.h +0 -1
index 5e15dd9..b38a349 100644
@@ -23,7 +23,6 @@
 
  /* Command line configuration */
  #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_ELF
  #undef CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PING
include/configs/M52277EVB.h +0 -1
index d1cadc0..ffee225 100644
@@ -39,7 +39,6 @@
  /* Command line configuration */
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_JFFS2
  #define CONFIG_CMD_REGINFO
include/configs/M5235EVB.h +0 -1
index 1472672..2a198e5 100644
@@ -37,7 +37,6 @@
  /* Command line configuration */
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PCI
include/configs/M5272C3.h +0 -1
index 006f2d8..718f31f 100644
@@ -59,7 +59,6 @@
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 
 
  #define CONFIG_BOOTDELAY	5
include/configs/M5275EVB.h +0 -1
index 116e8e2..195595f 100644
@@ -58,7 +58,6 @@
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_DHCP
 
include/configs/M53017EVB.h +0 -1
index a48ae6b..42cbb0f 100644
@@ -29,7 +29,6 @@
  /* Command line configuration */
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #undef CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PING
include/configs/M5329EVB.h +0 -1
index e806b7a..b2d544c 100644
@@ -29,7 +29,6 @@
  /* Command line configuration */
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PING
include/configs/M5373EVB.h +0 -1
index 1df98f7..a906204 100644
@@ -29,7 +29,6 @@
  /* Command line configuration */
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PING
include/configs/M54418TWR.h +0 -1
index db0ddcd..927b7da 100644
@@ -41,7 +41,6 @@
  #define CONFIG_CMD_CACHE
  #undef CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #undef CONFIG_CMD_I2C
  #undef CONFIG_CMD_JFFS2
  #undef CONFIG_CMD_UBI
include/configs/M54451EVB.h +0 -1
index de747a4..61ebb24 100644
@@ -42,7 +42,6 @@
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #undef CONFIG_CMD_JFFS2
  #define CONFIG_CMD_MII
include/configs/M54455EVB.h +0 -1
index 06da5f0..f813dab 100644
@@ -42,7 +42,6 @@
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_I2C
include/configs/M5475EVB.h +0 -1
index e30b645..81ecbc8 100644
@@ -31,7 +31,6 @@
  /* Command line configuration */
  #define CONFIG_CMD_CACHE
  #undef CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PCI
include/configs/M5485EVB.h +0 -1
index 051c940..8621d7a 100644
@@ -31,7 +31,6 @@
  /* Command line configuration */
  #define CONFIG_CMD_CACHE
  #undef CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PCI
include/configs/MIP405.h +0 -1
index cb21b73..0757e67 100644
@@ -55,7 +55,6 @@
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_IDE
include/configs/MPC8536DS.h +0 -1
index 1312438..7c51eef 100644
@@ -638,7 +638,6 @@
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_REGINFO
 
include/configs/MPC8540ADS.h +0 -1
index a42c936..dc6e395 100644
@@ -353,7 +353,6 @@
   */
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
 
  #if defined(CONFIG_PCI)
include/configs/MPC8541CDS.h +0 -1
index 8942aae..bf03603 100644
@@ -372,7 +372,6 @@ extern unsigned long get_clock_freq(void);
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_REGINFO
 
include/configs/MPC8544DS.h +0 -1
index 67fac70..bef28b3 100644
@@ -387,7 +387,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_REGINFO
 
include/configs/MPC8548CDS.h +0 -1
index 842afe1..2bea604 100644
@@ -496,7 +496,6 @@ extern unsigned long get_clock_freq(void);
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_REGINFO
 
include/configs/MPC8555CDS.h +0 -1
index 2e8db5a..80b14cb 100644
@@ -370,7 +370,6 @@ extern unsigned long get_clock_freq(void);
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_REGINFO
 
include/configs/MPC8560ADS.h +0 -1
index fabe6bf..e1bc8cc 100644
@@ -389,7 +389,6 @@
   */
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_REGINFO
 
include/configs/MPC8568MDS.h +0 -1
index 7a2131b..064bd85 100644
@@ -392,7 +392,6 @@ extern unsigned long get_clock_freq(void);
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_REGINFO
 
include/configs/MPC8569MDS.h +0 -1
index 9e38724..0af670b 100644
@@ -482,7 +482,6 @@ extern unsigned long get_clock_freq(void);
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_REGINFO
 
include/configs/MPC8572DS.h +0 -1
index f3334ad..4b5467b 100644
@@ -597,7 +597,6 @@
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_REGINFO
 
  #if defined(CONFIG_PCI)
include/configs/P1010RDB.h +0 -1
index 8ac7000..b85e195 100644
@@ -813,7 +813,6 @@ extern unsigned long get_sdram_size(void);
   */
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_ERRATA
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PING
include/configs/P1022DS.h +0 -1
index 06b293f..95c81ab 100644
@@ -678,7 +678,6 @@
  /*
   * Command line configuration.
   */
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_I2C
include/configs/P2041RDB.h +0 -1
index 5468495..de205e8 100644
@@ -618,7 +618,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
   * Command line configuration.
   */
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_IRQ
include/configs/PIP405.h +0 -1
index c9d08e6..4601bc8 100644
@@ -53,7 +53,6 @@
  #define CONFIG_CMD_SCSI
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_USB
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_SDRAM
include/configs/PLU405.h +0 -1
index 3a71ff8..d5d3092 100644
@@ -66,7 +66,6 @@
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_FAT
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_NAND
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_I2C
include/configs/PMC405DE.h +0 -1
index 5712298..2f35ca9 100644
@@ -59,7 +59,6 @@
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_MII
include/configs/PMC440.h +0 -1
index 9ed6c61..4555039 100644
@@ -276,7 +276,6 @@
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_DTT
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
include/configs/T102xQDS.h +0 -1
index 92f51f6..c9e5ea9 100644
@@ -850,7 +850,6 @@ unsigned long get_board_ddr_clk(void);
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_IRQ
include/configs/T102xRDB.h +0 -1
index 324f710..0601d73 100644
@@ -852,7 +852,6 @@ unsigned long get_board_ddr_clk(void);
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_IRQ
include/configs/T1040QDS.h +0 -1
index 1f46160..4b735b5 100644
@@ -723,7 +723,6 @@ unsigned long get_board_ddr_clk(void);
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_IRQ
include/configs/T104xRDB.h +0 -1
index cd5b3e2..e09d933 100644
@@ -787,7 +787,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
  #define CONFIG_CMD_DATE
  #endif
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_IRQ
include/configs/T208xQDS.h +0 -1
index 23ca0cf..a804cbe 100644
@@ -792,7 +792,6 @@ unsigned long get_board_ddr_clk(void);
   * Command line configuration.
   */
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_IRQ
include/configs/T208xRDB.h +0 -1
index ef42b88..307a0ea 100644
@@ -748,7 +748,6 @@ unsigned long get_board_ddr_clk(void);
   * Command line configuration.
   */
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_I2C
include/configs/T4240RDB.h +0 -1
index d43f6b7..754d182 100644
@@ -318,7 +318,6 @@
   * Command line configuration.
   */
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_IRQ
include/configs/TQM823L.h +0 -1
index 9b9217e..cea3149 100644
@@ -109,7 +109,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_JFFS2
include/configs/TQM823M.h +0 -1
index 5240e0f..85215b1 100644
@@ -107,7 +107,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_JFFS2
include/configs/TQM850L.h +0 -1
index edadf55..97a9fa7 100644
@@ -97,7 +97,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_JFFS2
include/configs/TQM850M.h +0 -1
index 166bb2c..636ffc8 100644
@@ -97,7 +97,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_JFFS2
include/configs/TQM855L.h +0 -1
index 8b16ad2..3c82c73 100644
@@ -100,7 +100,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_JFFS2
include/configs/TQM855M.h +0 -1
index 8a05fa4..66f9a88 100644
@@ -129,7 +129,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_EEPROM
  #define CONFIG_CMD_IDE
include/configs/TQM860L.h +0 -1
index bf3a25b..3e20c71 100644
@@ -100,7 +100,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_JFFS2
include/configs/TQM860M.h +0 -1
index 47e5c6c..be1cd3a 100644
@@ -100,7 +100,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_JFFS2
include/configs/TQM862L.h +0 -1
index fa892a9..f07b903 100644
@@ -103,7 +103,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_JFFS2
include/configs/TQM862M.h +0 -1
index 13319f2..c887a39 100644
@@ -103,7 +103,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_JFFS2
include/configs/TQM866M.h +0 -1
index 0e378f2..a037b4f 100644
@@ -143,7 +143,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_JFFS2
include/configs/UCP1020.h +0 -1
index 629be99..0801117 100644
@@ -494,7 +494,6 @@
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_MII
include/configs/VCMA9.h +0 -1
index 5b2e092..bfcfb40 100644
@@ -55,7 +55,6 @@
  #define CONFIG_CMD_USB
  #define CONFIG_CMD_REGINFO
  #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_BSP
include/configs/VOM405.h +0 -1
index ddd6377..99ee78b 100644
@@ -62,7 +62,6 @@
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_BSP
  #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PING
include/configs/amcc-common.h +0 -1
index 37dac7d..c5ef650 100644
@@ -60,7 +60,6 @@
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_DIAG
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_IRQ
include/configs/arcangel4.h +0 -1
index a342d7e..63f61ae 100644
@@ -41,7 +41,6 @@
  /*
   * Command line configuration
   */
-#define CONFIG_CMD_ELF
 
  #define CONFIG_OF_LIBFDT
 
include/configs/astro_mcf5373l.h +0 -1
index 1c3a1c9..8606151 100644
@@ -61,7 +61,6 @@
 
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #if ENABLE_JFFS
  #define CONFIG_CMD_JFFS2
include/configs/axs101.h +0 -1
index 7cb8853..450291c 100644
@@ -123,7 +123,6 @@
   */
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MMC
include/configs/bf537-minotaur.h +0 -1
index 6674d28..c57c862 100644
@@ -153,7 +153,6 @@
  #define CONFIG_CMD_BOOTLDR
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_SF
 
include/configs/bf537-srv1.h +0 -1
index 15d912e..90aeeec 100644
@@ -152,7 +152,6 @@
  #define CONFIG_CMD_BOOTLDR
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_SF
 
include/configs/bfin_adi_common.h +0 -1
index 7b2faf2..a075050 100644
@@ -80,7 +80,6 @@
  # define CONFIG_CMD_BOOTLDR
  # define CONFIG_CMD_CACHE
  # define CONFIG_CMD_CPLBINFO
-# define CONFIG_CMD_ELF
  # define CONFIG_CMD_GPIO
  # define CONFIG_CMD_KGDB
  # define CONFIG_CMD_LDRINFO
include/configs/blackstamp.h +0 -1
index c0197ca..3b7a47f 100644
@@ -117,7 +117,6 @@
  #define CONFIG_CMD_CPLBINFO
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_SF
-#define CONFIG_CMD_ELF
 
  #define CONFIG_BOOTDELAY     5
  #define CONFIG_BOOTCOMMAND   "run ramboot"
include/configs/blackvme.h +0 -1
index 4752b07..5b15e0e 100644
@@ -156,7 +156,6 @@
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_CPLBINFO
  #define CONFIG_CMD_SF
-#define CONFIG_CMD_ELF
 
  /*
   * Default: boot from SPI flash.
include/configs/controlcenterd.h +0 -1
index 9a1f6d0..c879048 100644
@@ -388,7 +388,6 @@
 
  #ifndef CONFIG_TRAILBLAZER
 
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_FAT
include/configs/corenet_ds.h +0 -1
index 2919220..878fda2 100644
@@ -628,7 +628,6 @@
   * Command line configuration.
   */
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_IRQ
include/configs/dbau1x00.h +0 -1
index 46e3a6c..3be44d4 100644
@@ -75,7 +75,6 @@
   * Command line configuration.
   */
  #undef CONFIG_CMD_BEDBUG
-#undef CONFIG_CMD_ELF
  #undef CONFIG_CMD_FAT
  #undef CONFIG_CMD_MII
 
include/configs/digsy_mtc.h +0 -1
index a7af351..02b8f91 100644
@@ -107,7 +107,6 @@
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_DIAG
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_I2C
include/configs/dlvision-10g.h +0 -1
index e6bfe58..e39f8ba 100644
@@ -68,7 +68,6 @@
  #undef CONFIG_CMD_DHCP
  #undef CONFIG_CMD_DIAG
  #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
  #undef CONFIG_CMD_I2C
  #undef CONFIG_CMD_IRQ
 
include/configs/dlvision.h +0 -1
index 0299d16..3c05534 100644
@@ -64,7 +64,6 @@
  #undef CONFIG_CMD_DHCP
  #undef CONFIG_CMD_DIAG
  #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
  #undef CONFIG_CMD_I2C
  #undef CONFIG_CMD_IRQ
 
include/configs/io.h +0 -1
index f5b09b6..7d863fa 100644
@@ -68,7 +68,6 @@
  #undef CONFIG_CMD_DHCP
  #undef CONFIG_CMD_DIAG
  #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
  #undef CONFIG_CMD_I2C
  #undef CONFIG_CMD_IRQ
 
include/configs/iocon.h +0 -1
index f7ae663..a4d05e5 100644
@@ -64,7 +64,6 @@
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_FPGAD
  #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
  #undef CONFIG_CMD_I2C
  #undef CONFIG_CMD_IRQ
 
include/configs/km/km_arm.h +0 -1
index 15fca1a..5e0f483 100644
@@ -122,7 +122,6 @@
  /*
   * Commands configuration
   */
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_MTDPARTS
 
  /*
include/configs/lsxl.h +0 -1
index 1837258..a57e328 100644
@@ -55,7 +55,6 @@
   */
  #define CONFIG_CMD_BOOTZ
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ENV
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_FAT
include/configs/malta.h +0 -1
index 2f33f63..4d3751a 100644
@@ -122,7 +122,6 @@
   */
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IDE
  #define CONFIG_CMD_PCI
  #define CONFIG_CMD_PING
include/configs/mecp5123.h +0 -1
index a8b4b24..84f1a40 100644
@@ -309,7 +309,6 @@
  #undef CONFIG_CMD_EXT2
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_ELF
  #define CONFIG_DOS_PARTITION
 
  /*
include/configs/motionpro.h +0 -1
index 3b97d91..6eb6e51 100644
@@ -41,7 +41,6 @@
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_DTT
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_IDE
include/configs/munices.h +0 -1
index b1b6acd..072bd95 100644
@@ -28,7 +28,6 @@
   * Command line configuration.
   */
  #define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IMMAP
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_REGINFO
include/configs/neo.h +0 -1
index 33cee43..f178366 100644
@@ -67,7 +67,6 @@
  #undef CONFIG_CMD_DHCP
  #undef CONFIG_CMD_DIAG
  #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
  #undef CONFIG_CMD_I2C
  #undef CONFIG_CMD_IRQ
 
include/configs/nitrogen6x.h +0 -1
index dd4cb0f..e735d0d 100644
@@ -328,7 +328,6 @@
  #define CONFIG_PCIE_IMX
  #endif
 
-#define CONFIG_CMD_ELF
 
  #define CONFIG_USB_GADGET
  #define CONFIG_CMD_USB_MASS_STORAGE
include/configs/openrisc-generic.h +0 -1
index 23929c2..d53e419 100644
@@ -115,7 +115,6 @@
   * Command line configuration.
   */
  #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_BSP
 
  #define CONFIG_CMD_MII
include/configs/origen.h +0 -1
index 21d8e7a..ef80bf6 100644
@@ -51,7 +51,6 @@
  #define S5P_CHECK_LPA			0xABAD0000
 
  #undef CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_FS_GENERIC
include/configs/p1_p2_rdb_pc.h +0 -1
index af89e6b..362cf30 100644
@@ -895,7 +895,6 @@
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_DATE
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_REGINFO
 
  /*
include/configs/p1_twr.h +0 -1
index e9cc274..588a6c5 100644
@@ -425,7 +425,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_REGINFO
 
  /*
include/configs/pb1x00.h +0 -2
index 516d381..41b7393 100644
@@ -168,13 +168,11 @@
   * Command line configuration.
   */
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_MII
  #define CONFIG_CMD_PING
 
  #undef CONFIG_CMD_FAT
  #undef CONFIG_CMD_IDE
-#undef CONFIG_CMD_ELF
  #undef CONFIG_CMD_BEDBUG
 
  #endif	/* __CONFIG_H */
include/configs/qemu-mips.h +0 -1
index a7ec8f5..9395bda 100644
@@ -45,7 +45,6 @@
  /*
   * Command line configuration.
   */
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_DHCP
include/configs/qemu-mips64.h +0 -1
index 4de15bf..53ff802 100644
@@ -45,7 +45,6 @@
  /*
   * Command line configuration.
   */
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_DHCP
include/configs/qemu-ppce500.h +0 -1
index 45f5e78..5cd0906 100644
@@ -158,7 +158,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
   * Command line configuration.
   */
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_BOOTZ
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_IRQ
include/configs/sandbox.h +0 -1
index 32e3a9b..c96ec90 100644
@@ -141,7 +141,6 @@
  #define CONFIG_IP_DEFRAG
 
  /* Can't boot elf images */
-#undef CONFIG_CMD_ELF
 
  #define CONFIG_CMD_HASH
  #define CONFIG_HASH_VERIFY
include/configs/sbc8548.h +0 -1
index 0717156..87e562e 100644
@@ -539,7 +539,6 @@
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_MII
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_REGINFO
 
  #if defined(CONFIG_PCI)
include/configs/smdk2410.h +0 -1
index a6bfa76..fb38502 100644
@@ -79,7 +79,6 @@
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_NAND
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_REGINFO
include/configs/smdkc100.h +0 -1
index 4ec9c65..1d9ce92 100644
@@ -68,7 +68,6 @@
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_REGINFO
  #define CONFIG_CMD_ONENAND
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_MTDPARTS
 
include/configs/smdkv310.h +0 -1
index dbba88b..217cfc0 100644
@@ -43,7 +43,6 @@
  #define CONFIG_ENV_OVERWRITE
 
  #define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_DHCP
 
  /* MMC SPL */
include/configs/t4qds.h +0 -1
index d3138fe..26028df 100644
@@ -273,7 +273,6 @@
   * Command line configuration.
   */
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_GREPENV
  #define CONFIG_CMD_IRQ
include/configs/tb100.h +0 -1
index 41c2c72..e3c41ef 100644
@@ -69,7 +69,6 @@
   * Command line configuration
   */
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_PING
 
  #define CONFIG_OF_LIBFDT
include/configs/vct.h +0 -2
index 80f6a60..92726c8 100644
@@ -84,7 +84,6 @@
   * Commands
   */
  #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_EEPROM
  #define CONFIG_CMD_I2C
 
@@ -288,7 +287,6 @@ int vct_gpio_get(int pin);
  #undef CONFIG_CMD_DHCP
  #undef CONFIG_CMD_EEPROM
  #undef CONFIG_CMD_EEPROM
-#undef CONFIG_CMD_ELF
  #undef CONFIG_CMD_FAT
  #undef CONFIG_CMD_I2C
  #undef CONFIG_CMD_I2C
include/configs/vme8349.h +0 -1
index bc4a998..a6f5d6a 100644
@@ -373,7 +373,6 @@
      #undef CONFIG_CMD_ENV
  #endif
 
-#define CONFIG_CMD_ELF
  /* Pass Ethernet MAC to VxWorks */
  #define CONFIG_SYS_VXWORKS_MAC_PTR	0x000043f0
 
include/configs/x86-common.h +0 -1
index 44765f6..faadab8 100644
@@ -115,7 +115,6 @@
  #define CONFIG_CMD_EXT2
 
  #define CONFIG_CMD_ZBOOT
-#define CONFIG_CMD_ELF
 
  #define CONFIG_BOOTARGS		\
  	"root=/dev/sdb3 init=/sbin/init rootwait ro"
include/configs/xilinx-ppc.h +0 -1
index 309d68d..6bd6be8 100644
@@ -29,7 +29,6 @@
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_CACHE
  #define CONFIG_CMD_DIAG
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_REGINFO
  #undef CONFIG_CMD_JFFS2
include/configs/xilinx_zynqmp.h +0 -1
index da87188..ed09b7f 100644
@@ -73,7 +73,6 @@
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_FS_GENERIC
  #define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_ELF
  #define CONFIG_MP
 
  #define CONFIG_CMD_MII
include/configs/xpedite1000.h +0 -1
index 4fafb5a..37a31c4 100644
@@ -191,7 +191,6 @@ extern void out32(unsigned int, unsigned long);
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_JFFS2
include/configs/xpedite517x.h +0 -1
index 669aa53..c65d58f 100644
@@ -533,7 +533,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  #define CONFIG_CMD_DS4510_INFO
  #define CONFIG_CMD_DTT
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_JFFS2
include/configs/xpedite520x.h +0 -1
index 34a124c..e48960b 100644
@@ -315,7 +315,6 @@
  #define CONFIG_CMD_DATE
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_JFFS2
  #define CONFIG_CMD_MII
include/configs/xpedite537x.h +0 -1
index 58ace2c..c9ddd15 100644
@@ -388,7 +388,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  #define CONFIG_CMD_DS4510_INFO
  #define CONFIG_CMD_DTT
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_JFFS2
  #define CONFIG_CMD_MII
include/configs/xpedite550x.h +0 -1
index 765aaad..4b33696 100644
@@ -372,7 +372,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_DTT
  #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_I2C
  #define CONFIG_CMD_JFFS2
  #define CONFIG_CMD_MII
include/configs/zmx25.h +0 -1
index 81b9ce4..b7134eb 100644
@@ -84,7 +84,6 @@
   */
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
  #define CONFIG_CMD_FAT
  #define CONFIG_CMD_USB
 
include/configs/zynq-common.h +0 -1
index e7ab50a..873c42d 100644
@@ -289,7 +289,6 @@
  /* Boot FreeBSD/vxWorks from an ELF image */
  #if defined(CONFIG_ZYNQ_BOOT_FREEBSD)
  # define CONFIG_API
-# define CONFIG_CMD_ELF
  # define CONFIG_SYS_MMC_MAX_DEVICE	1
  #endif
 
author
#17 lore raw

PATCH v2 7/13 cmd: Clean up cmd_elf a little bit

In reply to Bin Meng

This commit cleans up cmd_elf.c per U-Boot coding convention, and removes the unnecessary DECLARE_GLOBAL_DATA_PTR and out-of-date powerpc comments (it actually supports not only powerpc targets).

---

Changes in v2: None

 common/cmd_elf.c | 171 ++++++++++++++++++++++++-------------------------------
 1 file changed, 73 insertions(+), 98 deletions(-)
common/cmd_elf.c +73 -98
index 22475dc..c5e4432 100644
@@ -14,23 +14,17 @@
  */
 
 #include <common.h>
-#include <bootm.h>
 #include <command.h>
-#include <linux/ctype.h>
-#include <net.h>
 #include <elf.h>
+#include <net.h>
 #include <vxworks.h>
 
-#if defined(CONFIG_WALNUT) || defined(CONFIG_SYS_VXWORKS_MAC_PTR)
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
 static unsigned long load_elf_image_phdr(unsigned long addr);
 static unsigned long load_elf_image_shdr(unsigned long addr);
 
 /* Allow ports to override the default behavior */
 static unsigned long do_bootelf_exec(ulong (*entry)(int, char * const[]),
-			       int argc, char * const argv[])
+				     int argc, char * const argv[])
 {
 	unsigned long ret;
 
@@ -54,18 +48,16 @@ static unsigned long do_bootelf_exec(ulong (*entry)(int, char * const[]),
 	return ret;
 }
 
-/* ======================================================================
+/*
  * Determine if a valid ELF image exists at the given memory location.
- * First looks at the ELF header magic field, the makes sure that it is
- * executable and makes sure that it is for a PowerPC.
- * ====================================================================== */
+ * First look at the ELF header magic field, then make sure that it is
+ * executable.
+ */
 int valid_elf_image(unsigned long addr)
 {
-	Elf32_Ehdr *ehdr;		/* Elf header structure pointer */
-
-	/* -------------------------------------------------- */
+	Elf32_Ehdr *ehdr; /* Elf header structure pointer */
 
-	ehdr = (Elf32_Ehdr *) addr;
+	ehdr = (Elf32_Ehdr *)addr;
 
 	if (!IS_ELF(*ehdr)) {
 		printf("## No elf image at address 0x%08lx\n", addr);
@@ -77,27 +69,17 @@ int valid_elf_image(unsigned long addr)
 		return 0;
 	}
 
-#if 0
-	if (ehdr->e_machine != EM_PPC) {
-		printf("## Not a PowerPC elf image at address 0x%08lx\n", addr);
-		return 0;
-	}
-#endif
-
 	return 1;
 }
 
-/* ======================================================================
- * Interpreter command to boot an arbitrary ELF image from memory.
- * ====================================================================== */
+/* Interpreter command to boot an arbitrary ELF image from memory */
 int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	unsigned long addr;		/* Address of the ELF image     */
-	unsigned long rc;		/* Return value from user code  */
+	unsigned long addr; /* Address of the ELF image */
+	unsigned long rc; /* Return value from user code */
 	char *sload, *saddr;
 	const char *ep = getenv("autostart");
 
-	/* -------------------------------------------------- */
 	int rcode = 0;
 
 	sload = saddr = NULL;
@@ -138,28 +120,27 @@ int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		rcode = 1;
 
 	printf("## Application terminated, rc = 0x%lx\n", rc);
+
 	return rcode;
 }
 
-/* ======================================================================
+/*
  * Interpreter command to boot VxWorks from a memory image.  The image can
  * be either an ELF image or a raw binary.  Will attempt to setup the
  * bootline and other parameters correctly.
- * ====================================================================== */
+ */
 int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	unsigned long addr;		/* Address of image            */
-	unsigned long bootaddr;	/* Address to put the bootline */
-	char *bootline;			/* Text of the bootline        */
-	char *tmp;			/* Temporary char pointer      */
-	char build_buf[128];		/* Buffer for building the bootline */
-
-	/* ---------------------------------------------------
-	 *
+	unsigned long addr; /* Address of image */
+	unsigned long bootaddr; /* Address to put the bootline */
+	char *bootline; /* Text of the bootline */
+	char *tmp; /* Temporary char pointer */
+	char build_buf[128]; /* Buffer for building the bootline */
+
+	/*
 	 * Check the loadaddr variable.
 	 * If we don't know where the image is then we're done.
 	 */
-
 	if (argc < 2)
 		addr = load_addr;
 	else
@@ -167,7 +148,8 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #if defined(CONFIG_CMD_NET)
 	/*
-	 * Check to see if we need to tftp the image ourselves before starting
+	 * Check to see if we need to tftp the image ourselves
+	 * before starting
 	 */
 	if ((argc == 2) && (strcmp(argv[1], "tftp") == 0)) {
 		if (net_loop(TFTPGET) <= 0)
@@ -177,18 +159,18 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	}
 #endif
 
-	/* This should equate
-	 * to NV_RAM_ADRS + NV_BOOT_OFFSET + NV_ENET_OFFSET
+	/*
+	 * This should equate to
+	 * NV_RAM_ADRS + NV_BOOT_OFFSET + NV_ENET_OFFSET
 	 * from the VxWorks BSP header files.
 	 * This will vary from board to board
 	 */
-
 #if defined(CONFIG_WALNUT)
-	tmp = (char *) CONFIG_SYS_NVRAM_BASE_ADDR + 0x500;
+	tmp = (char *)CONFIG_SYS_NVRAM_BASE_ADDR + 0x500;
 	eth_getenv_enetaddr("ethaddr", (uchar *)build_buf);
 	memcpy(tmp, &build_buf[3], 3);
 #elif defined(CONFIG_SYS_VXWORKS_MAC_PTR)
-	tmp = (char *) CONFIG_SYS_VXWORKS_MAC_PTR;
+	tmp = (char *)CONFIG_SYS_VXWORKS_MAC_PTR;
 	eth_getenv_enetaddr("ethaddr", (uchar *)build_buf);
 	memcpy(tmp, build_buf, 6);
 #else
@@ -199,7 +181,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	 * Use bootaddr to find the location in memory that VxWorks
 	 * will look for the bootline string. The default value for
 	 * PowerPC is LOCAL_MEM_LOCAL_ADRS + BOOT_LINE_OFFSET which
-	 * defaults to 0x4200
+	 * defaults to 0x4200.
 	 */
 	tmp = getenv("bootaddr");
 	if (!tmp)
@@ -210,7 +192,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	/*
 	 * Check to see if the bootline is defined in the 'bootargs'
 	 * parameter. If it is not defined, we may be able to
-	 * construct the info
+	 * construct the info.
 	 */
 	bootline = getenv("bootargs");
 	if (bootline) {
@@ -222,10 +204,10 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		tmp = getenv("bootfile");
 		if (tmp)
 			sprintf(&build_buf[strlen(build_buf)],
-				 "%s:%s ", CONFIG_SYS_VXWORKS_SERVERNAME, tmp);
+				"%s:%s ", CONFIG_SYS_VXWORKS_SERVERNAME, tmp);
 		else
 			sprintf(&build_buf[strlen(build_buf)],
-				 "%s:file ", CONFIG_SYS_VXWORKS_SERVERNAME);
+				"%s:file ", CONFIG_SYS_VXWORKS_SERVERNAME);
 
 		tmp = getenv("ipaddr");
 		if (tmp)
@@ -241,7 +223,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #ifdef CONFIG_SYS_VXWORKS_ADD_PARAMS
 		sprintf(&build_buf[strlen(build_buf)],
-			 CONFIG_SYS_VXWORKS_ADD_PARAMS);
+			CONFIG_SYS_VXWORKS_ADD_PARAMS);
 #endif
 
 		memcpy((void *)bootaddr, build_buf,
@@ -252,51 +234,49 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	/*
 	 * If the data at the load address is an elf image, then
 	 * treat it like an elf image. Otherwise, assume that it is a
-	 * binary image
+	 * binary image.
 	 */
-
-	if (valid_elf_image(addr)) {
+	if (valid_elf_image(addr))
 		addr = load_elf_image_shdr(addr);
-	} else {
+	else
 		puts("## Not an ELF image, assuming binary\n");
-		/* leave addr as load_addr */
-	}
 
 	printf("## Using bootline (@ 0x%lx): %s\n", bootaddr,
-			(char *) bootaddr);
+	       (char *)bootaddr);
 	printf("## Starting vxWorks@0x%08lx ...\n", addr);
 
 	dcache_disable();
-	((void (*)(int)) addr) (0);
+	((void (*)(int))addr)(0);
 
 	puts("## vxWorks terminated\n");
+
 	return 1;
 }
 
-/* ======================================================================
+/*
  * A very simple elf loader, assumes the image is valid, returns the
  * entry point address.
- * ====================================================================== */
+ */
 static unsigned long load_elf_image_phdr(unsigned long addr)
 {
-	Elf32_Ehdr *ehdr;		/* Elf header structure pointer     */
-	Elf32_Phdr *phdr;		/* Program header structure pointer */
+	Elf32_Ehdr *ehdr; /* Elf header structure pointer */
+	Elf32_Phdr *phdr; /* Program header structure pointer */
 	int i;
 
-	ehdr = (Elf32_Ehdr *) addr;
-	phdr = (Elf32_Phdr *) (addr + ehdr->e_phoff);
+	ehdr = (Elf32_Ehdr *)addr;
+	phdr = (Elf32_Phdr *)(addr + ehdr->e_phoff);
 
 	/* Load each program header */
 	for (i = 0; i < ehdr->e_phnum; ++i) {
-		void *dst = (void *)(uintptr_t) phdr->p_paddr;
-		void *src = (void *) addr + phdr->p_offset;
+		void *dst = (void *)(uintptr_t)phdr->p_paddr;
+		void *src = (void *)addr + phdr->p_offset;
 		debug("Loading phdr %i to 0x%p (%i bytes)\n",
-			i, dst, phdr->p_filesz);
+		      i, dst, phdr->p_filesz);
 		if (phdr->p_filesz)
 			memcpy(dst, src, phdr->p_filesz);
 		if (phdr->p_filesz != phdr->p_memsz)
 			memset(dst + phdr->p_filesz, 0x00,
-				phdr->p_memsz - phdr->p_filesz);
+			       phdr->p_memsz - phdr->p_filesz);
 		flush_cache((unsigned long)dst, phdr->p_filesz);
 		++phdr;
 	}
@@ -306,50 +286,46 @@ static unsigned long load_elf_image_phdr(unsigned long addr)
 
 static unsigned long load_elf_image_shdr(unsigned long addr)
 {
-	Elf32_Ehdr *ehdr;		/* Elf header structure pointer     */
-	Elf32_Shdr *shdr;		/* Section header structure pointer */
-	unsigned char *strtab = 0;	/* String table pointer             */
-	unsigned char *image;		/* Binary image pointer             */
-	int i;				/* Loop counter                     */
-
-	/* -------------------------------------------------- */
+	Elf32_Ehdr *ehdr; /* Elf header structure pointer */
+	Elf32_Shdr *shdr; /* Section header structure pointer */
+	unsigned char *strtab = 0; /* String table pointer */
+	unsigned char *image; /* Binary image pointer */
+	int i; /* Loop counter */
 
-	ehdr = (Elf32_Ehdr *) addr;
+	ehdr = (Elf32_Ehdr *)addr;
 
 	/* Find the section header string table for output info */
-	shdr = (Elf32_Shdr *) (addr + ehdr->e_shoff +
-			       (ehdr->e_shstrndx * sizeof(Elf32_Shdr)));
+	shdr = (Elf32_Shdr *)(addr + ehdr->e_shoff +
+			     (ehdr->e_shstrndx * sizeof(Elf32_Shdr)));
 
 	if (shdr->sh_type == SHT_STRTAB)
-		strtab = (unsigned char *) (addr + shdr->sh_offset);
+		strtab = (unsigned char *)(addr + shdr->sh_offset);
 
 	/* Load each appropriate section */
 	for (i = 0; i < ehdr->e_shnum; ++i) {
-		shdr = (Elf32_Shdr *) (addr + ehdr->e_shoff +
-				       (i * sizeof(Elf32_Shdr)));
+		shdr = (Elf32_Shdr *)(addr + ehdr->e_shoff +
+				     (i * sizeof(Elf32_Shdr)));
 
-		if (!(shdr->sh_flags & SHF_ALLOC)
-		   || shdr->sh_addr == 0 || shdr->sh_size == 0) {
+		if (!(shdr->sh_flags & SHF_ALLOC) ||
+		    shdr->sh_addr == 0 || shdr->sh_size == 0) {
 			continue;
 		}
 
 		if (strtab) {
 			debug("%sing %s @ 0x%08lx (%ld bytes)\n",
-				(shdr->sh_type == SHT_NOBITS) ?
-					"Clear" : "Load",
-				&strtab[shdr->sh_name],
-				(unsigned long) shdr->sh_addr,
-				(long) shdr->sh_size);
+			      (shdr->sh_type == SHT_NOBITS) ? "Clear" : "Load",
+			       &strtab[shdr->sh_name],
+			       (unsigned long)shdr->sh_addr,
+			       (long)shdr->sh_size);
 		}
 
 		if (shdr->sh_type == SHT_NOBITS) {
-			memset((void *)(uintptr_t) shdr->sh_addr, 0,
-				shdr->sh_size);
+			memset((void *)(uintptr_t)shdr->sh_addr, 0,
+			       shdr->sh_size);
 		} else {
-			image = (unsigned char *) addr + shdr->sh_offset;
-			memcpy((void *)(uintptr_t) shdr->sh_addr,
-				(const void *) image,
-				shdr->sh_size);
+			image = (unsigned char *)addr + shdr->sh_offset;
+			memcpy((void *)(uintptr_t)shdr->sh_addr,
+			       (const void *)image, shdr->sh_size);
 		}
 		flush_cache(shdr->sh_addr, shdr->sh_size);
 	}
@@ -357,9 +333,8 @@ static unsigned long load_elf_image_shdr(unsigned long addr)
 	return ehdr->e_entry;
 }
 
-/* ====================================================================== */
 U_BOOT_CMD(
-	bootelf,      3,      0,      do_bootelf,
+	bootelf, 3, 0, do_bootelf,
 	"Boot from an ELF image in memory",
 	"[-p|-s] [address]\n"
 	"\t- load ELF image at [address] via program headers (-p)\n"
@@ -367,7 +342,7 @@ U_BOOT_CMD(
 );
 
 U_BOOT_CMD(
-	bootvx,      2,      0,      do_bootvx,
+	bootvx, 2, 0, do_bootvx,
 	"Boot vxWorks from an ELF image",
 	" [address] - load address of vxWorks ELF image."
 );
Signature · 1 line
1.8.2.1
author
#19 lore raw

PATCH v2 8/13 cmd: elf: Reorder load_elf_image_phdr() and load_elf_image_shdr()

In reply to Bin Meng

Move load_elf_image_phdr() and load_elf_image_shdr() to the beginning of the cmd_elf.c so that forward declaration is not needed.

---

Changes in v2: None

 common/cmd_elf.c | 161 +++++++++++++++++++++++++++----------------------------
 1 file changed, 79 insertions(+), 82 deletions(-)
common/cmd_elf.c +79 -82
index c5e4432..62863df 100644
@@ -19,8 +19,85 @@
 #include <net.h>
 #include <vxworks.h>
 
-static unsigned long load_elf_image_phdr(unsigned long addr);
-static unsigned long load_elf_image_shdr(unsigned long addr);
+/*
+ * A very simple elf loader, assumes the image is valid, returns the
+ * entry point address.
+ */
+static unsigned long load_elf_image_phdr(unsigned long addr)
+{
+	Elf32_Ehdr *ehdr; /* Elf header structure pointer */
+	Elf32_Phdr *phdr; /* Program header structure pointer */
+	int i;
+
+	ehdr = (Elf32_Ehdr *)addr;
+	phdr = (Elf32_Phdr *)(addr + ehdr->e_phoff);
+
+	/* Load each program header */
+	for (i = 0; i < ehdr->e_phnum; ++i) {
+		void *dst = (void *)(uintptr_t)phdr->p_paddr;
+		void *src = (void *)addr + phdr->p_offset;
+		debug("Loading phdr %i to 0x%p (%i bytes)\n",
+		      i, dst, phdr->p_filesz);
+		if (phdr->p_filesz)
+			memcpy(dst, src, phdr->p_filesz);
+		if (phdr->p_filesz != phdr->p_memsz)
+			memset(dst + phdr->p_filesz, 0x00,
+			       phdr->p_memsz - phdr->p_filesz);
+		flush_cache((unsigned long)dst, phdr->p_filesz);
+		++phdr;
+	}
+
+	return ehdr->e_entry;
+}
+
+static unsigned long load_elf_image_shdr(unsigned long addr)
+{
+	Elf32_Ehdr *ehdr; /* Elf header structure pointer */
+	Elf32_Shdr *shdr; /* Section header structure pointer */
+	unsigned char *strtab = 0; /* String table pointer */
+	unsigned char *image; /* Binary image pointer */
+	int i; /* Loop counter */
+
+	ehdr = (Elf32_Ehdr *)addr;
+
+	/* Find the section header string table for output info */
+	shdr = (Elf32_Shdr *)(addr + ehdr->e_shoff +
+			     (ehdr->e_shstrndx * sizeof(Elf32_Shdr)));
+
+	if (shdr->sh_type == SHT_STRTAB)
+		strtab = (unsigned char *)(addr + shdr->sh_offset);
+
+	/* Load each appropriate section */
+	for (i = 0; i < ehdr->e_shnum; ++i) {
+		shdr = (Elf32_Shdr *)(addr + ehdr->e_shoff +
+				     (i * sizeof(Elf32_Shdr)));
+
+		if (!(shdr->sh_flags & SHF_ALLOC) ||
+		    shdr->sh_addr == 0 || shdr->sh_size == 0) {
+			continue;
+		}
+
+		if (strtab) {
+			debug("%sing %s @ 0x%08lx (%ld bytes)\n",
+			      (shdr->sh_type == SHT_NOBITS) ? "Clear" : "Load",
+			       &strtab[shdr->sh_name],
+			       (unsigned long)shdr->sh_addr,
+			       (long)shdr->sh_size);
+		}
+
+		if (shdr->sh_type == SHT_NOBITS) {
+			memset((void *)(uintptr_t)shdr->sh_addr, 0,
+			       shdr->sh_size);
+		} else {
+			image = (unsigned char *)addr + shdr->sh_offset;
+			memcpy((void *)(uintptr_t)shdr->sh_addr,
+			       (const void *)image, shdr->sh_size);
+		}
+		flush_cache(shdr->sh_addr, shdr->sh_size);
+	}
+
+	return ehdr->e_entry;
+}
 
 /* Allow ports to override the default behavior */
 static unsigned long do_bootelf_exec(ulong (*entry)(int, char * const[]),
@@ -253,86 +330,6 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	return 1;
 }
 
-/*
- * A very simple elf loader, assumes the image is valid, returns the
- * entry point address.
- */
-static unsigned long load_elf_image_phdr(unsigned long addr)
-{
-	Elf32_Ehdr *ehdr; /* Elf header structure pointer */
-	Elf32_Phdr *phdr; /* Program header structure pointer */
-	int i;
-
-	ehdr = (Elf32_Ehdr *)addr;
-	phdr = (Elf32_Phdr *)(addr + ehdr->e_phoff);
-
-	/* Load each program header */
-	for (i = 0; i < ehdr->e_phnum; ++i) {
-		void *dst = (void *)(uintptr_t)phdr->p_paddr;
-		void *src = (void *)addr + phdr->p_offset;
-		debug("Loading phdr %i to 0x%p (%i bytes)\n",
-		      i, dst, phdr->p_filesz);
-		if (phdr->p_filesz)
-			memcpy(dst, src, phdr->p_filesz);
-		if (phdr->p_filesz != phdr->p_memsz)
-			memset(dst + phdr->p_filesz, 0x00,
-			       phdr->p_memsz - phdr->p_filesz);
-		flush_cache((unsigned long)dst, phdr->p_filesz);
-		++phdr;
-	}
-
-	return ehdr->e_entry;
-}
-
-static unsigned long load_elf_image_shdr(unsigned long addr)
-{
-	Elf32_Ehdr *ehdr; /* Elf header structure pointer */
-	Elf32_Shdr *shdr; /* Section header structure pointer */
-	unsigned char *strtab = 0; /* String table pointer */
-	unsigned char *image; /* Binary image pointer */
-	int i; /* Loop counter */
-
-	ehdr = (Elf32_Ehdr *)addr;
-
-	/* Find the section header string table for output info */
-	shdr = (Elf32_Shdr *)(addr + ehdr->e_shoff +
-			     (ehdr->e_shstrndx * sizeof(Elf32_Shdr)));
-
-	if (shdr->sh_type == SHT_STRTAB)
-		strtab = (unsigned char *)(addr + shdr->sh_offset);
-
-	/* Load each appropriate section */
-	for (i = 0; i < ehdr->e_shnum; ++i) {
-		shdr = (Elf32_Shdr *)(addr + ehdr->e_shoff +
-				     (i * sizeof(Elf32_Shdr)));
-
-		if (!(shdr->sh_flags & SHF_ALLOC) ||
-		    shdr->sh_addr == 0 || shdr->sh_size == 0) {
-			continue;
-		}
-
-		if (strtab) {
-			debug("%sing %s @ 0x%08lx (%ld bytes)\n",
-			      (shdr->sh_type == SHT_NOBITS) ? "Clear" : "Load",
-			       &strtab[shdr->sh_name],
-			       (unsigned long)shdr->sh_addr,
-			       (long)shdr->sh_size);
-		}
-
-		if (shdr->sh_type == SHT_NOBITS) {
-			memset((void *)(uintptr_t)shdr->sh_addr, 0,
-			       shdr->sh_size);
-		} else {
-			image = (unsigned char *)addr + shdr->sh_offset;
-			memcpy((void *)(uintptr_t)shdr->sh_addr,
-			       (const void *)image, shdr->sh_size);
-		}
-		flush_cache(shdr->sh_addr, shdr->sh_size);
-	}
-
-	return ehdr->e_entry;
-}
-
 U_BOOT_CMD(
 	bootelf, 3, 0, do_bootelf,
 	"Boot from an ELF image in memory",
Signature · 1 line
1.8.2.1
author
#20 lore raw

PATCH v2 9/13 cmd: bootvx: Pass netmask and gatewayip to VxWorks bootline

In reply to Bin Meng

There are fields in VxWorks bootline for netmask and gatewayip. We can get these from U-Boot environment variables and pass them to VxWorks, just like ipaddr and serverip.

---

Changes in v2:
- Fix the endian issue for netmask

 common/cmd_elf.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
common/cmd_elf.c +14 -2
index 62863df..9e6aa01 100644
@@ -287,13 +287,25 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 				"%s:file ", CONFIG_SYS_VXWORKS_SERVERNAME);
 
 		tmp = getenv("ipaddr");
-		if (tmp)
-			sprintf(&build_buf[strlen(build_buf)], "e=%s ", tmp);
+		if (tmp) {
+			sprintf(&build_buf[strlen(build_buf)], "e=%s", tmp);
+			tmp = getenv("netmask");
+			if (tmp)
+				sprintf(&build_buf[strlen(build_buf)],
+					":%08x ",
+					ntohl(getenv_ip("netmask").s_addr));
+			else
+				sprintf(&build_buf[strlen(build_buf)], " ");
+		}
 
 		tmp = getenv("serverip");
 		if (tmp)
 			sprintf(&build_buf[strlen(build_buf)], "h=%s ", tmp);
 
+		tmp = getenv("gatewayip");
+		if (tmp)
+			sprintf(&build_buf[strlen(build_buf)], "g=%s ", tmp);
+
 		tmp = getenv("hostname");
 		if (tmp)
 			sprintf(&build_buf[strlen(build_buf)], "tn=%s ", tmp);
Signature · 1 line
1.8.2.1
#21 lore raw

PATCH v2 9/13 cmd: bootvx: Pass netmask and gatewayip to VxWorks bootline

Hi Bin,

Quoted 20 lines · Bin Meng

There are fields in VxWorks bootline for netmask and gatewayip. We can get these from U-Boot environment variables and pass them to VxWorks, just like ipaddr and serverip.

---

Changes in v2:
- Fix the endian issue for netmask

 common/cmd_elf.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
common/cmd_elf.c +0 -0
index 62863df..9e6aa01 100644

common/cmd_elf.c int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 289

Quoted 3 lines
common/cmd_elf.c +0 -0
@@ -287,13 +287,25 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                "%s:file ", CONFIG_SYS_VXWORKS_SERVERNAME);
 
                tmp = getenv("ipaddr");

Can we avoid all these calls to strlen() by having a ptr variable?

ptr = sprintf(...)
ptr += sprintf(build_buf + ptr, ...)
ptr += sprintf(build_buf + ptr, ...)

Quoted 26 lines
common/cmd_elf.c +14 -3
-               if (tmp)
-                       sprintf(&build_buf[strlen(build_buf)], "e=%s ", tmp);
+               if (tmp) {
+                       sprintf(&build_buf[strlen(build_buf)], "e=%s", tmp);
+                       tmp = getenv("netmask");
+                       if (tmp)
+                               sprintf(&build_buf[strlen(build_buf)],
+                                       ":%08x ",
+                                       ntohl(getenv_ip("netmask").s_addr));
+                       else
+                               sprintf(&build_buf[strlen(build_buf)], " ");
+               }
 
                tmp = getenv("serverip");
                if (tmp)
                        sprintf(&build_buf[strlen(build_buf)], "h=%s ", tmp);
 
+               tmp = getenv("gatewayip");
+               if (tmp)
+                       sprintf(&build_buf[strlen(build_buf)], "g=%s ", tmp);
+
                tmp = getenv("hostname");
                if (tmp)
                        sprintf(&build_buf[strlen(build_buf)], "tn=%s ", tmp);
--
Quoted 2 lines

1.8.2.1

Regards,
Simon

author
#22 lore raw

PATCH v2 10/13 cmd: bootvx: Always get VxWorks bootline from env

In reply to Bin Meng

So far VxWorks bootline can be contructed from various environment variables, but when these variables do not exist we get these from corresponding config macros. This is not helpful as it requires rebuilding U-Boot, and to make sure these config macros take effect we should not have these environment variables. This is a little bit complex and confusing.

Now we change the logic to always contruct the bootline from environments (the only single source), by adding two new variables "bootdev" and "othbootargs", and adding some comments about network related settings mentioning they are optional. The doc about the bootline handling is also updated.

---

Changes in v2: None

 README            |  12 +-----
 common/cmd_elf.c  | 121 +++++++++++++++++++++++++++++++-----------------------
 include/vxworks.h |  22 ----------
 3 files changed, 72 insertions(+), 83 deletions(-)
README +2 -10
index a13705a..7ed85d2 100644
@@ -794,18 +794,10 @@ The following options need to be configured:
 - vxWorks boot parameters:
 
 		bootvx constructs a valid bootline using the following
-		environments variables: bootfile, ipaddr, serverip, hostname.
+		environments variables: bootdev, bootfile, ipaddr, netmask,
+		serverip, gatewayip, hostname, othbootargs.
 		It loads the vxWorks image pointed bootfile.
 
-		CONFIG_SYS_VXWORKS_BOOT_DEVICE - The vxworks device name
-		CONFIG_SYS_VXWORKS_MAC_PTR - Ethernet 6 byte MA -address
-		CONFIG_SYS_VXWORKS_SERVERNAME - Name of the server
-		CONFIG_SYS_VXWORKS_BOOT_ADDR - Address of boot parameters
-
-		CONFIG_SYS_VXWORKS_ADD_PARAMS
-
-		Add it at the end of the bootline. E.g "u=username pw=secret"
-
 		Note: If a "bootargs" environment is defined, it will overwride
 		the defaults discussed just above.
 
common/cmd_elf.c +70 -51

146 lines not on this page · raw message

include/vxworks.h +0 -22
index 122043c..297a70f 100644
@@ -13,26 +13,4 @@ void boot_prep_vxworks(bootm_headers_t *images);
 void boot_jump_vxworks(bootm_headers_t *images);
 void do_bootvx_fdt(bootm_headers_t *images);
 
-/*
- * Use bootaddr to find the location in memory that VxWorks
- * will look for the bootline string. The default value for
- * PowerPC is LOCAL_MEM_LOCAL_ADRS + BOOT_LINE_OFFSET which
- * defaults to 0x4200
- */
-#ifndef CONFIG_SYS_VXWORKS_BOOT_ADDR
-#define CONFIG_SYS_VXWORKS_BOOT_ADDR 0x4200
-#endif
-
-#ifndef CONFIG_SYS_VXWORKS_BOOT_DEVICE
-#if defined(CONFIG_4xx)
-#define		CONFIG_SYS_VXWORKS_BOOT_DEVICE "emac(0,0)"
-#else
-#define		CONFIG_SYS_VXWORKS_BOOT_DEVICE "eth(0,0)"
-#endif
-#endif
-
-#ifndef CONFIG_SYS_VXWORKS_SERVERNAME
-#define CONFIG_SYS_VXWORKS_SERVERNAME	"srv"
-#endif
-
 #endif
Signature · 1 line
1.8.2.1
#23 lore raw

PATCH v2 10/13 cmd: bootvx: Always get VxWorks bootline from env

Quoted 23 lines · Bin Meng

So far VxWorks bootline can be contructed from various environment variables, but when these variables do not exist we get these from corresponding config macros. This is not helpful as it requires rebuilding U-Boot, and to make sure these config macros take effect we should not have these environment variables. This is a little bit complex and confusing.

Now we change the logic to always contruct the bootline from environments (the only single source), by adding two new variables "bootdev" and "othbootargs", and adding some comments about network related settings mentioning they are optional. The doc about the bootline handling is also updated.

---

Changes in v2: None

  README            |  12 +-----
  common/cmd_elf.c  | 121 +++++++++++++++++++++++++++++++-----------------------
  include/vxworks.h |  22 ----------
  3 files changed, 72 insertions(+), 83 deletions(-)
author
#24 lore raw

PATCH v2 11/13 cmd: bootvx: Pass E820 information to an x86 VxWorks kernel

In reply to Bin Meng

E820 is critical to the kernel as it provides system memory map information. Pass it to an x86 VxWorks kernel.

---

Changes in v2: None

 common/cmd_elf.c  | 30 ++++++++++++++++++++++++++++++
 include/vxworks.h | 29 +++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
common/cmd_elf.c +30 -0
index b71da25..1c5bf0d 100644
@@ -18,6 +18,9 @@
 #include <elf.h>
 #include <net.h>
 #include <vxworks.h>
+#ifdef CONFIG_X86
+#include <asm/e820.h>
+#endif
 
 /*
  * A very simple elf loader, assumes the image is valid, returns the
@@ -213,6 +216,10 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	char *bootline; /* Text of the bootline */
 	char *tmp; /* Temporary char pointer */
 	char build_buf[128]; /* Buffer for building the bootline */
+#ifdef CONFIG_X86
+	struct e820info *info;
+	struct e820entry *data;
+#endif
 
 	/*
 	 * Check the loadaddr variable.
@@ -341,6 +348,29 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		       (char *)bootaddr);
 	}
 
+#ifdef CONFIG_X86
+	/*
+	 * Since E820 information is critical to the kernel, if we don't
+	 * specify these in the environments, use a default one.
+	 */
+	tmp = getenv("e820data");
+	if (tmp)
+		data = (struct e820entry *)simple_strtoul(tmp, NULL, 16);
+	else
+		data = (struct e820entry *)VXWORKS_E820_DATA_ADDR;
+	tmp = getenv("e820info");
+	if (tmp)
+		info = (struct e820info *)simple_strtoul(tmp, NULL, 16);
+	else
+		info = (struct e820info *)VXWORKS_E820_INFO_ADDR;
+
+	memset(info, 0, sizeof(struct e820info));
+	info->sign = E820_SIGNATURE;
+	info->entries = install_e820_map(E820MAX, data);
+	info->addr = (info->entries - 1) * sizeof(struct e820entry) +
+		     VXWORKS_E820_DATA_ADDR;
+#endif
+
 	/*
 	 * If the data at the load address is an elf image, then
 	 * treat it like an elf image. Otherwise, assume that it is a
include/vxworks.h +29 -0
index 297a70f..f69b008 100644
@@ -8,6 +8,35 @@
 #ifndef _VXWORKS_H_
 #define _VXWORKS_H_
 
+/*
+ * VxWorks x86 E820 related stuff
+ *
+ * VxWorks on x86 gets E820 information from pre-defined address @
+ * 0x4a00 and 0x4000. At 0x4a00 it's an information table defined
+ * by VxWorks and the actual E820 table entries starts from 0x4000.
+ * As defined by the BIOS E820 spec, the maximum number of E820 table
+ * entries is 128 and each entry occupies 20 bytes, so it's 128 * 20
+ * = 2560 (0xa00) bytes in total. That's where VxWorks stores some
+ * information that is retrieved from the BIOS E820 call and saved
+ * later for sanity test during the kernel boot-up.
+ */
+#define VXWORKS_E820_DATA_ADDR	0x4000
+#define VXWORKS_E820_INFO_ADDR	0x4a00
+
+/* E820 info signatiure "SMAP" - System MAP */
+#define E820_SIGNATURE	0x534d4150
+
+struct e820info {
+	u32 sign;	/* "SMAP" signature */
+	u32 x0;		/* don't care, used by VxWorks */
+	u32 x1;		/* don't care, used by VxWorks */
+	u32 x2;		/* don't care, used by VxWorks */
+	u32 addr;	/* last e820 table entry addr */
+	u32 x3;		/* don't care, used by VxWorks */
+	u32 entries;	/* e820 table entry count */
+	u32 error;	/* must be zero */
+};
+
 int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 void boot_prep_vxworks(bootm_headers_t *images);
 void boot_jump_vxworks(bootm_headers_t *images);
Signature · 1 line
1.8.2.1
#25 lore raw

PATCH v2 11/13 cmd: bootvx: Pass E820 information to an x86 VxWorks kernel

Quoted 7 lines · Bin Meng

E820 is critical to the kernel as it provides system memory map information. Pass it to an x86 VxWorks kernel.

Quoted 7 lines

---

Changes in v2: None

 common/cmd_elf.c  | 30 ++++++++++++++++++++++++++++++
 include/vxworks.h | 29 +++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
author
#26 lore raw

PATCH v2 12/13 cmd: bootvx: Add asmlinkage to the VxWorks x86 entry

In reply to Bin Meng

VxWorks on x86 uses stack to pass parameters.

---

Changes in v2:
- New patch to add asmlinkage to the VxWorks x86 entry

 common/cmd_elf.c | 6 ++++++
 1 file changed, 6 insertions(+)
common/cmd_elf.c +6 -0
index 1c5bf0d..fdf0b4a 100644
@@ -20,6 +20,7 @@
 #include <vxworks.h>
 #ifdef CONFIG_X86
 #include <asm/e820.h>
+#include <linux/linkage.h>
 #endif
 
 /*
@@ -384,7 +385,12 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	printf("## Starting vxWorks at 0x%08lx ...\n", addr);
 
 	dcache_disable();
+#ifdef CONFIG_X86
+	/* VxWorks on x86 uses stack to pass parameters */
+	((asmlinkage void (*)(int))addr)(0);
+#else
 	((void (*)(int))addr)(0);
+#endif
 
 	puts("## vxWorks terminated\n");
 
Signature · 1 line
1.8.2.1
author
#28 lore raw

PATCH v2 13/13 doc: Complement document about booting VxWorks

In reply to Bin Meng

Current document about how to boot VxWorks is limited. Add several chapters in README.vxworks to document this.

---

Changes in v2:
- Describe typical values for bootaddr, e820data, e820info.

 doc/README.vxworks | 82 ++++++++++++++++++++++++++++++++++++++++++++++++------
 doc/README.x86     |  2 ++
 2 files changed, 76 insertions(+), 8 deletions(-)
doc/README.vxworks +74 -8
index 4cb302e..3433e4f 100644
@@ -1,19 +1,85 @@
-From VxWorks 6.9+ (not include 6.9), VxWorks starts adopting device tree as its hardware
-decription mechansim (for PowerPC and ARM), thus requiring boot interface changes.
+#
+# Copyright (C) 2013, Miao Yan <[email protected]>
+# Copyright (C) 2015, Bin Meng <[email protected]>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+VxWorks Support
+===============
+
+This document describes the information about U-Boot loading VxWorks kernel.
+
+Status
+------
+U-Boot supports loading VxWorks kernels via 'bootvx' and 'bootm' commands.
+For booting old kernels (6.9.x) on PowerPC and ARM, and all kernel versions
+on other architectures, 'bootvx' shall be used. For booting VxWorks 7 kernels
+on PowerPC and ARM, 'bootm' shall be used.
+
+64-bit x86 kernel cannot be loaded as of today.
+
+VxWork 7 on PowerPC and ARM
+---------------------------
+From VxWorks 7, VxWorks starts adopting device tree as its hardware decription
+mechansim (for PowerPC and ARM), thus requiring boot interface changes.
 This section will describe the new interface.
 
-For PowerPC, the calling convention of the new VxWorks entry point conforms to the ePAPR standard,
-which is shown below (see ePAPR for more details):
+For PowerPC, the calling convention of the new VxWorks entry point conforms to
+the ePAPR standard, which is shown below (see ePAPR for more details):
 
-    void (*kernel_entry)(fdt_addr,
-              0, 0, EPAPR_MAGIC, boot_IMA, 0, 0)
+    void (*kernel_entry)(fdt_addr, 0, 0, EPAPR_MAGIC, boot_IMA, 0, 0)
 
 For ARM, the calling convention is show below:
 
     void (*kernel_entry)(void *fdt_addr)
 
-When booting new VxWorks kernel (uImage format), the parameters passed to bootm is like below:
+When booting new VxWorks kernel (uImage format), the parameters passed to bootm
+is like below:
 
     bootm <kernel image address> - <device tree address>
 
-The do_bootvx command still works as it was for older VxWorks kernels.
+VxWorks bootline
+----------------
+When using 'bootvx', the kernel bootline must be prepared by U-Boot at a
+board-specific address before loading VxWorks. U-Boot supplies its address
+via "bootaddr" environment variable. To check where the bootline should be
+for a specific board, go to the VxWorks BSP for that board, and look for a
+parameter called BOOT_LINE_ADRS. Assign its value to "bootaddr". A typical
+value for "bootaddr" is 0x101200.
+
+If a "bootargs" variable is defined, its content will be copied to the memory
+location pointed by "bootaddr" as the kernel bootline. If "bootargs" is not
+there, command 'bootvx' can construct a valid bootline using the following
+environments variables: bootdev, bootfile, ipaddr, netmask, serverip,
+gatewayip, hostname, othbootargs.
+
+When using 'bootm', just define "bootargs" in the environment and U-Boot will
+handle bootline fix up for the kernel dtb automatically.
+
+Serial console
+--------------
+It's very common that VxWorks BSPs configure a different baud rate for the
+serial console from what is being used by U-Boot. For example, VxWorks tends
+to use 9600 as the default baud rate on all x86 BSPs while U-Boot uses 115200.
+Please configure both U-Boot and VxWorks to use the same baud rate, or it may
+look like VxWorks hangs somewhere as nothing outputs on the serial console.
+
+x86-specific information
+------------------------
+Before loading an x86 kernel, two additional environment variables need to be
+provided. They are "e820data" and "e820info", which represent the address of
+E820 table and E820 information (defined by VxWorks) in system memory.
+
+Check VxWorks kernel configuration to look for BIOS_E820_DATA_START and
+BIOS_E820_INFO_START, and assign their values to "e820data" and "e820info"
+accordingly. If neither of these two are supplied, U-Boot assumes a default
+location at 0x4000 for "e820data" and 0x4a00 for "e820info". Typical values
+for "e820data" and "e820info" are 0x104000 and 0x104a00. But there is one
+exception on Intel Galileo, where "e820data" and "e820info" should be left
+unset, which assume the default location for VxWorks.
+
+Note since currently U-Boot does not support ACPI yet, VxWorks kernel must
+be configured to use MP table and virtual wire interrupt mode. This requires
+INCLUDE_MPTABLE_BOOT_OP and INCLUDE_VIRTUAL_WIRE_MODE to be included in a
+VxWorks kernel configuration.
doc/README.x86 +2 -0
index 6cf293b..a4f5321 100644
@@ -25,6 +25,8 @@ targets and all Intel boards support running U-Boot 'bare metal'.
 
 As for loading an OS, U-Boot supports directly booting a 32-bit or 64-bit
 Linux kernel as part of a FIT image. It also supports a compressed zImage.
+U-Boot supports loading an x86 VxWorks kernel. Please check README.vxworks
+for more details.
 
 Build Instructions for U-Boot as coreboot payload
 -------------------------------------------------
Signature · 1 line
1.8.2.1