From 181bd9dc61d2da88b78f1c1138a685dae39354d6 Mon Sep 17 00:00:00 2001
From: Nikita Kiryanov <nikita@compulab.co.il>
Date: Mon, 3 Aug 2015 12:36:58 +0300
Subject: [PATCH] kconfig: add config option for shell prompt
Add option to set shell prompt string from menuconfig and migrate
boards globally.
The migration is done as follows:
- Boards that explicitly and unconditionally set CONFIG_SYS_PROMPT had the
entry moved to their defconfig files.
- Boards that defined some kind of #ifdef logic which selects the
CONFIG_SYS_PROMPT (for example qemu-mips) got an #undef CONFIG_SYS_PROMPT
right before the #ifdef logic and were left alone.
- This change forces CONFIG_SYS_PROMPT to be a per board decision, and thus
CONFIG_SYS_PROMPT was removed from all <soc>_common.h and <arch>_common.h
files. This results in a streamlined default value across platforms, and
includes the following files: spear-common, sunxi-common, mv-common,
ti_armv7_common, tegra-common, at91-sama5_common, and zynq-common.
- Boards that relied on <arch/soc>_common.h values of CONFIG_SYS_PROMPT were
not updated in their respective defconfig files under the assumption that
since they did not explicitly define a value, they're fine with whatever
the default is.
- On the other hand, boards that relied on a value defined in some
<boards>_common.h file such as woodburn_common, rpi-common,
bur_am335x_common, ls2085a_common, siemens_am33x_common, and
omap3_evm_common, had their values moved to the respective defconfig files.
- The define V_PROMPT was removed, since it is not used anywhere except for
assigning a value for CONFIG_SYS_PROMPT.
Cc: Tom Rini <trini@konsulko.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
[trini: Add spring, sniper, smartweb to conversion]
Signed-off-by: Tom Rini <trini@konsulko.com>
---
common/Kconfig | 7 +++++++
configs/M5208EVBE_defconfig | 1 +
configs/M52277EVB_defconfig | 1 +
configs/M5235EVB_defconfig | 1 +
configs/M5272C3_defconfig | 1 +
configs/M5275EVB_defconfig | 1 +
configs/M5282EVB_defconfig | 1 +
configs/M53017EVB_defconfig | 1 +
configs/M5329AFEE_defconfig | 1 +
configs/M5329BFEE_defconfig | 1 +
configs/M5373EVB_defconfig | 1 +
configs/M54418TWR_defconfig | 1 +
configs/M54418TWR_nand_mii_defconfig | 1 +
configs/M54418TWR_nand_rmii_defconfig | 1 +
configs/M54418TWR_nand_rmii_lowfreq_defconfig | 1 +
configs/M54418TWR_serial_mii_defconfig | 1 +
configs/M54418TWR_serial_rmii_defconfig | 1 +
configs/M54451EVB_defconfig | 1 +
configs/M54455EVB_defconfig | 1 +
configs/M5475AFE_defconfig | 1 +
configs/M5475BFE_defconfig | 1 +
configs/M5475CFE_defconfig | 1 +
configs/M5475DFE_defconfig | 1 +
configs/M5475EFE_defconfig | 1 +
configs/M5475FFE_defconfig | 1 +
configs/M5475GFE_defconfig | 1 +
configs/M5485AFE_defconfig | 1 +
configs/M5485BFE_defconfig | 1 +
configs/M5485CFE_defconfig | 1 +
configs/M5485DFE_defconfig | 1 +
configs/M5485EFE_defconfig | 1 +
configs/M5485FFE_defconfig | 1 +
configs/M5485GFE_defconfig | 1 +
configs/M5485HFE_defconfig | 1 +
configs/MPC8349ITXGP_defconfig | 1 +
configs/MPC8349ITX_LOWBOOT_defconfig | 1 +
configs/MPC8349ITX_defconfig | 1 +
configs/PATI_defconfig | 1 +
configs/UCP1020_defconfig | 1 +
configs/VCMA9_defconfig | 1 +
configs/ac14xx_defconfig | 1 +
configs/adp-ag101_defconfig | 1 +
configs/adp-ag101p_defconfig | 1 +
configs/adp-ag102_defconfig | 1 +
configs/am3517_crane_defconfig | 1 +
configs/am3517_evm_defconfig | 1 +
configs/amcore_defconfig | 1 +
configs/apalis_t30_defconfig | 1 +
configs/apf27_defconfig | 1 +
configs/arcangel4_defconfig | 1 +
configs/arndale_defconfig | 1 +
configs/astro_mcf5373l_defconfig | 1 +
configs/at91rm9200ek_defconfig | 1 +
configs/at91rm9200ek_ram_defconfig | 1 +
configs/at91sam9260ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9260ek_dataflash_cs1_defconfig | 1 +
configs/at91sam9260ek_nandflash_defconfig | 1 +
configs/at91sam9261ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9261ek_dataflash_cs3_defconfig | 1 +
configs/at91sam9261ek_nandflash_defconfig | 1 +
configs/at91sam9263ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9263ek_dataflash_defconfig | 1 +
configs/at91sam9263ek_nandflash_defconfig | 1 +
configs/at91sam9263ek_norflash_boot_defconfig | 1 +
configs/at91sam9263ek_norflash_defconfig | 1 +
configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 +
configs/at91sam9g10ek_nandflash_defconfig | 1 +
configs/at91sam9g20ek_2mmc_defconfig | 1 +
configs/at91sam9g20ek_2mmc_nandflash_defconfig | 1 +
configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 +
configs/at91sam9g20ek_nandflash_defconfig | 1 +
configs/at91sam9m10g45ek_mmc_defconfig | 1 +
configs/at91sam9m10g45ek_nandflash_defconfig | 1 +
configs/at91sam9n12ek_mmc_defconfig | 1 +
configs/at91sam9n12ek_nandflash_defconfig | 1 +
configs/at91sam9n12ek_spiflash_defconfig | 1 +
configs/at91sam9rlek_dataflash_defconfig | 1 +
configs/at91sam9rlek_mmc_defconfig | 1 +
configs/at91sam9rlek_nandflash_defconfig | 1 +
configs/at91sam9x5ek_dataflash_defconfig | 1 +
configs/at91sam9x5ek_mmc_defconfig | 1 +
configs/at91sam9x5ek_nandflash_defconfig | 1 +
configs/at91sam9x5ek_spiflash_defconfig | 1 +
configs/at91sam9xeek_dataflash_cs0_defconfig | 1 +
configs/at91sam9xeek_dataflash_cs1_defconfig | 1 +
configs/at91sam9xeek_nandflash_defconfig | 1 +
configs/atngw100_defconfig | 1 +
configs/atngw100mkii_defconfig | 1 +
configs/atstk1002_defconfig | 1 +
configs/axs101_defconfig | 1 +
configs/beaver_defconfig | 1 +
configs/bf537-minotaur_defconfig | 1 +
configs/bf537-srv1_defconfig | 1 +
configs/bf561-acvilon_defconfig | 1 +
configs/br4_defconfig | 1 +
configs/cairo_defconfig | 1 +
configs/calimain_defconfig | 1 +
configs/cam_enc_4xx_defconfig | 1 +
configs/cardhu_defconfig | 1 +
configs/cgtqmx6qeval_defconfig | 1 +
configs/cm_fx6_defconfig | 1 +
configs/cm_t335_defconfig | 1 +
configs/cm_t3517_defconfig | 1 +
configs/cm_t35_defconfig | 1 +
configs/cm_t54_defconfig | 1 +
configs/cobra5272_defconfig | 1 +
configs/colibri_t20_defconfig | 1 +
configs/colibri_t30_defconfig | 1 +
configs/colibri_vf_defconfig | 1 +
configs/colibri_vf_dtb_defconfig | 1 +
configs/corvus_defconfig | 1 +
configs/cpu9260_128M_defconfig | 1 +
configs/cpu9260_defconfig | 1 +
configs/cpu9260_nand_128M_defconfig | 1 +
configs/cpu9260_nand_defconfig | 1 +
configs/cpu9G20_128M_defconfig | 1 +
configs/cpu9G20_defconfig | 1 +
configs/cpu9G20_nand_128M_defconfig | 1 +
configs/cpu9G20_nand_defconfig | 1 +
configs/cpuat91_defconfig | 1 +
configs/da830evm_defconfig | 1 +
configs/da850evm_defconfig | 1 +
configs/da850evm_direct_nor_defconfig | 1 +
configs/dalmore_defconfig | 1 +
configs/davinci_dm355evm_defconfig | 1 +
configs/davinci_dm355leopard_defconfig | 1 +
configs/davinci_dm365evm_defconfig | 1 +
configs/davinci_dm6467evm_defconfig | 1 +
configs/davinci_dvevm_defconfig | 1 +
configs/davinci_schmoogie_defconfig | 1 +
configs/davinci_sffsdr_defconfig | 1 +
configs/davinci_sonata_defconfig | 1 +
configs/dbau1000_defconfig | 1 +
configs/dbau1100_defconfig | 1 +
configs/dbau1500_defconfig | 1 +
configs/dbau1550_defconfig | 1 +
configs/dbau1550_el_defconfig | 1 +
configs/dig297_defconfig | 1 +
configs/dockstar_defconfig | 1 +
configs/draco_defconfig | 1 +
configs/duovero_defconfig | 1 +
configs/ea20_defconfig | 1 +
configs/eb_cpu5282_defconfig | 1 +
configs/eb_cpux9k2_defconfig | 1 +
configs/eco5pk_defconfig | 1 +
configs/edminiv2_defconfig | 1 +
configs/ethernut5_defconfig | 1 +
configs/flea3_defconfig | 1 +
configs/fx12mm_defconfig | 1 +
configs/goflexhome_defconfig | 1 +
configs/grasshopper_defconfig | 1 +
configs/gwventana_defconfig | 1 +
configs/h2200_defconfig | 1 +
configs/harmony_defconfig | 1 +
configs/ib62x0_defconfig | 1 +
configs/iconnect_defconfig | 1 +
configs/ima3-mx53_defconfig | 1 +
configs/imx31_litekit_defconfig | 1 +
configs/imx31_phycore_defconfig | 1 +
configs/integratorap_cm720t_defconfig | 1 +
configs/integratorap_cm920t_defconfig | 1 +
configs/integratorap_cm926ejs_defconfig | 1 +
configs/integratorap_cm946es_defconfig | 1 +
configs/integratorcp_cm1136_defconfig | 1 +
configs/integratorcp_cm920t_defconfig | 1 +
configs/integratorcp_cm926ejs_defconfig | 1 +
configs/integratorcp_cm946es_defconfig | 1 +
configs/ipam390_defconfig | 1 +
configs/jetson-tk1_defconfig | 1 +
configs/jornada_defconfig | 1 +
configs/k2e_evm_defconfig | 1 +
configs/k2hk_evm_defconfig | 1 +
configs/k2l_evm_defconfig | 1 +
configs/kwb_defconfig | 1 +
configs/kzm9g_defconfig | 1 +
configs/mcx_defconfig | 1 +
configs/medcom-wide_defconfig | 1 +
configs/microblaze-generic_defconfig | 1 +
configs/ml507_defconfig | 1 +
configs/mt_ventoux_defconfig | 1 +
configs/mx51_efikamx_defconfig | 1 +
configs/nas220_defconfig | 1 +
configs/nhk8815_defconfig | 1 +
configs/nokia_rx51_defconfig | 1 +
configs/nyan-big_defconfig | 1 +
configs/odroid-xu3_defconfig | 1 +
configs/odroid_defconfig | 1 +
configs/omap3_evm_defconfig | 1 +
configs/omap3_evm_quick_mmc_defconfig | 1 +
configs/omap3_evm_quick_nand_defconfig | 1 +
configs/omap3_logic_defconfig | 1 +
configs/omap3_mvblx_defconfig | 1 +
configs/omap3_overo_defconfig | 1 +
configs/omap3_pandora_defconfig | 1 +
configs/omap3_sdp3430_defconfig | 1 +
configs/omapl138_lcdk_defconfig | 1 +
configs/origen_defconfig | 1 +
configs/palmld_defconfig | 1 +
configs/palmtc_defconfig | 1 +
configs/paz00_defconfig | 1 +
configs/pb1000_defconfig | 1 +
configs/pcm030_defconfig | 1 +
configs/peach-pi_defconfig | 1 +
configs/peach-pit_defconfig | 1 +
configs/pepper_defconfig | 1 +
configs/platinum_picon_defconfig | 1 +
configs/platinum_titanium_defconfig | 1 +
configs/plutux_defconfig | 1 +
configs/pm9261_defconfig | 1 +
configs/pm9263_defconfig | 1 +
configs/pm9g45_defconfig | 1 +
configs/pogo_e02_defconfig | 1 +
configs/pr1_defconfig | 1 +
configs/pxm2_defconfig | 1 +
configs/rastaban_defconfig | 1 +
configs/rpi_2_defconfig | 1 +
configs/rpi_defconfig | 1 +
configs/rut_defconfig | 1 +
configs/s5p_goni_defconfig | 1 +
configs/s5pc210_universal_defconfig | 1 +
configs/scb9328_defconfig | 1 +
configs/seaboard_defconfig | 1 +
configs/secomx6quq7_defconfig | 1 +
configs/smartweb_defconfig | 1 +
configs/smdk2410_defconfig | 1 +
configs/smdk5250_defconfig | 1 +
configs/smdk5420_defconfig | 1 +
configs/smdkc100_defconfig | 1 +
configs/smdkv310_defconfig | 1 +
configs/snapper9260_defconfig | 1 +
configs/sniper_defconfig | 1 +
configs/snow_defconfig | 1 +
configs/snowball_defconfig | 1 +
configs/spring_defconfig | 1 +
configs/stamp9g20_defconfig | 1 +
configs/stm32f429-discovery_defconfig | 1 +
configs/stv0991_defconfig | 1 +
configs/stxgp3_defconfig | 1 +
configs/stxssa_defconfig | 1 +
configs/tao3530_defconfig | 1 +
configs/taurus_defconfig | 1 +
configs/tb100_defconfig | 1 +
configs/tbs2910_defconfig | 1 +
configs/tec-ng_defconfig | 1 +
configs/tec_defconfig | 1 +
configs/thuban_defconfig | 1 +
configs/ti814x_evm_defconfig | 1 +
configs/ti816x_evm_defconfig | 1 +
configs/titanium_defconfig | 1 +
configs/trats2_defconfig | 1 +
configs/trats_defconfig | 1 +
configs/tricorder_defconfig | 1 +
configs/trimslice_defconfig | 1 +
configs/tseries_mmc_defconfig | 1 +
configs/tseries_nand_defconfig | 1 +
configs/tseries_spi_defconfig | 1 +
configs/tt01_defconfig | 1 +
configs/twister_defconfig | 1 +
configs/u8500_href_defconfig | 1 +
configs/usb_a9263_dataflash_defconfig | 1 +
configs/v5fx30teval_defconfig | 1 +
configs/vct_platinum_defconfig | 1 +
configs/vct_platinum_onenand_defconfig | 1 +
configs/vct_platinum_onenand_small_defconfig | 1 +
configs/vct_platinum_small_defconfig | 1 +
configs/vct_platinumavc_defconfig | 1 +
configs/vct_platinumavc_onenand_defconfig | 1 +
configs/vct_platinumavc_onenand_small_defconfig | 1 +
configs/vct_platinumavc_small_defconfig | 1 +
configs/vct_premium_defconfig | 1 +
configs/vct_premium_onenand_defconfig | 1 +
configs/vct_premium_onenand_small_defconfig | 1 +
configs/vct_premium_small_defconfig | 1 +
configs/venice2_defconfig | 1 +
configs/ventana_defconfig | 1 +
configs/vexpress_aemv8a_juno_defconfig | 1 +
configs/vexpress_aemv8a_semi_defconfig | 1 +
configs/vision2_defconfig | 1 +
configs/vl_ma2sc_defconfig | 1 +
configs/vpac270_nor_128_defconfig | 1 +
configs/vpac270_nor_256_defconfig | 1 +
configs/vpac270_ond_256_defconfig | 1 +
configs/whistler_defconfig | 1 +
configs/wireless_space_defconfig | 1 +
configs/woodburn_defconfig | 1 +
configs/woodburn_sd_defconfig | 1 +
configs/x600_defconfig | 1 +
configs/xilinx-ppc405-generic_defconfig | 1 +
configs/xilinx-ppc440-generic_defconfig | 1 +
configs/xilinx_zynqmp_ep_defconfig | 2 ++
configs/zipitz2_defconfig | 1 +
configs/zmx25_defconfig | 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/M5282EVB.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/MPC8349ITX.h | 6 ------
include/configs/PATI.h | 1 -
include/configs/T102xQDS.h | 1 -
include/configs/T102xRDB.h | 1 -
include/configs/UCP1020.h | 1 -
include/configs/VCMA9.h | 1 -
include/configs/ac14xx.h | 1 -
include/configs/adp-ag101.h | 1 -
include/configs/adp-ag101p.h | 1 -
include/configs/adp-ag102.h | 1 -
include/configs/am3517_crane.h | 3 ---
include/configs/am3517_evm.h | 3 ---
include/configs/amcore.h | 1 -
include/configs/apalis_t30.h | 1 -
include/configs/apf27.h | 1 -
include/configs/arcangel4.h | 1 -
include/configs/arndale.h | 1 -
include/configs/astro_mcf5373l.h | 2 --
include/configs/at91-sama5_common.h | 1 -
include/configs/at91rm9200ek.h | 1 -
include/configs/at91sam9260ek.h | 1 -
include/configs/at91sam9261ek.h | 1 -
include/configs/at91sam9263ek.h | 1 -
include/configs/at91sam9m10g45ek.h | 1 -
include/configs/at91sam9n12ek.h | 1 -
include/configs/at91sam9rlek.h | 1 -
include/configs/at91sam9x5ek.h | 1 -
include/configs/atngw100.h | 1 -
include/configs/atngw100mkii.h | 1 -
include/configs/atstk1002.h | 1 -
include/configs/axs101.h | 1 -
include/configs/balloon3.h | 1 +
include/configs/beaver.h | 1 -
include/configs/bf537-minotaur.h | 1 -
include/configs/bf537-srv1.h | 1 -
include/configs/bf561-acvilon.h | 1 -
include/configs/br4.h | 1 -
include/configs/bur_am335x_common.h | 1 -
include/configs/calimain.h | 1 -
include/configs/cam_enc_4xx.h | 1 -
include/configs/cardhu.h | 1 -
include/configs/cm_fx6.h | 1 -
include/configs/cm_t335.h | 3 ---
include/configs/cm_t35.h | 1 -
include/configs/cm_t3517.h | 1 -
include/configs/cm_t54.h | 2 --
include/configs/cobra5272.h | 2 --
include/configs/colibri_pxa270.h | 1 +
include/configs/colibri_t20.h | 1 -
include/configs/colibri_t30.h | 1 -
include/configs/colibri_vf.h | 1 -
include/configs/corvus.h | 1 -
include/configs/cpu9260.h | 5 -----
include/configs/cpuat91.h | 1 -
include/configs/da830evm.h | 1 -
include/configs/da850evm.h | 1 -
include/configs/dalmore.h | 1 -
include/configs/davinci_dm355evm.h | 1 -
include/configs/davinci_dm355leopard.h | 1 -
include/configs/davinci_dm365evm.h | 1 -
include/configs/davinci_dm6467evm.h | 1 -
include/configs/davinci_dvevm.h | 1 -
include/configs/davinci_schmoogie.h | 1 -
include/configs/davinci_sffsdr.h | 1 -
include/configs/davinci_sonata.h | 1 -
include/configs/dbau1x00.h | 2 --
include/configs/dig297.h | 1 -
include/configs/dockstar.h | 3 ---
include/configs/duovero.h | 3 ---
include/configs/ea20.h | 1 -
include/configs/eb_cpu5282.h | 1 -
include/configs/eb_cpux9k2.h | 1 -
include/configs/eco5pk.h | 6 ------
include/configs/edb93xx.h | 2 +-
include/configs/edminiv2.h | 1 -
include/configs/ethernut5.h | 1 -
include/configs/flea3.h | 1 -
include/configs/fx12mm.h | 1 -
include/configs/goflexhome.h | 3 ---
include/configs/grasshopper.h | 1 -
include/configs/gw_ventana.h | 1 -
include/configs/h2200.h | 1 -
include/configs/harmony.h | 1 -
include/configs/hrcon.h | 1 -
include/configs/ib62x0.h | 3 ---
include/configs/iconnect.h | 3 ---
include/configs/ima3-mx53.h | 1 -
include/configs/imx31_litekit.h | 1 -
include/configs/imx31_phycore.h | 1 -
include/configs/integratorap.h | 5 -----
include/configs/integratorcp.h | 2 --
include/configs/ipam390.h | 1 -
include/configs/jetson-tk1.h | 1 -
include/configs/jornada.h | 1 -
include/configs/kzm9g.h | 1 -
include/configs/lp8x4x.h | 1 +
include/configs/ls2085a_common.h | 1 -
include/configs/lsxl.h | 1 -
include/configs/malta.h | 1 +
include/configs/mcx.h | 3 ---
include/configs/medcom-wide.h | 1 -
include/configs/microblaze-generic.h | 2 --
include/configs/ml507.h | 1 -
include/configs/mt_ventoux.h | 6 ------
include/configs/mv-common.h | 1 -
include/configs/mx51_efikamx.h | 1 -
include/configs/mx6ul_14x14_evk.h | 1 -
include/configs/nas220.h | 4 ----
include/configs/nhk8815.h | 1 -
include/configs/nokia_rx51.h | 1 -
include/configs/nyan-big.h | 1 -
include/configs/odroid.h | 3 ---
include/configs/odroid_xu3.h | 1 -
include/configs/odroid_xu3.h.rej | 10 ++++++++++
include/configs/omap3_cairo.h | 4 ----
include/configs/omap3_evm_common.h | 1 -
include/configs/omap3_logic.h | 1 -
include/configs/omap3_mvblx.h | 1 -
include/configs/omap3_overo.h | 6 ------
include/configs/omap3_pandora.h | 6 ------
include/configs/omap3_sdp3430.h | 1 -
include/configs/omapl138_lcdk.h | 1 -
include/configs/origen.h | 3 ---
include/configs/palmld.h | 3 ---
include/configs/palmtc.h | 3 ---
include/configs/palmtreo680.h | 1 +
include/configs/paz00.h | 1 -
include/configs/pb1x00.h | 1 -
include/configs/pcm030.h | 1 -
include/configs/peach-pi.h | 1 -
include/configs/peach-pit.h | 1 -
include/configs/pepper.h | 3 ---
include/configs/platinum_picon.h | 2 --
include/configs/platinum_titanium.h | 2 --
include/configs/plutux.h | 1 -
include/configs/pm9261.h | 1 -
include/configs/pm9263.h | 1 -
include/configs/pm9g45.h | 1 -
include/configs/pogo_e02.h | 4 ----
include/configs/pr1.h | 1 -
include/configs/pxa255_idp.h | 1 +
include/configs/qemu-mips.h | 1 +
include/configs/qemu-mips64.h | 1 +
include/configs/rpi-common.h | 1 -
include/configs/s5p_goni.h | 1 -
include/configs/s5pc210_universal.h | 3 ---
include/configs/scb9328.h | 1 -
include/configs/seaboard.h | 1 -
include/configs/secomx6quq7.h | 3 ---
include/configs/siemens-am33x-common.h | 1 -
include/configs/smartweb.h | 1 -
include/configs/smdk2410.h | 1 -
include/configs/smdk5250.h | 1 -
include/configs/smdk5420.h | 1 -
include/configs/smdkc100.h | 1 -
include/configs/smdkv310.h | 1 -
include/configs/snapper9260.h | 1 -
include/configs/sniper.h | 1 -
include/configs/snow.h | 1 -
include/configs/snowball.h | 1 -
include/configs/spear-common.h | 1 -
include/configs/spring.h | 1 -
include/configs/stamp9g20.h | 1 -
include/configs/stm32f429-discovery.h | 1 -
include/configs/stv0991.h | 1 -
include/configs/stxgp3.h | 1 -
include/configs/stxssa.h | 1 -
include/configs/sunxi-common.h | 2 --
include/configs/tao3530.h | 1 -
include/configs/taurus.h | 1 -
include/configs/tb100.h | 1 -
include/configs/tbs2910.h | 1 -
include/configs/tec-ng.h | 1 -
include/configs/tec.h | 1 -
include/configs/tegra-common.h | 4 ----
include/configs/ti814x_evm.h | 1 -
include/configs/ti816x_evm.h | 1 -
include/configs/ti_armv7_common.h | 1 -
include/configs/titanium.h | 3 ---
include/configs/trats.h | 2 --
include/configs/trats2.h | 3 ---
include/configs/tricorder.h | 1 -
include/configs/trimslice.h | 1 -
include/configs/trizepsiv.h | 1 +
include/configs/tt01.h | 1 -
include/configs/twister.h | 2 --
include/configs/u8500_href.h | 1 -
include/configs/usb_a9263.h | 1 -
include/configs/v5fx30teval.h | 1 -
include/configs/vct.h | 1 -
include/configs/venice2.h | 1 -
include/configs/ventana.h | 1 -
include/configs/versatile.h | 1 +
include/configs/vexpress_aemv8a.h | 1 -
include/configs/vexpress_common.h | 1 -
include/configs/vision2.h | 1 -
include/configs/vl_ma2sc.h | 1 -
include/configs/vpac270.h | 1 -
include/configs/whistler.h | 1 -
include/configs/wireless_space.h | 2 --
include/configs/woodburn_common.h | 1 -
include/configs/x600.h | 1 -
include/configs/xaeniax.h | 2 +-
include/configs/xilinx-ppc405-generic.h | 1 -
include/configs/xilinx-ppc440-generic.h | 1 -
include/configs/xilinx_zynqmp.h | 1 -
include/configs/zipitz2.h | 3 ---
include/configs/zmx25.h | 1 -
include/configs/zynq-common.h | 1 -
517 files changed, 323 insertions(+), 307 deletions(-)
create mode 100644 include/configs/odroid_xu3.h.rej
diff --git a/common/Kconfig b/common/Kconfig
index 40cd69ed708..88dc0160796 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -17,6 +17,13 @@ config SYS_HUSH_PARSER
help
Backward compatibility.
+config SYS_PROMPT
+ string "Shell prompt"
+ default "=> "
+ help
+ This string is displayed in the command line to the left of the
+ cursor.
+
menu "Autoboot options"
config AUTOBOOT_KEYED
diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
index 58de96b08c8..6a461945678 100644
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M5208EVBE=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig
index 6a2d175336e..608edc5acfe 100644
--- a/configs/M52277EVB_defconfig
+++ b/configs/M52277EVB_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000"
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
index 3292cff57a8..e9c2b7cd089 100644
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFE00000"
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
index 23d54686bfe..6ad4e13329e 100644
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_M5272C3=y
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig
index f051bf12955..b29021bb5d9 100644
--- a/configs/M5275EVB_defconfig
+++ b/configs/M5275EVB_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_M5275EVB=y
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig
index 6c130e818b0..322ee9ab225 100644
--- a/configs/M5282EVB_defconfig
+++ b/configs/M5282EVB_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_M5282EVB=y
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index 1f5bc86519c..3e722904327 100644
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -1,3 +1,4 @@
CONFIG_M68K=y
CONFIG_TARGET_M53017EVB=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index 02af3a43aa6..1d2bb818778 100644
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
CONFIG_TARGET_M5329EVB=y
CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=0"
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index f757a352365..915734c412d 100644
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
CONFIG_TARGET_M5329EVB=y
CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index 304ca48b835..eb7a96a47a3 100644
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -2,3 +2,4 @@ CONFIG_M68K=y
CONFIG_TARGET_M5373EVB=y
CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig
index 9a93b3b16df..a5c35d1f2ba 100644
--- a/configs/M54418TWR_defconfig
+++ b/configs/M54418TWR_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_IN
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig
index c194ea742e7..20eadcf5740 100644
--- a/configs/M54418TWR_nand_mii_defconfig
+++ b/configs/M54418TWR_nand_mii_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSR
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_nand_rmii_defconfig b/configs/M54418TWR_nand_rmii_defconfig
index 4ee35ff7c01..d47127c14a9 100644
--- a/configs/M54418TWR_nand_rmii_defconfig
+++ b/configs/M54418TWR_nand_rmii_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSR
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_nand_rmii_lowfreq_defconfig b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
index 4c4b70adec8..700745d1cb1 100644
--- a/configs/M54418TWR_nand_rmii_lowfreq_defconfig
+++ b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E00000,SYS_
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig
index 3be102c45e9..44500848f0c 100644
--- a/configs/M54418TWR_serial_mii_defconfig
+++ b/configs/M54418TWR_serial_mii_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_IN
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig
index 9a93b3b16df..a5c35d1f2ba 100644
--- a/configs/M54418TWR_serial_rmii_defconfig
+++ b/configs/M54418TWR_serial_rmii_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_IN
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig
index b35bb81ce22..0b446b8afa8 100644
--- a/configs/M54451EVB_defconfig
+++ b/configs/M54451EVB_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig
index cb56586471b..c7a01644c25 100644
--- a/configs/M54455EVB_defconfig
+++ b/configs/M54455EVB_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKS
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="-> "
diff --git a/configs/M5475AFE_defconfig b/configs/M5475AFE_defconfig
index 343f52f3a6d..b29d1a6a563 100644
--- a/configs/M5475AFE_defconfig
+++ b/configs/M5475AFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5475BFE_defconfig b/configs/M5475BFE_defconfig
index c9667da172b..e62fbf610e8 100644
--- a/configs/M5475BFE_defconfig
+++ b/configs/M5475BFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5475CFE_defconfig b/configs/M5475CFE_defconfig
index c1a9558c42f..195b4e30e12 100644
--- a/configs/M5475CFE_defconfig
+++ b/configs/M5475CFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5475DFE_defconfig b/configs/M5475DFE_defconfig
index d879894e0b2..314ced6c3ad 100644
--- a/configs/M5475DFE_defconfig
+++ b/configs/M5475DFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5475EFE_defconfig b/configs/M5475EFE_defconfig
index 9b677ee88d2..279808f45e5 100644
--- a/configs/M5475EFE_defconfig
+++ b/configs/M5475EFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5475FFE_defconfig b/configs/M5475FFE_defconfig
index 4989b00ac69..a00100e24c0 100644
--- a/configs/M5475FFE_defconfig
+++ b/configs/M5475FFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5475GFE_defconfig b/configs/M5475GFE_defconfig
index 31df40e6395..1ea82a7ccfd 100644
--- a/configs/M5475GFE_defconfig
+++ b/configs/M5475GFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5485AFE_defconfig b/configs/M5485AFE_defconfig
index 5381b74463f..70cfa8fc56e 100644
--- a/configs/M5485AFE_defconfig
+++ b/configs/M5485AFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5485BFE_defconfig b/configs/M5485BFE_defconfig
index 36dcccf1ac9..377b87fea44 100644
--- a/configs/M5485BFE_defconfig
+++ b/configs/M5485BFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5485CFE_defconfig b/configs/M5485CFE_defconfig
index e5cc1e13ff5..faa01961019 100644
--- a/configs/M5485CFE_defconfig
+++ b/configs/M5485CFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5485DFE_defconfig b/configs/M5485DFE_defconfig
index fdf667a7e89..71a028fe7fb 100644
--- a/configs/M5485DFE_defconfig
+++ b/configs/M5485DFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5485EFE_defconfig b/configs/M5485EFE_defconfig
index a5933f2516a..784803e87d0 100644
--- a/configs/M5485EFE_defconfig
+++ b/configs/M5485EFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5485FFE_defconfig b/configs/M5485FFE_defconfig
index 116c5cca8c3..8a831e35e65 100644
--- a/configs/M5485FFE_defconfig
+++ b/configs/M5485FFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5485GFE_defconfig b/configs/M5485GFE_defconfig
index fd5fc1a85be..00c7479c377 100644
--- a/configs/M5485GFE_defconfig
+++ b/configs/M5485GFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/M5485HFE_defconfig b/configs/M5485HFE_defconfig
index 6e2768c08ce..887bd4d9151 100644
--- a/configs/M5485HFE_defconfig
+++ b/configs/M5485HFE_defconfig
@@ -2,3 +2,4 @@ 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="-> "
diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
index 7a43fa084c6..4578b32ebef 100644
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -3,3 +3,4 @@ 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> "
diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
index f74d42c69e3..c5fbeb90e1a 100644
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/configs/MPC8349ITX_LOWBOOT_defconfig
@@ -3,3 +3,4 @@ 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> "
diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig
index 84c117cd9ee..a895c53ab04 100644
--- a/configs/MPC8349ITX_defconfig
+++ b/configs/MPC8349ITX_defconfig
@@ -3,3 +3,4 @@ CONFIG_MPC83xx=y
CONFIG_TARGET_MPC8349ITX=y
CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX"
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="MPC8349E-mITX> "
diff --git a/configs/PATI_defconfig b/configs/PATI_defconfig
index da8525e5ab9..6c1bf172f67 100644
--- a/configs/PATI_defconfig
+++ b/configs/PATI_defconfig
@@ -13,3 +13,4 @@ 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=> "
diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig
index 010b15f767d..cada7bb9458 100644
--- a/configs/UCP1020_defconfig
+++ b/configs/UCP1020_defconfig
@@ -5,3 +5,4 @@ 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$ "
diff --git a/configs/VCMA9_defconfig b/configs/VCMA9_defconfig
index 8885f1a97ec..e9b28a8ade8 100644
--- a/configs/VCMA9_defconfig
+++ b/configs/VCMA9_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_VCMA9=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="VCMA9 # "
diff --git a/configs/ac14xx_defconfig b/configs/ac14xx_defconfig
index 37fb0e0ec7f..238630e63ea 100644
--- a/configs/ac14xx_defconfig
+++ b/configs/ac14xx_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC512X=y
CONFIG_TARGET_AC14XX=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="ac14xx> "
diff --git a/configs/adp-ag101_defconfig b/configs/adp-ag101_defconfig
index e550f71ebb8..ac1dcaa3f28 100644
--- a/configs/adp-ag101_defconfig
+++ b/configs/adp-ag101_defconfig
@@ -1,3 +1,4 @@
CONFIG_NDS32=y
CONFIG_TARGET_ADP_AG101=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="NDS32 # "
diff --git a/configs/adp-ag101p_defconfig b/configs/adp-ag101p_defconfig
index 740cb57df01..92aa0bec467 100644
--- a/configs/adp-ag101p_defconfig
+++ b/configs/adp-ag101p_defconfig
@@ -1,3 +1,4 @@
CONFIG_NDS32=y
CONFIG_TARGET_ADP_AG101P=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="NDS32 # "
diff --git a/configs/adp-ag102_defconfig b/configs/adp-ag102_defconfig
index 721f61d7f98..1bef3509464 100644
--- a/configs/adp-ag102_defconfig
+++ b/configs/adp-ag102_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_ADP_AG102=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="NDS32 # "
diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig
index a44ffe74a48..806dc3a0416 100644
--- a/configs/am3517_crane_defconfig
+++ b/configs/am3517_crane_defconfig
@@ -9,3 +9,4 @@ 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 # "
diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index c72d29e5d34..95b67545fe8 100644
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -8,3 +8,4 @@ CONFIG_FIT=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="AM3517_EVM # "
diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig
index 47c4f3d21f8..dc16d5bb1d7 100644
--- a/configs/amcore_defconfig
+++ b/configs/amcore_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_AMCORE=y
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="amcore $ "
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index fa9f3656539..c0bc3c5c067 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -12,3 +12,4 @@ CONFIG_SPL_DM=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Apalis T30 # "
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index 854a2b7450b..4503235c128 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_APF27=y
CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
+CONFIG_SYS_PROMPT="BIOS> "
diff --git a/configs/arcangel4_defconfig b/configs/arcangel4_defconfig
index 5683b81ab49..cd9aafdb300 100644
--- a/configs/arcangel4_defconfig
+++ b/configs/arcangel4_defconfig
@@ -11,3 +11,4 @@ CONFIG_OF_EMBED=y
CONFIG_DM=y
CONFIG_DM_SERIAL=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="arcangel4# "
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index ebac9ad4059..1f94ff0ee96 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -15,3 +15,4 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y
+CONFIG_SYS_PROMPT="ARNDALE # "
diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index f394f4df57e..867612070af 100644
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_ASTRO_MCF5373L=y
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="URMEL > "
diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig
index 74d4f3a748a..10df5f8d1d2 100644
--- a/configs/at91rm9200ek_defconfig
+++ b/configs/at91rm9200ek_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_AT91RM9200EK=y
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig
index f499453ed15..2765e9dc6ac 100644
--- a/configs/at91rm9200ek_ram_defconfig
+++ b/configs/at91rm9200ek_ram_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_AT91RM9200EK=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index 96c5eeef337..9909bc8d38e 100644
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index 6330c3e4820..8fdbd882327 100644
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
index ae2defd0294..e4fc8d705e1 100644
--- a/configs/at91sam9260ek_nandflash_defconfig
+++ b/configs/at91sam9260ek_nandflash_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index 838b235fe3b..e182f7065d2 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index 61044794797..b3a35dd04ec 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index 4015c9f02a0..58aa38f3cb3 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index d9003ff94bb..82e1b862206 100644
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index d9003ff94bb..82e1b862206 100644
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
index 600c5dd4fa5..bac882eec8b 100644
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index 2e34b79c1bd..75f0ec6f1de 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index f72ed85a9e1..5bcdab055e9 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
index 5f8d8031d34..80e6a8a7f3a 100644
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
index 3ed763ecf51..e6c9f61e007 100644
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig
index c27e39ae7a4..0adaf11325b 100644
--- a/configs/at91sam9g10ek_nandflash_defconfig
+++ b/configs/at91sam9g10ek_nandflash_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
index d58de8eee37..40cd6b1ca7a 100644
--- a/configs/at91sam9g20ek_2mmc_defconfig
+++ b/configs/at91sam9g20ek_2mmc_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
index 4b2883921d2..6f593050d5c 100644
--- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
+++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index ee86dad1ae8..b63c6d659c3 100644
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index 39d4b0970e0..aad9c1ec988 100644
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
index d636485140c..f24708471ba 100644
--- a/configs/at91sam9g20ek_nandflash_defconfig
+++ b/configs/at91sam9g20ek_nandflash_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig
index 1472d20ecf3..f88b48b6dce 100644
--- a/configs/at91sam9m10g45ek_mmc_defconfig
+++ b/configs/at91sam9m10g45ek_mmc_defconfig
@@ -10,3 +10,4 @@ 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> "
diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig
index 526419cac0c..7675f524103 100644
--- a/configs/at91sam9m10g45ek_nandflash_defconfig
+++ b/configs/at91sam9m10g45ek_nandflash_defconfig
@@ -10,3 +10,4 @@ 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> "
diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
index c549baf39b9..1702a32788a 100644
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC"
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
index 756db2a7e06..9f87469cd34 100644
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH"
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
index 0430de9bd1c..a7d05810a02 100644
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH"
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
index c555caaed62..ed2f5d2c467 100644
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -12,3 +12,4 @@ 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> "
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig
index 5cb565574c2..760cf9299fe 100644
--- a/configs/at91sam9rlek_mmc_defconfig
+++ b/configs/at91sam9rlek_mmc_defconfig
@@ -12,3 +12,4 @@ 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> "
diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig
index 3e3528efb13..191a26133fc 100644
--- a/configs/at91sam9rlek_nandflash_defconfig
+++ b/configs/at91sam9rlek_nandflash_defconfig
@@ -12,3 +12,4 @@ 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> "
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index c757fc4efef..38607d00eb1 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index 82e67f3bf32..87766270777 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index b45d8d0cf55..cedc56008c1 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index f33a2fd1e4a..38963002940 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index 585d564beac..fbdb564bb4b 100644
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index 1c38777a779..4f0cc119665 100644
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
index 5e9a08000b8..3dde55c324c 100644
--- a/configs/at91sam9xeek_nandflash_defconfig
+++ b/configs/at91sam9xeek_nandflash_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 0f5be564479..51facf72e63 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -9,3 +9,4 @@ 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> "
diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig
index b4d8d1c143c..b7099f5c810 100644
--- a/configs/atngw100mkii_defconfig
+++ b/configs/atngw100mkii_defconfig
@@ -8,3 +8,4 @@ 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> "
diff --git a/configs/atstk1002_defconfig b/configs/atstk1002_defconfig
index bb0406e1ab8..78e22561510 100644
--- a/configs/atstk1002_defconfig
+++ b/configs/atstk1002_defconfig
@@ -8,3 +8,4 @@ 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> "
diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig
index 04aec0b095a..9a6cef3670a 100644
--- a/configs/axs101_defconfig
+++ b/configs/axs101_defconfig
@@ -10,3 +10,4 @@ CONFIG_SYS_TEXT_BASE=0x81000000
CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="AXS# "
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index ad74b85f351..02e19d29bc5 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra30 (Beaver) # "
diff --git a/configs/bf537-minotaur_defconfig b/configs/bf537-minotaur_defconfig
index 57e9a246b0d..212f2bb41fb 100644
--- a/configs/bf537-minotaur_defconfig
+++ b/configs/bf537-minotaur_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_BF537_MINOTAUR=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="minotaur> "
diff --git a/configs/bf537-srv1_defconfig b/configs/bf537-srv1_defconfig
index 51022d80d9e..52abf999806 100644
--- a/configs/bf537-srv1_defconfig
+++ b/configs/bf537-srv1_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_BF537_SRV1=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="srv1> "
diff --git a/configs/bf561-acvilon_defconfig b/configs/bf561-acvilon_defconfig
index 897e44f5ac6..14099011732 100644
--- a/configs/bf561-acvilon_defconfig
+++ b/configs/bf561-acvilon_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_BF561_ACVILON=y
CONFIG_SPI_FLASH=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
CONFIG_LIB_RAND=y
+CONFIG_SYS_PROMPT="Acvilon> "
diff --git a/configs/br4_defconfig b/configs/br4_defconfig
index b129899e8bf..540dbef3dcc 100644
--- a/configs/br4_defconfig
+++ b/configs/br4_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_BR4=y
CONFIG_SPI_FLASH=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
CONFIG_LIB_RAND=y
+CONFIG_SYS_PROMPT="br4>"
diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index b837de32a42..756457c26e4 100644
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_NET is not set
+CONFIG_SYS_PROMPT="Cairo # "
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index 35f73e3f883..4d952cdafe6 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_CALIMAIN=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_STOP_STR="\x0b"
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Calimain > "
diff --git a/configs/cam_enc_4xx_defconfig b/configs/cam_enc_4xx_defconfig
index f7f6f12b93c..a67bf0ed9cc 100644
--- a/configs/cam_enc_4xx_defconfig
+++ b/configs/cam_enc_4xx_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="cam_enc_4xx> "
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index c0e98a5d709..5c298d7cf9b 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra30 (Cardhu) # "
diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig
index 6fd29a00aec..af322bcbe4b 100644
--- a/configs/cgtqmx6qeval_defconfig
+++ b/configs/cgtqmx6qeval_defconfig
@@ -7,3 +7,4 @@ CONFIG_DM_THERMAL=y
# 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 > "
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 2aba3594ea7..66fc3821553 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -30,3 +30,4 @@ CONFIG_USB_EHCI_MX6=y
CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y
CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
+CONFIG_SYS_PROMPT="CM-FX6 # "
diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
index 9ebd3270d2b..4f4bd0b55b3 100644
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CM-T335 # "
diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig
index 57b44ba5ab4..1eb4250fec9 100644
--- a/configs/cm_t3517_defconfig
+++ b/configs/cm_t3517_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_CM_T3517=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CM-T3517 # "
diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index c8dc1244f3f..99dd2f4f545 100644
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CM-T3x # "
diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig
index af7c880143b..fc72ffa78e7 100644
--- a/configs/cm_t54_defconfig
+++ b/configs/cm_t54_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="CM-T54 # "
diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig
index 2ccb80c6f91..77ad34d8fa6 100644
--- a/configs/cobra5272_defconfig
+++ b/configs/cobra5272_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_COBRA5272=y
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="COBRA > "
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 4e1369bcf7f..0d28b062bae 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -12,3 +12,4 @@ CONFIG_SPL_DM=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Colibri T20 # "
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 45cf20aebdb..d1ed09d17f2 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -12,3 +12,4 @@ CONFIG_SPL_DM=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Colibri T30 # "
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index ffb3b4fd859..74af563d940 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_I
CONFIG_DM=y
CONFIG_NAND_VF610_NFC=y
CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
+CONFIG_SYS_PROMPT="Colibri VFxx # "
diff --git a/configs/colibri_vf_dtb_defconfig b/configs/colibri_vf_dtb_defconfig
index 49f2105c0cc..54c3f2d9ea4 100644
--- a/configs/colibri_vf_dtb_defconfig
+++ b/configs/colibri_vf_dtb_defconfig
@@ -9,3 +9,4 @@ 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 # "
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 13afb0857a4..1fed14e7c5a 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/cpu9260_128M_defconfig b/configs/cpu9260_128M_defconfig
index f423980c4ec..187fcedaa1a 100644
--- a/configs/cpu9260_128M_defconfig
+++ b/configs/cpu9260_128M_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9260=> "
diff --git a/configs/cpu9260_defconfig b/configs/cpu9260_defconfig
index 88afe9fff5a..4b50505311c 100644
--- a/configs/cpu9260_defconfig
+++ b/configs/cpu9260_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9260=> "
diff --git a/configs/cpu9260_nand_128M_defconfig b/configs/cpu9260_nand_128M_defconfig
index f59b0002ba8..797fb85d1fc 100644
--- a/configs/cpu9260_nand_128M_defconfig
+++ b/configs/cpu9260_nand_128M_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M,NANDBOOT"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9260=> "
diff --git a/configs/cpu9260_nand_defconfig b/configs/cpu9260_nand_defconfig
index e914c2b6445..8d155d065b0 100644
--- a/configs/cpu9260_nand_defconfig
+++ b/configs/cpu9260_nand_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,NANDBOOT"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9260=> "
diff --git a/configs/cpu9G20_128M_defconfig b/configs/cpu9G20_128M_defconfig
index d215cc04fb4..650c93446ed 100644
--- a/configs/cpu9G20_128M_defconfig
+++ b/configs/cpu9G20_128M_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9G20=> "
diff --git a/configs/cpu9G20_defconfig b/configs/cpu9G20_defconfig
index 51b19f0e694..997eec54f4f 100644
--- a/configs/cpu9G20_defconfig
+++ b/configs/cpu9G20_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9G20=> "
diff --git a/configs/cpu9G20_nand_128M_defconfig b/configs/cpu9G20_nand_128M_defconfig
index da4cbdd8184..6d62732eeec 100644
--- a/configs/cpu9G20_nand_128M_defconfig
+++ b/configs/cpu9G20_nand_128M_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M,NANDBOOT"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9G20=> "
diff --git a/configs/cpu9G20_nand_defconfig b/configs/cpu9G20_nand_defconfig
index b9e4b3c9901..52f916f605a 100644
--- a/configs/cpu9G20_nand_defconfig
+++ b/configs/cpu9G20_nand_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,NANDBOOT"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="CPU9G20=> "
diff --git a/configs/cpuat91_defconfig b/configs/cpuat91_defconfig
index cfc62aaa775..10b8ad2bec6 100644
--- a/configs/cpuat91_defconfig
+++ b/configs/cpuat91_defconfig
@@ -10,3 +10,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="CPUAT91=> "
diff --git a/configs/da830evm_defconfig b/configs/da830evm_defconfig
index e0c8e25b6d2..d37ede359fc 100644
--- a/configs/da830evm_defconfig
+++ b/configs/da830evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DA830EVM=y
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index 41395e3f93a..557c0d504de 100644
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index a1cba1afa0b..79b877f13b2 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_DA850EVM=y
CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index 2d802475994..bf0ee84e110 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -15,3 +15,4 @@ CONFIG_SPI_FLASH=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra114 (Dalmore) # "
diff --git a/configs/davinci_dm355evm_defconfig b/configs/davinci_dm355evm_defconfig
index f10b6437755..4513ce4c025 100644
--- a/configs/davinci_dm355evm_defconfig
+++ b/configs/davinci_dm355evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DM355EVM=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="DM355 EVM # "
diff --git a/configs/davinci_dm355leopard_defconfig b/configs/davinci_dm355leopard_defconfig
index 7b33f6df466..7945605e166 100644
--- a/configs/davinci_dm355leopard_defconfig
+++ b/configs/davinci_dm355leopard_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DM355LEOPARD=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="DM355 LEOPARD # "
diff --git a/configs/davinci_dm365evm_defconfig b/configs/davinci_dm365evm_defconfig
index f139b58c485..3550e75180f 100644
--- a/configs/davinci_dm365evm_defconfig
+++ b/configs/davinci_dm365evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DM365EVM=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="DM36x EVM # "
diff --git a/configs/davinci_dm6467evm_defconfig b/configs/davinci_dm6467evm_defconfig
index 2a5262a2d14..b2021afddc0 100644
--- a/configs/davinci_dm6467evm_defconfig
+++ b/configs/davinci_dm6467evm_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_EXTRA_OPTIONS="REFCLK_FREQ=27000000"
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="DM6467 EVM > "
diff --git a/configs/davinci_dvevm_defconfig b/configs/davinci_dvevm_defconfig
index aa30d1bcf4b..7c6f03eaf32 100644
--- a/configs/davinci_dvevm_defconfig
+++ b/configs/davinci_dvevm_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_DVEVM=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/davinci_schmoogie_defconfig b/configs/davinci_schmoogie_defconfig
index 7c11c8c16db..2fb4d9f22e8 100644
--- a/configs/davinci_schmoogie_defconfig
+++ b/configs/davinci_schmoogie_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_SCHMOOGIE=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/davinci_sffsdr_defconfig b/configs/davinci_sffsdr_defconfig
index 7aca6061aae..633b4a81850 100644
--- a/configs/davinci_sffsdr_defconfig
+++ b/configs/davinci_sffsdr_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_DAVINCI_SFFSDR=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/davinci_sonata_defconfig b/configs/davinci_sonata_defconfig
index 6014eee467f..697ce0622b0 100644
--- a/configs/davinci_sonata_defconfig
+++ b/configs/davinci_sonata_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_DAVINCI_SONATA=y
# CONFIG_CMD_BDI is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/dbau1000_defconfig b/configs/dbau1000_defconfig
index 58da5b7ba24..5dc12d27cee 100644
--- a/configs/dbau1000_defconfig
+++ b/configs/dbau1000_defconfig
@@ -10,3 +10,4 @@ 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 # "
diff --git a/configs/dbau1100_defconfig b/configs/dbau1100_defconfig
index 14aeb4c9483..522b9bcf27d 100644
--- a/configs/dbau1100_defconfig
+++ b/configs/dbau1100_defconfig
@@ -10,3 +10,4 @@ CONFIG_DBAU1100=y
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
diff --git a/configs/dbau1500_defconfig b/configs/dbau1500_defconfig
index 699b968f1e8..2fdddc725c6 100644
--- a/configs/dbau1500_defconfig
+++ b/configs/dbau1500_defconfig
@@ -10,3 +10,4 @@ CONFIG_DBAU1500=y
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
diff --git a/configs/dbau1550_defconfig b/configs/dbau1550_defconfig
index 6b17da745bc..07be3f16e40 100644
--- a/configs/dbau1550_defconfig
+++ b/configs/dbau1550_defconfig
@@ -8,3 +8,4 @@ CONFIG_DBAU1550=y
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="DbAu1xx0 # "
diff --git a/configs/dbau1550_el_defconfig b/configs/dbau1550_el_defconfig
index 845bc87834e..7bd1e0c9efd 100644
--- a/configs/dbau1550_el_defconfig
+++ b/configs/dbau1550_el_defconfig
@@ -9,3 +9,4 @@ 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 # "
diff --git a/configs/dig297_defconfig b/configs/dig297_defconfig
index 483c20e930b..4c2c9828e52 100644
--- a/configs/dig297_defconfig
+++ b/configs/dig297_defconfig
@@ -7,3 +7,4 @@ CONFIG_TARGET_DIG297=y
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="DIG297# "
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 40f6e0f5a34..e4da4664a4d 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_DOCKSTAR=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="DockStar> "
diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index 8b177b3a463..d2fc98d2a6a 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -8,3 +8,4 @@ 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# "
diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig
index 57410d3b93f..d3de28a5d57 100644
--- a/configs/duovero_defconfig
+++ b/configs/duovero_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="duovero # "
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 388dfec0c23..1d7494f8f9c 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_EA20=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="ea20 > "
diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index 1e19d3a1061..0044de62fe3 100644
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_EB_CPU5282=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400"
# CONFIG_CMD_LOADB is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="\nEB+CPU5282> "
diff --git a/configs/eb_cpux9k2_defconfig b/configs/eb_cpux9k2_defconfig
index bff65951a50..6a6f3cd2c2e 100644
--- a/configs/eb_cpux9k2_defconfig
+++ b/configs/eb_cpux9k2_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_EB_CPUX9K2=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig
index c43603b64b4..8b5874da3d0 100644
--- a/configs/eco5pk_defconfig
+++ b/configs/eco5pk_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="ECO5-PK # "
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 80ff33f467b..b2a2506a61b 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -3,3 +3,4 @@ CONFIG_ORION5X=y
CONFIG_TARGET_EDMINIV2=y
CONFIG_SPL=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="EDMiniV2> "
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index d2379ec1cb4..d97008a3f52 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig
index 7ea5da29611..c9e4a28d2cf 100644
--- a/configs/flea3_defconfig
+++ b/configs/flea3_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_FLEA3=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="flea3 U-Boot > "
diff --git a/configs/fx12mm_defconfig b/configs/fx12mm_defconfig
index 1013b70849f..02136811bc7 100644
--- a/configs/fx12mm_defconfig
+++ b/configs/fx12mm_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="FX12MM:/# "
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index d1b9ba1d4f6..059ce80d1ec 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_GOFLEXHOME=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="GoFlexHome> "
diff --git a/configs/grasshopper_defconfig b/configs/grasshopper_defconfig
index 2d9c8ade773..eefc5f2eba0 100644
--- a/configs/grasshopper_defconfig
+++ b/configs/grasshopper_defconfig
@@ -6,3 +6,4 @@ 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> "
diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 401f77e1890..d81f9416276 100644
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
# CONFIG_CMD_FLASH is not set
CONFIG_DM=y
CONFIG_DM_SERIAL=y
+CONFIG_SYS_PROMPT="Ventana > "
diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig
index f90a4a6f11b..07b1706f78a 100644
--- a/configs/h2200_defconfig
+++ b/configs/h2200_defconfig
@@ -17,3 +17,4 @@ 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="> "
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index d88a082a508..c9c0618cf93 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Harmony) # "
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index e418d8f1ad4..b3fa8900638 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_IB62X0=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="ib62x0 => "
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index 49d4fa0d208..4c342904b98 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_ICONNECT=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="iconnect => "
diff --git a/configs/ima3-mx53_defconfig b/configs/ima3-mx53_defconfig
index ef15127af6c..1f5e3a69116 100644
--- a/configs/ima3-mx53_defconfig
+++ b/configs/ima3-mx53_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_IMA3_MX53=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg"
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="IMA3 MX53 U-Boot > "
diff --git a/configs/imx31_litekit_defconfig b/configs/imx31_litekit_defconfig
index b197935bd00..f10759b8aa1 100644
--- a/configs/imx31_litekit_defconfig
+++ b/configs/imx31_litekit_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_IMX31_LITEKIT=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="uboot> "
diff --git a/configs/imx31_phycore_defconfig b/configs/imx31_phycore_defconfig
index 161a6042259..e801ee7325d 100644
--- a/configs/imx31_phycore_defconfig
+++ b/configs/imx31_phycore_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_IMX31_PHYCORE=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="uboot> "
diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig
index 369add7f73d..50c6005873f 100644
--- a/configs/integratorap_cm720t_defconfig
+++ b/configs/integratorap_cm720t_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_AP=y
CONFIG_CM720T=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-AP # "
diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig
index aa27cbdd227..ab0cdbde478 100644
--- a/configs/integratorap_cm920t_defconfig
+++ b/configs/integratorap_cm920t_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_AP=y
CONFIG_CM920T=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-AP # "
diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
index 8155b67a1ed..317c6d8a9e8 100644
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_AP=y
CONFIG_CM926EJ_S=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-AP # "
diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index b3b5edf99ba..5ce1c00dc0b 100644
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_AP=y
CONFIG_CM946ES=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-AP # "
diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index 5ab7c271b03..ddd2ce7a84a 100644
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM1136=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-CP # "
diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index d0ed78d3dd1..036b32efbff 100644
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM920T=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-CP # "
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index 9aa86029e5f..6fc2a849cca 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM926EJ_S=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-CP # "
diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index ef9d7d6c1c8..e077a5e23d8 100644
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -3,3 +3,4 @@ CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_CP=y
CONFIG_CM946ES=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Integrator-CP # "
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index c053b3898f9..c4163403109 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 44c7a8ef269..1dc26792183 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -15,3 +15,4 @@ CONFIG_SPI_FLASH=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # "
diff --git a/configs/jornada_defconfig b/configs/jornada_defconfig
index 735c75f9a4f..65cbc2a1071 100644
--- a/configs/jornada_defconfig
+++ b/configs/jornada_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_JORNADA=y
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
# CONFIG_CMD_MISC is not set
+CONFIG_SYS_PROMPT="HP Jornada# "
diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index f42288697bb..c4cbadd1513 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="K2E EVM # "
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index 297183f9212..a604939c5e8 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="K2HK EVM # "
diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index 7aa538d791b..a687e0ca652 100644
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="K2L EVM # "
diff --git a/configs/kwb_defconfig b/configs/kwb_defconfig
index 5bca8117dac..928c4bf04f5 100644
--- a/configs/kwb_defconfig
+++ b/configs/kwb_defconfig
@@ -14,3 +14,4 @@ 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)# "
diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index 3df79d4ccbd..0669bbcdc1a 100644
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
CONFIG_RMOBILE=y
CONFIG_TARGET_KZM9G=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="KZM-A9-GT# "
diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index 1d3e978391a..1f38640a812 100644
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="mcx # "
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index bb3354287cc..c0ba9d193d1 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Medcom-Wide) # "
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 8355c67c269..5de1bcd89a8 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_OF_EMBED=y
+CONFIG_SYS_PROMPT="U-Boot-mONStR> "
diff --git a/configs/ml507_defconfig b/configs/ml507_defconfig
index 3f66c860677..44b7c31b7cb 100644
--- a/configs/ml507_defconfig
+++ b/configs/ml507_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="ml507:/# "
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 0a6b7d61498..d5d26cf297a 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="mt_ventoux => "
diff --git a/configs/mx51_efikamx_defconfig b/configs/mx51_efikamx_defconfig
index 9c0deb137f4..a88c2230646 100644
--- a/configs/mx51_efikamx_defconfig
+++ b/configs/mx51_efikamx_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/gene
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="Efika> "
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 47e59114c2e..257c30586aa 100644
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_NAS220=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="nas220> "
diff --git a/configs/nhk8815_defconfig b/configs/nhk8815_defconfig
index f9fac6f05d1..218d92a6ca5 100644
--- a/configs/nhk8815_defconfig
+++ b/configs/nhk8815_defconfig
@@ -4,3 +4,4 @@ CONFIG_NOMADIK_NHK8815=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Nomadik> "
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index c40dadfde58..3dd24e03133 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -10,3 +10,4 @@ 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 # "
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index ccf656b2896..44bae73e982 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -21,3 +21,4 @@ CONFIG_VIDEO_TEGRA124=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra124 (Nyan-big) # "
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 155ce390610..f0facf3965a 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -13,3 +13,4 @@ CONFIG_DM_I2C_COMPAT=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
CONFIG_VIDEO_BRIDGE=y
+CONFIG_SYS_PROMPT="ODROID-XU3 # "
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index 3104f883e9e..0a4f63b6e0d 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -21,3 +21,4 @@ CONFIG_DM_REGULATOR_MAX77686=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_ERRNO_STR=y
+CONFIG_SYS_PROMPT="Odroid # "
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 65b6f6a9c6c..de8fbd928b1 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="OMAP3_EVM # "
diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig
index 527b465aa80..7d15b1613e3 100644
--- a/configs/omap3_evm_quick_mmc_defconfig
+++ b/configs/omap3_evm_quick_mmc_defconfig
@@ -23,3 +23,4 @@ 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 # "
diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig
index e3278b5f2ca..cd30134f9cc 100644
--- a/configs/omap3_evm_quick_nand_defconfig
+++ b/configs/omap3_evm_quick_nand_defconfig
@@ -23,3 +23,4 @@ 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 # "
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index b11d2e42da4..5d0ac9e576d 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -5,3 +5,4 @@ CONFIG_TARGET_OMAP3_LOGIC=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
+CONFIG_SYS_PROMPT="OMAP Logic # "
diff --git a/configs/omap3_mvblx_defconfig b/configs/omap3_mvblx_defconfig
index 415b02ebd84..fb12a70560b 100644
--- a/configs/omap3_mvblx_defconfig
+++ b/configs/omap3_mvblx_defconfig
@@ -6,3 +6,4 @@ CONFIG_AUTOBOOT_STOP_STR="S"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="mvblx # "
diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
index 8d5559049a3..5d03485299c 100644
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -8,3 +8,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="Overo # "
diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig
index f18a520ad23..4fb7899795e 100644
--- a/configs/omap3_pandora_defconfig
+++ b/configs/omap3_pandora_defconfig
@@ -8,3 +8,4 @@ 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 # "
diff --git a/configs/omap3_sdp3430_defconfig b/configs/omap3_sdp3430_defconfig
index df9e709562a..2e46091986a 100644
--- a/configs/omap3_sdp3430_defconfig
+++ b/configs/omap3_sdp3430_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_OMAP3_SDP3430=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="OMAP34XX SDP # "
diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
index a49be95c0db..4cff178fd2b 100644
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@@ -6,3 +6,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 696197827fe..d69d497aa61 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -13,3 +13,4 @@ CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_USB=y
CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="ORIGEN # "
diff --git a/configs/palmld_defconfig b/configs/palmld_defconfig
index 8bf6c53cd60..354071ac6f1 100644
--- a/configs/palmld_defconfig
+++ b/configs/palmld_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_PALMLD=y
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/palmtc_defconfig b/configs/palmtc_defconfig
index 40424662204..de617e1804e 100644
--- a/configs/palmtc_defconfig
+++ b/configs/palmtc_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_PALMTC=y
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 60fb2d6b2be..5cba318aa9e 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Paz00) MOD # "
diff --git a/configs/pb1000_defconfig b/configs/pb1000_defconfig
index 72756a74fa0..c6221a38cc7 100644
--- a/configs/pb1000_defconfig
+++ b/configs/pb1000_defconfig
@@ -10,3 +10,4 @@ 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 # "
diff --git a/configs/pcm030_defconfig b/configs/pcm030_defconfig
index df9309e191f..63050921107 100644
--- a/configs/pcm030_defconfig
+++ b/configs/pcm030_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC5xxx=y
CONFIG_TARGET_PCM030=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="uboot> "
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index 86d5a0bc548..a02e2ed3bbf 100644
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -31,3 +31,4 @@ CONFIG_CMD_REGULATOR=y
CONFIG_ERRNO_STR=y
CONFIG_VIDEO_BRIDGE=y
CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
+CONFIG_SYS_PROMPT="Peach-Pi # "
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 8fe423efb1e..e9fc6aef1cc 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -31,3 +31,4 @@ CONFIG_CMD_REGULATOR=y
CONFIG_ERRNO_STR=y
CONFIG_VIDEO_BRIDGE=y
CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
+CONFIG_SYS_PROMPT="Peach-Pit # "
diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig
index eb1b6cf297a..787c5f95f03 100644
--- a/configs/pepper_defconfig
+++ b/configs/pepper_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="pepper# "
diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
index 3484c4628f7..64da7c449b2 100644
--- a/configs/platinum_picon_defconfig
+++ b/configs/platinum_picon_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="picon > "
diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
index 6a2cacf61ee..67957c38305 100644
--- a/configs/platinum_titanium_defconfig
+++ b/configs/platinum_titanium_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="titanium > "
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 8d96e33df9c..07fa7f9a979 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Plutux) # "
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index 2c842b4bebd..0a7716eb3eb 100644
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="pm9261> "
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index a065ce033dc..45e060bde66 100644
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263"
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="u-boot-pm9263> "
diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig
index bbaeae885a4..3f34b3cbacb 100644
--- a/configs/pm9g45_defconfig
+++ b/configs/pm9g45_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45"
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index f21237fa488..50a058e0f24 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_POGO_E02=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="PogoE02> "
diff --git a/configs/pr1_defconfig b/configs/pr1_defconfig
index b06babccc86..583f132042e 100644
--- a/configs/pr1_defconfig
+++ b/configs/pr1_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_PR1=y
CONFIG_SPI_FLASH=y
CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
CONFIG_LIB_RAND=y
+CONFIG_SYS_PROMPT="pr1>"
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 0bb42ff4f2a..41c28490255 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -8,3 +8,4 @@ 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# "
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 2b126acbc6c..7a3ac701bb3 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -8,3 +8,4 @@ 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# "
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 139189dd033..4b920454eeb 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_RPI_2=y
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_PHYS_TO_BUS=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index db8da684ce8..195ff99d42d 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_RPI=y
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_PHYS_TO_BUS=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index da9dfe3fd21..774957c739b 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -8,3 +8,4 @@ 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# "
diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
index 7e03b9d9464..5c873f779cb 100644
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -10,3 +10,4 @@ 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 # "
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 21a470873a3..1a49978c70f 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -12,3 +12,4 @@ CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_USB=y
CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="Universal # "
diff --git a/configs/scb9328_defconfig b/configs/scb9328_defconfig
index 3104586cf60..c9c50348083 100644
--- a/configs/scb9328_defconfig
+++ b/configs/scb9328_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SCB9328=y
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_SOURCE is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="scb9328> "
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 942f17eb548..54afbdbca71 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # "
diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig
index 0095cebb6f7..c97172d2c0a 100644
--- a/configs/secomx6quq7_defconfig
+++ b/configs/secomx6quq7_defconfig
@@ -7,3 +7,4 @@ CONFIG_SECOMX6_2GB=y
CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
+CONFIG_SYS_PROMPT="SECO MX6Q uQ7 U-Boot > "
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index 08e89a0114f..8f12f3076b9 100644
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_SMARTWEB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
CONFIG_CMD_NET=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/smdk2410_defconfig b/configs/smdk2410_defconfig
index 74bb9e3a66b..51f348e23ba 100644
--- a/configs/smdk2410_defconfig
+++ b/configs/smdk2410_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_SMDK2410=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="SMDK2410 # "
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index b061e4789d3..f0c9e01a5de 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -24,3 +24,4 @@ CONFIG_ERRNO_STR=y
CONFIG_DM_PMIC_MAX77686=y
CONFIG_DM_REGULATOR_MAX77686=y
CONFIG_VIDEO_BRIDGE=y
+CONFIG_SYS_PROMPT="SMDK5250 # "
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index 1561f6a5983..253fbe51943 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -14,3 +14,4 @@ CONFIG_DM_I2C_COMPAT=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
CONFIG_VIDEO_BRIDGE=y
+CONFIG_SYS_PROMPT="SMDK5420 # "
diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index 6c8359e9f5d..676781e2f69 100644
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -5,3 +5,4 @@ CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="SMDKC100 # "
diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig
index 39dd5be6e06..7833f62b9d0 100644
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@ -10,3 +10,4 @@ CONFIG_SPL=y
# CONFIG_CMD_MISC is not set
CONFIG_USB=y
CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="SMDKV310 # "
diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index d319a4f671a..31cc5a0b23c 100644
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -10,3 +10,4 @@ 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> "
diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
index 44cf3595b3a..dd66ca0be86 100644
--- a/configs/sniper_defconfig
+++ b/configs/sniper_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FPGA is not set
CONFIG_USB=y
CONFIG_USB_MUSB_GADGET=y
+CONFIG_SYS_PROMPT="Sniper # "
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index a7d9e7a0dbf..4a90f0a0656 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -41,3 +41,4 @@ CONFIG_REGULATOR_S5M8767=y
CONFIG_VIDEO_BRIDGE=y
CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y
+CONFIG_SYS_PROMPT="snow # "
diff --git a/configs/snowball_defconfig b/configs/snowball_defconfig
index 31aa58334c8..e73bc48af11 100644
--- a/configs/snowball_defconfig
+++ b/configs/snowball_defconfig
@@ -10,3 +10,4 @@ CONFIG_TARGET_SNOWBALL=y
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="U8500 $ "
diff --git a/configs/spring_defconfig b/configs/spring_defconfig
index a3abb354703..2a9c6a91602 100644
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -40,3 +40,4 @@ CONFIG_PMIC_S5M8767=y
CONFIG_REGULATOR_S5M8767=y
CONFIG_VIDEO_BRIDGE=y
CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
+CONFIG_SYS_PROMPT="spring # "
diff --git a/configs/stamp9g20_defconfig b/configs/stamp9g20_defconfig
index 78c47754fd9..40d6232b91e 100644
--- a/configs/stamp9g20_defconfig
+++ b/configs/stamp9g20_defconfig
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig
index 188adc53b6e..0c54d5b20fa 100644
--- a/configs/stm32f429-discovery_defconfig
+++ b/configs/stm32f429-discovery_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_STM32F429_DISCOVERY=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot > "
diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
index 3bdb1fc101d..f71206a729d 100644
--- a/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@ -12,3 +12,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_OF_CONTROL=y
+CONFIG_SYS_PROMPT="STV0991> "
diff --git a/configs/stxgp3_defconfig b/configs/stxgp3_defconfig
index 86afe886cc5..816092d8c94 100644
--- a/configs/stxgp3_defconfig
+++ b/configs/stxgp3_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_STXGP3=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="GPPP=> "
diff --git a/configs/stxssa_defconfig b/configs/stxssa_defconfig
index c0724174aae..ec812c1c8e6 100644
--- a/configs/stxssa_defconfig
+++ b/configs/stxssa_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_STXSSA=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="SSA=> "
diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig
index ae4b49b21c5..779f4006413 100644
--- a/configs/tao3530_defconfig
+++ b/configs/tao3530_defconfig
@@ -7,3 +7,4 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="TAO-3530 # "
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index 3787493330f..838d0ed378f 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS"
# CONFIG_CMD_SOURCE is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig
index cc8f527f4c8..acd1f3a904d 100644
--- a/configs/tb100_defconfig
+++ b/configs/tb100_defconfig
@@ -14,3 +14,4 @@ CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_DM_SERIAL=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="[tb100]:~# "
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index f0e5106e8c1..745d32edd53 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,
# CONFIG_CMD_FLASH is not set
CONFIG_DM=y
CONFIG_DM_THERMAL=y
+CONFIG_SYS_PROMPT="Matrix U-Boot> "
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index e731205f762..4e8f5c6b33f 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra30 (TEC-NG) # "
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index 3f815fe5bc5..84fa0be14fd 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (TEC) # "
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index 8192b28a580..e2a6b0ca426 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -8,3 +8,4 @@ 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# "
diff --git a/configs/ti814x_evm_defconfig b/configs/ti814x_evm_defconfig
index ade4ea229fb..f7d1e11fb17 100644
--- a/configs/ti814x_evm_defconfig
+++ b/configs/ti814x_evm_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot# "
diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig
index 67e5e601af9..1fd27193b72 100644
--- a/configs/ti816x_evm_defconfig
+++ b/configs/ti816x_evm_defconfig
@@ -4,3 +4,4 @@ CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="u-boot/ti816x# "
diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig
index e892d3ed090..d286fd61fe7 100644
--- a/configs/titanium_defconfig
+++ b/configs/titanium_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/barco/titanium/imximage.cfg"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="Titanium > "
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index f3cbe6d1502..f0dd2b9fa29 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -13,3 +13,4 @@ CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_USB=y
CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="Trats2 # "
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 6553edbc6dc..6412f31f8a8 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -12,3 +12,4 @@ CONFIG_OF_CONTROL=y
CONFIG_SPL_DISABLE_OF_CONTROL=y
CONFIG_USB=y
CONFIG_DM_USB=y
+CONFIG_SYS_PROMPT="Trats # "
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index cbd4dd31f90..1da9e94f672 100644
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -9,3 +9,4 @@ CONFIG_SPL=y
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="OMAP3 Tricorder # "
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 9d2fb2d2145..a1bcb1110f2 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -14,3 +14,4 @@ CONFIG_SPI_FLASH=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (TrimSlice) # "
diff --git a/configs/tseries_mmc_defconfig b/configs/tseries_mmc_defconfig
index 9ed13b60362..a083ee07e28 100644
--- a/configs/tseries_mmc_defconfig
+++ b/configs/tseries_mmc_defconfig
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
# 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)# "
diff --git a/configs/tseries_nand_defconfig b/configs/tseries_nand_defconfig
index 0b577edc355..aa66a0eda80 100644
--- a/configs/tseries_nand_defconfig
+++ b/configs/tseries_nand_defconfig
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
# 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)# "
diff --git a/configs/tseries_spi_defconfig b/configs/tseries_spi_defconfig
index 1602a43b4d7..1cb90d602ac 100644
--- a/configs/tseries_spi_defconfig
+++ b/configs/tseries_spi_defconfig
@@ -15,3 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NFS is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
diff --git a/configs/tt01_defconfig b/configs/tt01_defconfig
index d23904d2966..08f9f7bdca6 100644
--- a/configs/tt01_defconfig
+++ b/configs/tt01_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_TT01=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="TT01> "
diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index 7381665cf6c..c3edd343fb1 100644
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -5,3 +5,4 @@ CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="twister => "
diff --git a/configs/u8500_href_defconfig b/configs/u8500_href_defconfig
index 5a82ca8c7b9..0aebc7846d9 100644
--- a/configs/u8500_href_defconfig
+++ b/configs/u8500_href_defconfig
@@ -10,3 +10,4 @@ CONFIG_TARGET_U8500_HREF=y
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="U8500 $ "
diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig
index 5f3974e6a18..8cf3c4c1306 100644
--- a/configs/usb_a9263_dataflash_defconfig
+++ b/configs/usb_a9263_dataflash_defconfig
@@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_ITEST is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/v5fx30teval_defconfig b/configs/v5fx30teval_defconfig
index 8173f3ee914..e77dce91600 100644
--- a/configs/v5fx30teval_defconfig
+++ b/configs/v5fx30teval_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="v5fx30t:/# "
diff --git a/configs/vct_platinum_defconfig b/configs/vct_platinum_defconfig
index 81cf28011a7..9a46dcb5914 100644
--- a/configs/vct_platinum_defconfig
+++ b/configs/vct_platinum_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUM=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig
index 8d91aa58c6a..8c8d69a17f2 100644
--- a/configs/vct_platinum_onenand_defconfig
+++ b/configs/vct_platinum_onenand_defconfig
@@ -6,3 +6,4 @@ CONFIG_VCT_ONENAND=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index 6eaec0cbbd3..4e6cbc74221 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -17,3 +17,4 @@ CONFIG_VCT_SMALL_IMAGE=y
# CONFIG_CMD_NFS is not set
# CONFIG_CMD_MISC is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig
index 088ab7e79a2..f8968223af5 100644
--- a/configs/vct_platinum_small_defconfig
+++ b/configs/vct_platinum_small_defconfig
@@ -14,3 +14,4 @@ CONFIG_VCT_SMALL_IMAGE=y
# CONFIG_CMD_NFS is not set
# CONFIG_CMD_MISC is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinumavc_defconfig b/configs/vct_platinumavc_defconfig
index faeb6a2af71..6e867b2d7a1 100644
--- a/configs/vct_platinumavc_defconfig
+++ b/configs/vct_platinumavc_defconfig
@@ -5,3 +5,4 @@ CONFIG_VCT_PLATINUMAVC=y
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="VCT# "
diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig
index 900a626b60b..55f8c91e2fa 100644
--- a/configs/vct_platinumavc_onenand_defconfig
+++ b/configs/vct_platinumavc_onenand_defconfig
@@ -8,3 +8,4 @@ CONFIG_VCT_ONENAND=y
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index e9928a06a4d..343ab8f7ac7 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -17,3 +17,4 @@ CONFIG_VCT_SMALL_IMAGE=y
# CONFIG_CMD_NFS is not set
# CONFIG_CMD_MISC is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig
index 719bd6403ab..b4acc4aa79a 100644
--- a/configs/vct_platinumavc_small_defconfig
+++ b/configs/vct_platinumavc_small_defconfig
@@ -14,3 +14,4 @@ CONFIG_VCT_SMALL_IMAGE=y
# CONFIG_CMD_NFS is not set
# CONFIG_CMD_MISC is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_premium_defconfig b/configs/vct_premium_defconfig
index 7b04e7cb7a0..d71dd53e92f 100644
--- a/configs/vct_premium_defconfig
+++ b/configs/vct_premium_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VCT=y
CONFIG_VCT_PREMIUM=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig
index 769f8bdd701..6923db8366d 100644
--- a/configs/vct_premium_onenand_defconfig
+++ b/configs/vct_premium_onenand_defconfig
@@ -6,3 +6,4 @@ CONFIG_VCT_ONENAND=y
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index c062a01b75c..04a2855c03c 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -17,3 +17,4 @@ CONFIG_VCT_SMALL_IMAGE=y
# CONFIG_CMD_NFS is not set
# CONFIG_CMD_MISC is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig
index 4a5cdb0a34a..265a6a5a271 100644
--- a/configs/vct_premium_small_defconfig
+++ b/configs/vct_premium_small_defconfig
@@ -14,3 +14,4 @@ CONFIG_VCT_SMALL_IMAGE=y
# CONFIG_CMD_NFS is not set
# CONFIG_CMD_MISC is not set
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index a4735f63922..73a25586c66 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -15,3 +15,4 @@ CONFIG_SPI_FLASH=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra124 (Venice2) # "
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index f728585d2ce..d3473175cf0 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Ventana) # "
diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig
index 0baaa91fa32..3390f0e1b78 100644
--- a/configs/vexpress_aemv8a_juno_defconfig
+++ b/configs/vexpress_aemv8a_juno_defconfig
@@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
# CONFIG_CMD_MISC is not set
CONFIG_DM=y
CONFIG_DM_SERIAL=y
+CONFIG_SYS_PROMPT="VExpress64# "
diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig
index bf5576a5d02..9890e641e17 100644
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -16,3 +16,4 @@ CONFIG_DEFAULT_DEVICE_TREE="vexpress64"
# CONFIG_CMD_MISC is not set
CONFIG_DM=y
CONFIG_DM_SERIAL=y
+CONFIG_SYS_PROMPT="VExpress64# "
diff --git a/configs/vision2_defconfig b/configs/vision2_defconfig
index afe3b3c22f4..962dc5b2a0b 100644
--- a/configs/vision2_defconfig
+++ b/configs/vision2_defconfig
@@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_SPI_FLASH=y
+CONFIG_SYS_PROMPT="Vision II U-boot > "
diff --git a/configs/vl_ma2sc_defconfig b/configs/vl_ma2sc_defconfig
index 7a66783acca..c908c6e7fd1 100644
--- a/configs/vl_ma2sc_defconfig
+++ b/configs/vl_ma2sc_defconfig
@@ -6,3 +6,4 @@ CONFIG_TARGET_VL_MA2SC=y
# CONFIG_CMD_LOADS is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="U-Boot> "
diff --git a/configs/vpac270_nor_128_defconfig b/configs/vpac270_nor_128_defconfig
index bbc6e6a9579..1d116533abc 100644
--- a/configs/vpac270_nor_128_defconfig
+++ b/configs/vpac270_nor_128_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VPAC270=y
CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_128M"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vpac270_nor_256_defconfig b/configs/vpac270_nor_256_defconfig
index 3f1ae1ec45d..bcd10065b4f 100644
--- a/configs/vpac270_nor_256_defconfig
+++ b/configs/vpac270_nor_256_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_VPAC270=y
CONFIG_SYS_EXTRA_OPTIONS="NOR,RAM_256M"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vpac270_ond_256_defconfig b/configs/vpac270_ond_256_defconfig
index 7500b7c9744..d98981916ac 100644
--- a/configs/vpac270_ond_256_defconfig
+++ b/configs/vpac270_ond_256_defconfig
@@ -5,3 +5,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ONENAND,RAM_256M"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index 43d725bae93..e3ce9fd3595 100644
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -13,3 +13,4 @@ CONFIG_SPL_DM=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_SYS_PROMPT="Tegra20 (Whistler) # "
diff --git a/configs/wireless_space_defconfig b/configs/wireless_space_defconfig
index 5551d27d6cb..63013f61a3c 100644
--- a/configs/wireless_space_defconfig
+++ b/configs/wireless_space_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_WIRELESS_SPACE=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
+ONFIG_SYS_PROMPT="ws> "
diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig
index 8dcf3e1f5cb..3b463c13434 100644
--- a/configs/woodburn_defconfig
+++ b/configs/woodburn_defconfig
@@ -1,3 +1,4 @@
CONFIG_ARM=y
CONFIG_TARGET_WOODBURN=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="woodburn U-Boot > "
diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig
index 96a00b326b6..59f2ad0ce5e 100644
--- a/configs/woodburn_sd_defconfig
+++ b/configs/woodburn_sd_defconfig
@@ -3,3 +3,4 @@ CONFIG_TARGET_WOODBURN_SD=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/woodburn/imximage.cfg"
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="woodburn U-Boot > "
diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index fdd4d3b71f3..6be6cc36b6d 100644
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -7,3 +7,4 @@ CONFIG_AUTOBOOT_STOP_STR=" "
# CONFIG_CMD_SETEXPR is not set
CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_SYS_PROMPT="X600> "
diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig
index 9dae75587c3..98030d0a5d6 100644
--- a/configs/xilinx-ppc405-generic_defconfig
+++ b/configs/xilinx-ppc405-generic_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="xlx-ppc405:/# "
diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig
index 398362b932f..de6977307e3 100644
--- a/configs/xilinx-ppc440-generic_defconfig
+++ b/configs/xilinx-ppc440-generic_defconfig
@@ -6,3 +6,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x041000
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="board:/# "
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index fda44eaee04..9c4d8721388 100644
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -16,3 +16,5 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep"
CONFIG_CMD_TIME=y
CONFIG_CMD_TIMER=y
CONFIG_SYS_TEXT_BASE=0x8000000
+CONFIG_SYS_PROMPT="ZynqMP> "
+
diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
index 3591849b351..2977ccc8dde 100644
--- a/configs/zipitz2_defconfig
+++ b/configs/zipitz2_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_ZIPITZ2=y
# CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
+CONFIG_SYS_PROMPT="$ "
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index a34e82718dd..c759cdfbefb 100644
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -5,3 +5,4 @@ CONFIG_AUTOBOOT_PROMPT="boot in %d s\n"
CONFIG_AUTOBOOT_DELAY_STR="delaygs"
CONFIG_AUTOBOOT_STOP_STR="stopgs"
# CONFIG_CMD_SETEXPR is not set
+CONFIG_SYS_PROMPT="zmx25> "
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index a2468c38202..5e15dd91b3e 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -88,7 +88,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 2e860161844..d1cadc0165b 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -150,7 +150,6 @@
#define CONFIG_PRAM 2048 /* 2048 KB */
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index ae11e7d8795..1472672087d 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -106,7 +106,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#if defined(CONFIG_KGDB)
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index d888c3e5498..006f2d8e9b3 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -105,7 +105,6 @@
"save\0" \
""
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index fa9b973fa8f..116e8e27f99 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -98,7 +98,6 @@
#define CONFIG_SYS_I2C_PINMUX_CLR (0xFFF0)
#define CONFIG_SYS_I2C_PINMUX_SET (0x000F)
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#if (CONFIG_CMD_KGDB)
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 860abe7bca6..eff0aa60077 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -94,7 +94,6 @@
"save\0" \
""
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 817b142bf98..a48ae6bccd3 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -108,7 +108,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 4724a9c89dd..e806b7a3eb1 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -102,7 +102,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 32afa44147c..1df98f7e481 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -102,7 +102,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 1f65918d0d8..db0ddcd5e4e 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -216,7 +216,6 @@
#define CONFIG_SYS_HUSH_PARSER 1
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 2c08512ff66..de747a48be2 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -160,7 +160,6 @@
#define CONFIG_PRAM 2048 /* 2048 KB */
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index e82ba329845..06da5f0e50e 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -219,7 +219,6 @@
#define CONFIG_PRAM 2048 /* 2048 KB */
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 3c1bb90de1b..e30b645efa4 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -146,7 +146,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 7e1b3646f8a..051c9409bdf 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -134,7 +134,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_PROMPT "-> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#ifdef CONFIG_CMD_KGDB
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 32cb007ab77..834786d9406 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -544,12 +544,6 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
-#ifdef CONFIG_MPC8349ITX
-#define CONFIG_SYS_PROMPT "MPC8349E-mITX> " /* Monitor Command Prompt */
-#else
-#define CONFIG_SYS_PROMPT "MPC8349E-mITX-GP> " /* Monitor Command Prompt */
-#endif
-
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#else
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index dfc4fc0f365..5d0e4220412 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -71,7 +71,6 @@
#define CONFIG_PREBOOT
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "pati=> " /* Monitor Command Prompt */
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#else
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 0fa03cf93cd..21a918a4849 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -871,7 +871,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */
#ifdef CONFIG_CMD_KGDB
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#else
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index bde71fbca35..242c239b28c 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -873,7 +873,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */
#ifdef CONFIG_CMD_KGDB
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#else
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index bdedef5374f..76611b07993 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -550,7 +550,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_PROMPT "B$ " /* Monitor Command Prompt */
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#else
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 60c2948f074..5b2e09222bf 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -140,7 +140,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "VCMA9 # "
#define CONFIG_SYS_CBSIZE 256
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index 8a5d1e6fa41..f05d9ecd149 100644
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -421,7 +421,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_PROMPT "ac14xx> " /* Monitor Command Prompt */
#ifdef CONFIG_CMD_KGDB
# define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h
index 141fc99ceae..0f256d8a134 100644
--- a/include/configs/adp-ag101.h
+++ b/include/configs/adp-ag101.h
@@ -117,7 +117,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "NDS32 # " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 4296c6b4770..94fcdbd2491 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -117,7 +117,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "NDS32 # " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
diff --git a/include/configs/adp-ag102.h b/include/configs/adp-ag102.h
index 0c7573a4524..6f05d87c040 100644
--- a/include/configs/adp-ag102.h
+++ b/include/configs/adp-ag102.h
@@ -180,7 +180,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "NDS32 # " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index a0b193e837b..654b7780d19 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -207,11 +207,8 @@
/*
* Miscellaneous configurable options
*/
-#define V_PROMPT "AM3517_CRANE # "
-
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT V_PROMPT
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 30f31a93ada..70490910d73 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -218,11 +218,8 @@
/*
* Miscellaneous configurable options
*/
-#define V_PROMPT "AM3517_EVM # "
-
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT V_PROMPT
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 45fd265d677..bbab8b2f481 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -26,7 +26,6 @@
#define CONFIG_CMD_TIMER
#define CONFIG_CMD_DIAG
-#define CONFIG_SYS_PROMPT "amcore $ "
/* undef to save memory */
#undef CONFIG_SYS_LONGHELP
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 620ca02d7c2..bcaea95c457 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -12,7 +12,6 @@
#include "tegra30-common.h"
/* High-level configuration options */
-#define V_PROMPT "Apalis T30 # "
#define CONFIG_TEGRA_BOARD_STRING "Toradex Apalis T30"
/* Board-specific serial config */
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index cf13563c62c..43fbdd3d11d 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -140,7 +140,6 @@
* U-Boot general configurations
*/
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
#define CONFIG_SYS_PBSIZE \
(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/arcangel4.h b/include/configs/arcangel4.h
index 6636e0e3c68..a342d7ef924 100644
--- a/include/configs/arcangel4.h
+++ b/include/configs/arcangel4.h
@@ -67,7 +67,6 @@
* Console configuration
*/
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "arcangel4# "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 8784c4e38d9..437a7454146 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -25,7 +25,6 @@
#define CONFIG_EXYNOS_SPL
/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT "ARNDALE # "
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
#define CONFIG_IDENT_STRING " for ARNDALE"
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index c6e1f5635aa..1c3a1c978c1 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -207,8 +207,6 @@
#define CONFIG_BOOTARGS " console=ttyS2,115200 rootfstype=romfs"\
" loaderversion=$loaderversion"
-#define CONFIG_SYS_PROMPT "URMEL > "
-
/* default RAM address for user programs */
#define CONFIG_SYS_LOAD_ADDR 0x20000
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index c2621ffe841..2bded45548e 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -66,7 +66,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 6f1f65fb3cd..7e026ef4542 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -194,7 +194,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
/* Print Buffer Size */
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index e98cf0ca5c5..459b8f97e0b 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -254,7 +254,6 @@
"root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
#endif
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 42461d29688..9c595f28674 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -201,7 +201,6 @@
"root=/dev/mtdblock7 rw rootfstype=jffs2"
#endif
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 731c7f1f0e8..3eb0154c06c 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -330,7 +330,6 @@
"root=/dev/mtdblock7 rw rootfstype=jffs2"
#endif
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 09d8bec0647..4d9020975ef 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -181,7 +181,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index a19d4d9e173..ea0a94bcde3 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -221,7 +221,6 @@
#endif
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) \
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index e709f9cf371..f7a174edbf3 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -184,7 +184,6 @@
"root=/dev/mmcblk0p2 rw rootwait"
#endif
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index b9a77547b6c..9f767862021 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -223,7 +223,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) \
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 1cab0a92c2a..c436fef7b5c 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -135,7 +135,6 @@
#define CONFIG_SYS_BOOTPARAMS_LEN (16 * 1024)
/* Other configuration settings that shouldn't have to change all that often */
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index 486d9ee63c4..39358113d2b 100644
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -156,7 +156,6 @@
#define CONFIG_SYS_BOOTPARAMS_LEN (16 * 1024)
/* Other configuration settings that shouldn't have to change all that often */
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 1cd99e97658..8cd7c3566e8 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -151,7 +151,6 @@
#define CONFIG_SYS_BOOTPARAMS_LEN (16 * 1024)
/* Other configuration settings that shouldn't have to change all that often */
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/axs101.h b/include/configs/axs101.h
index 25116e50bb8..7cb885323aa 100644
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -155,7 +155,6 @@
* Console configuration
*/
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "AXS# "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index 12c5a6cd154..124a7663d60 100644
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -64,6 +64,7 @@
#define CONFIG_SYS_HUSH_PARSER 1
#define CONFIG_SYS_LONGHELP
+#undef CONFIG_SYS_PROMPT
#ifdef CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_PROMPT "$ "
#else
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index adc578a56df..1790f60092c 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -25,7 +25,6 @@
#define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
/* High-level configuration options */
-#define V_PROMPT "Tegra30 (Beaver) # "
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Beaver"
/* Board-specific serial config */
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 7e52d17627b..6674d28605b 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -159,7 +159,6 @@
#define CONFIG_BOOTCOMMAND "run ramboot"
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw"
-#define CONFIG_SYS_PROMPT "minotaur> "
#define BOOT_ENV_SETTINGS \
"update=tftpboot $(loadaddr) u-boot.ldr;" \
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index d8a0cc6b5d3..15d912e89ad 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -158,7 +158,6 @@
#define CONFIG_BOOTCOMMAND "run flashboot"
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw"
-#define CONFIG_SYS_PROMPT "srv1> "
#define BOOT_ENV_SETTINGS \
"update=tftpboot $(loadaddr) u-boot.ldr;" \
diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
index da283963148..b3c6d299959 100644
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -153,7 +153,6 @@
*/
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BAUDRATE 57600
-#define CONFIG_SYS_PROMPT "Acvilon> "
/*
* Pull in common ADI header for remaining command/environment setup
diff --git a/include/configs/br4.h b/include/configs/br4.h
index cbef809c5a4..959f9a92f02 100644
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@@ -127,7 +127,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
-#define CONFIG_SYS_PROMPT "br4>"
#define CONFIG_BOOTCOMMAND "run nandboot"
#define CONFIG_BOOTDELAY 2
#define CONFIG_LOADADDR 0x2000000
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 152141531c7..838ef1f00a2 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -129,7 +129,6 @@
*/
#define CONFIG_SYS_MALLOC_LEN (5120 << 10)
#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT "U-Boot (BuR V2.0)# "
#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 7d8bb4790d6..c8b15fb5342 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -194,7 +194,6 @@
* U-Boot general configuration
*/
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "Calimain > " /* Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index 3400dd46f97..578c4ab856f 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -124,7 +124,6 @@
/* U-Boot general configuration */
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "cam_enc_4xx> " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE /* Print buffer size */ \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 93c5f482720..ce6b1582ef0 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -25,7 +25,6 @@
#define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3
/* High-level configuration options */
-#define V_PROMPT "Tegra30 (Cardhu) # "
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Cardhu"
#define BOARD_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index bbd9f387495..ddf6b5f1319 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -45,7 +45,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200}
/* Shell */
-#define CONFIG_SYS_PROMPT "CM-FX6 # "
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 767ef3a266b..adf05b1f297 100644
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -27,9 +27,6 @@
#undef CONFIG_MAX_RAM_BANK_SIZE
#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 512MB */
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "CM-T335 # "
-
#define CONFIG_OMAP_COMMON
#define MACH_TYPE_CM_T335 4586 /* Until the next sync */
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 6885ae1e36c..281d614de18 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -222,7 +222,6 @@
#define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "CM-T3x # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index cf0841499bf..33b22a72b98 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -227,7 +227,6 @@
#define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "CM-T3517 # "
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
index 2a8b73022e5..95a5a606e33 100644
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -105,14 +105,12 @@
* Miscellaneous configurable options
*/
#undef CONFIG_SYS_AUTOLOAD
-#undef CONFIG_SYS_PROMPT
#undef CONFIG_EXTRA_ENV_SETTINGS
#undef CONFIG_BOOTCOMMAND
#undef CONFIG_BOOTDELAY
#define CONFIG_BOOTDELAY 3
#define CONFIG_SYS_AUTOLOAD "no"
-#define CONFIG_SYS_PROMPT "CM-T54 # "
#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 8a6106d3a79..8e70d8c94c3 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -178,8 +178,6 @@ considered during boot */
#endif
-#define CONFIG_SYS_PROMPT "COBRA > " /* Layout of u-boot prompt*/
-
#define CONFIG_SYS_LOAD_ADDR 0x20000 /*Defines default RAM address
from which user programs will be started */
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index e3f0ab027f7..a1b64c60e64 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -81,6 +81,7 @@
#define CONFIG_SYS_HUSH_PARSER 1
#undef CONFIG_SYS_LONGHELP /* Saves 10 KB */
+#undef CONFIG_SYS_PROMPT
#ifdef CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_PROMPT "$ "
#else
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 6d73f9d3f21..06c51c0923d 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -10,7 +10,6 @@
#include "tegra20-common.h"
/* High-level configuration options */
-#define V_PROMPT "Colibri T20 # "
#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T20"
/* Board-specific serial config */
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 1e94c34b030..fbfebcfc9b3 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -12,7 +12,6 @@
#include "tegra30-common.h"
/* High-level configuration options */
-#define V_PROMPT "Colibri T30 # "
#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T30"
/* Board-specific serial config */
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index ab8d293dd75..f0da913c4ee 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -177,7 +177,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#define CONFIG_SYS_PROMPT "Colibri VFxx # "
#undef CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 3cfae212d42..2d2f3c11aaf 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -133,7 +133,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index d3c6f75a126..82f4fe7d3cc 100644
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -464,11 +464,6 @@
#define CONFIG_BAUDRATE 115200
-#if defined(CONFIG_CPU9G20)
-#define CONFIG_SYS_PROMPT "CPU9G20=> "
-#elif defined(CONFIG_CPU9260)
-#define CONFIG_SYS_PROMPT "CPU9260=> "
-#endif
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index f990cf70672..29cd842cecc 100644
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -173,7 +173,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_PROMPT "CPUAT91=> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 32
#define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index b82140e9397..7ac3224e6e9 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -143,7 +143,6 @@
#undef CONFIG_MISC_INIT_R
#undef CONFIG_BOOTDELAY
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "U-Boot > " /* Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 3da9da42df9..1cd11c0ded2 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -262,7 +262,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "U-Boot > " /* Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 30aecca220c..2251f591ebf 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -22,7 +22,6 @@
#include "tegra114-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra114 (Dalmore) # "
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Dalmore"
/* Board-specific serial config */
diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index e873fa4d8d8..72296a03ddb 100644
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -110,7 +110,6 @@
/* U-Boot general configuration */
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "DM355 EVM # " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE /* Print buffer size */ \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index d4b994ad2b2..e3ff9431dc9 100644
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -78,7 +78,6 @@
/* U-Boot general configuration */
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "DM355 LEOPARD # "
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE /* Print buffer size */ \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index 9bdd2d66119..bbc801b4db9 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -143,7 +143,6 @@
/* U-Boot general configuration */
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "DM36x EVM # " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE /* Print buffer size */ \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
index 8571cbdbae5..6346422b498 100644
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -94,7 +94,6 @@ extern unsigned int davinci_arm_clk_get(void);
/* U-Boot general configuration */
#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "DM6467 EVM > " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 35e9a15a9de..15d815084b4 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -143,7 +143,6 @@
#define CONFIG_MISC_INIT_R
#undef CONFIG_BOOTDELAY
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "U-Boot > " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print buffer sz */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index db636e4cf84..bc5e1ca6972 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -87,7 +87,6 @@
#define CONFIG_MISC_INIT_R
#undef CONFIG_BOOTDELAY
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "U-Boot > " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print buffer sz */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index 9ecf6cebc26..e7193887225 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -74,7 +74,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_BOOTDELAY 5 /* Autoboot after 5 seconds. */
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "U-Boot > " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) /* Print buffer size */
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 410cf687416..b85c988b5d8 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -133,7 +133,6 @@
#define CONFIG_MISC_INIT_R
#undef CONFIG_BOOTDELAY
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "U-Boot > " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print buffer sz */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 0abab78d2a9..46e3a6ce38c 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -98,8 +98,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "DbAu1xx0 # " /* Monitor Command Prompt */
-
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args*/
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 2e16ca7c54a..98205adde03 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -208,7 +208,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "DIG297# "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index b27b2026c35..a62f4e3d3b3 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -43,9 +43,6 @@
*/
#include "mv-common.h"
-#undef CONFIG_SYS_PROMPT /* previously defined in mv-common.h */
-#define CONFIG_SYS_PROMPT "DockStar> " /* Command Prompt */
-
/*
* Environment variables configurations
*/
diff --git a/include/configs/duovero.h b/include/configs/duovero.h
index 6e53da573de..28d12ad3b2e 100644
--- a/include/configs/duovero.h
+++ b/include/configs/duovero.h
@@ -27,9 +27,6 @@
#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "duovero # "
-
/* USB UHH support options */
#define CONFIG_CMD_USB
#define CONFIG_USB_HOST
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index b9f28a34b88..9a70aaecbf4 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -122,7 +122,6 @@
* U-Boot general configuration
*/
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "ea20 > " /* Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 924362cb233..f9ec02835aa 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -73,7 +73,6 @@
#define CONFIG_MCFTMR
#define CONFIG_BOOTDELAY 5
-#define CONFIG_SYS_PROMPT "\nEB+CPU5282> "
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index 271e071cbba..d27f7e0452d 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -44,7 +44,6 @@
#define CONFIG_BOOT_RETRY_TIME 30
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_PROMPT "U-Boot> " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
#define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h
index 49c53e452d0..f23d383e395 100644
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -36,12 +36,6 @@
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_AUTO_COMPLETE
-/*
- * Miscellaneous configurable options
- */
-#define V_PROMPT "ECO5-PK # "
-#define CONFIG_SYS_PROMPT V_PROMPT
-
/*
* Set its own mtdparts, different from common
*/
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 87b29f89016..efe2a9daa7c 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -39,7 +39,7 @@
#define CONFIG_SYS_LDSCRIPT "board/cirrus/edb93xx/u-boot.lds"
-
+#undef CONFIG_SYS_PROMPT
#ifdef CONFIG_EDB9301
#define CONFIG_EP9301
#define CONFIG_MACH_TYPE MACH_TYPE_EDB9301
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index b5e8e0ec203..8b38d7e75f1 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -130,7 +130,6 @@
#define CONFIG_INITRD_TAG 1 /* enable INITRD tag */
#define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */
-#define CONFIG_SYS_PROMPT "EDMiniV2> " /* Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
+sizeof(CONFIG_SYS_PROMPT) + 16) /* Print Buff */
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index c7b1e5cbf71..b49b9031c69 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -237,7 +237,6 @@
#endif
/* Misc. u-boot settings */
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 5d66901f8b7..5b4b0119573 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -108,7 +108,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "flea3 U-Boot > "
#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */
diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h
index f1cbc8eca72..fa32a2e8cf3 100644
--- a/include/configs/fx12mm.h
+++ b/include/configs/fx12mm.h
@@ -37,7 +37,6 @@
#define CONFIG_ENV_OVERWRITE 1
/*Misc*/
-#define CONFIG_SYS_PROMPT "FX12MM:/# " /* Monitor Command Prompt */
#define CONFIG_PREBOOT "echo U-Boot is up and running;"
/*Flash*/
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 967a05a2cbb..2a42e7c62ed 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -70,9 +70,6 @@
*/
#include "mv-common.h"
-#undef CONFIG_SYS_PROMPT /* previously defined in mv-common.h */
-#define CONFIG_SYS_PROMPT "GoFlexHome> " /* Command Prompt */
-
/*
* Environment variables configurations
*/
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index 231f25a38b7..274175ba0f0 100644
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -144,7 +144,6 @@
#define CONFIG_SYS_BOOTPARAMS_LEN (16 * 1024)
/* Other configuration settings that shouldn't have to change all that often */
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 7c90812dbfe..1c0d96ef102 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -226,7 +226,6 @@
#define CONFIG_IMX_VIDEO_SKIP
/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT "Ventana > "
#define CONFIG_HWCONFIG
/* Print Buffer Size */
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 1d2d09ad54e..e8dfa748efa 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -123,7 +123,6 @@
#define CONFIG_INITRD_TAG
/* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT "> "
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_PROMPT_HUSH_PS2 "$ "
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 99a63d69988..e0bc7c0d730 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -12,7 +12,6 @@
#include "tegra20-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra20 (Harmony) # "
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Harmony"
/* Board-specific serial config */
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 08e2f42da6c..558edfce8ee 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -484,7 +484,6 @@ int fpga_gpio_get(unsigned int bus, int pin);
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */
#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */
#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index ee524527aa5..6afe3409298 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -59,9 +59,6 @@
*/
#include "mv-common.h"
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "ib62x0 => "
-
/*
* Environment variables configuration
*/
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 1a5c93d11ba..bce97dc069d 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -52,9 +52,6 @@
*/
#include "mv-common.h"
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "iconnect => "
-
/*
* Environment variables configuration
*/
diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h
index 5a0291753d9..2fa6c3d91ba 100644
--- a/include/configs/ima3-mx53.h
+++ b/include/configs/ima3-mx53.h
@@ -94,7 +94,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "IMA3 MX53 U-Boot > "
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index c552e9f76e7..23e3a6c5fc1 100644
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -101,7 +101,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "uboot> "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 54e8121008e..86f327c8278 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -102,7 +102,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "uboot> "
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 256
/* Print Buffer Size */
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 26aa8cadc01..c80e9152a38 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -36,11 +36,6 @@
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyAM0 console=tty"
#define CONFIG_BOOTCOMMAND ""
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_PROMPT "Integrator-AP # " /* Monitor Command Prompt */
-
/* Flash settings */
#define CONFIG_SYS_FLASH_SIZE 0x02000000 /* 32 MiB */
#define CONFIG_SYS_MAX_FLASH_SECT 128
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 4d04f544c81..af69ad99c4c 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -41,8 +41,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_PROMPT "Integrator-CP # " /* Monitor Command Prompt */
-
#define PHYS_FLASH_SIZE 0x01000000 /* 16MB */
#define CONFIG_SYS_MAX_FLASH_SECT 64
#define CONFIG_ENV_IS_IN_FLASH 1
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index e68b6617c51..b1cd7dfdc28 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -207,7 +207,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "U-Boot > " /* Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index def0ab4121c..e87a01047d3 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -16,7 +16,6 @@
#include "tegra124-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra124 (Jetson TK1) # "
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Jetson TK1"
/* Board-specific serial config */
diff --git a/include/configs/jornada.h b/include/configs/jornada.h
index 71f2ee18a3c..30904763405 100644
--- a/include/configs/jornada.h
+++ b/include/configs/jornada.h
@@ -55,7 +55,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "HP Jornada# "
#define CONFIG_SYS_CBSIZE 256 /* console buffsize */
#define CONFIG_SYS_PBSIZE (256+sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 93c2976b217..8a451ecd024 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -53,7 +53,6 @@
/* prompt */
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "KZM-A9-GT# "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_PBSIZE 256
#define CONFIG_SYS_MAXARGS 16
diff --git a/include/configs/lp8x4x.h b/include/configs/lp8x4x.h
index e9ee3fb638b..10a7b05daf3 100644
--- a/include/configs/lp8x4x.h
+++ b/include/configs/lp8x4x.h
@@ -97,6 +97,7 @@
#define CONFIG_SYS_HUSH_PARSER 1
#define CONFIG_SYS_LONGHELP
+#undef CONFIG_SYS_PROMPT
#ifdef CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_PROMPT "$ "
#else
diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h
index 5afee55ae9c..39fb464593c 100644
--- a/include/configs/ls2085a_common.h
+++ b/include/configs/ls2085a_common.h
@@ -260,7 +260,6 @@ unsigned long long get_qixis_addr(void);
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PROMPT "=> "
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index ddbf5cec67f..18372584fb5 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -88,7 +88,6 @@
#define CONFIG_SF_DEFAULT_SPEED 25000000
-#undef CONFIG_SYS_PROMPT
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
/*
diff --git a/include/configs/malta.h b/include/configs/malta.h
index ab2335fab82..2f33f63b1cf 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -59,6 +59,7 @@
/*
* Console configuration
*/
+#undef CONFIG_SYS_PROMPT
#if defined(CONFIG_SYS_LITTLE_ENDIAN)
#define CONFIG_SYS_PROMPT "maltael # "
#else
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 0b26404d0d1..0f70c47649a 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -270,11 +270,8 @@
/*
* Miscellaneous configurable options
*/
-#define V_PROMPT "mcx # "
-
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT V_PROMPT
#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index b5d72e3966a..6dfd5e2c40c 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -13,7 +13,6 @@
#include "tegra20-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra20 (Medcom-Wide) # "
#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide"
/* Board-specific serial config */
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index e16965c56c8..626fa449271 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -316,8 +316,6 @@
"1m(cramfs),-(jffs2)"
#endif
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT "U-Boot-mONStR> "
/* size of console buffer */
#define CONFIG_SYS_CBSIZE 512
/* print buffer size */
diff --git a/include/configs/ml507.h b/include/configs/ml507.h
index b9ecb091b61..89a72904b3d 100644
--- a/include/configs/ml507.h
+++ b/include/configs/ml507.h
@@ -24,7 +24,6 @@
#define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
/*Misc*/
-#define CONFIG_SYS_PROMPT "ml507:/# " /* Monitor Command Prompt */
#define CONFIG_PREBOOT "echo U-Boot is up and runnining;"
/*Flash*/
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index dd516acff5a..3073db9ff8f 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -29,12 +29,6 @@
#define CONFIG_OMAP3_GPIO_4
#define CONFIG_HOSTNAME mt_ventoux
-/*
- * Miscellaneous configurable options
- */
-#define V_PROMPT "mt_ventoux => "
-#define CONFIG_SYS_PROMPT V_PROMPT
-
/*
* Set its own mtdparts, different from common
*/
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index b90de14b30c..92e54299292 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -70,7 +70,6 @@
#define CONFIG_INITRD_TAG 1 /* enable INITRD tag */
#define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */
-#define CONFIG_SYS_PROMPT "Marvell>> " /* Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
+sizeof(CONFIG_SYS_PROMPT) + 16) /* Print Buff */
diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h
index 22aec4f1762..373cfcbc792 100644
--- a/include/configs/mx51_efikamx.h
+++ b/include/configs/mx51_efikamx.h
@@ -205,7 +205,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "Efika> "
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 436b0227b97..6ae736f1549 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -151,7 +151,6 @@
"else run netboot; fi"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT "=> "
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 61af61f190b..ebf67501f0b 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -64,10 +64,6 @@
*/
#include "mv-common.h"
-/* Remove or override few declarations from mv-common.h */
-#undef CONFIG_SYS_PROMPT /* previously defined in mv-common.h */
-#define CONFIG_SYS_PROMPT "nas220> "
-
/*
* Environment variables configurations
*/
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 8755be73b6b..dd70adcceaf 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -27,7 +27,6 @@
/* user interface */
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT "Nomadik> "
#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 7ec9965a464..915df52ccfe 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -396,7 +396,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#define CONFIG_SYS_PROMPT "Nokia RX-51 # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index eac24d39ea8..4b693e8230b 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -13,7 +13,6 @@
#include "tegra124-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra124 (Nyan-big) # "
#define CONFIG_TEGRA_BOARD_STRING "Google/NVIDIA Nyan-big"
/* Board-specific serial config */
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 69be496c079..1afe04ad8b3 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -14,9 +14,6 @@
#include <configs/exynos4-common.h>
-#define CONFIG_SYS_PROMPT "Odroid # " /* Monitor Command Prompt */
-
-
#define CONFIG_SYS_L2CACHE_OFF
#ifndef CONFIG_SYS_L2CACHE_OFF
#define CONFIG_SYS_L2_PL310
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 0deff460267..3c701587bfb 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -12,7 +12,6 @@
#include <configs/exynos5-common.h>
#undef CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SYS_PROMPT "ODROID-XU3 # "
#define CONFIG_IDENT_STRING " for ODROID-XU3"
#define CONFIG_BOARD_COMMON
diff --git a/include/configs/odroid_xu3.h.rej b/include/configs/odroid_xu3.h.rej
new file mode 100644
index 00000000000..a1c29648fc5
--- /dev/null
+++ b/include/configs/odroid_xu3.h.rej
@@ -0,0 +1,10 @@
+--- include/configs/odroid_xu3.h
++++ include/configs/odroid_xu3.h
+@@ -10,7 +10,6 @@
+
+ #include "exynos5420-common.h"
+
+-#define CONFIG_SYS_PROMPT "ODROID-XU3 # "
+ #define CONFIG_IDENT_STRING " for ODROID-XU3"
+
+ #define CONFIG_BOARD_COMMON
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 81d4b34876e..713df3cf80d 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -241,10 +241,6 @@
#define CONFIG_SERIAL2
#endif
-/* Keep old prompt in case some existing script depends on it */
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "Cairo # "
-
/* Provide MACH_TYPE for compatibility with non-DT kernels */
#define MACH_TYPE_OMAP3_CAIRO 3063
#define CONFIG_MACH_TYPE MACH_TYPE_OMAP3_CAIRO
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 314e5078459..7e7f6f2e9f4 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -179,7 +179,6 @@
* U-boot features
* ----------------------------------------------------------------------------
*/
-#define CONFIG_SYS_PROMPT "OMAP3_EVM # "
#define CONFIG_SYS_MAXARGS 16 /* max args for a command */
#define CONFIG_MISC_INIT_R
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 7457324c4f7..e09e617f73a 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -235,7 +235,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "OMAP Logic # "
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index 19543a12b25..9e2cf7333cf 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -205,7 +205,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "mvblx # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index cbaf69296a0..53ff61d10c1 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -186,12 +186,6 @@
"fi;" \
"run nanddtsboot; " \
-/*
- * Miscellaneous configurable options
- */
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "Overo # "
-
/* memtest works on */
#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0)
#define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + \
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 26adfbaa4e1..4e937050816 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -101,12 +101,6 @@
"ubi part boot && ubifsmount ubi:boot && " \
"ubifsload ${loadaddr} uImage && bootm ${loadaddr}"
-/*
- * Miscellaneous configurable options
- */
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "Pandora # "
-
/* memtest works on */
#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0)
#define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + \
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index 16ceb918876..f43e477ad25 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -240,7 +240,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "OMAP34XX SDP # "
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 6d0d020690f..d9a3aa42176 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -199,7 +199,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
-#define CONFIG_SYS_PROMPT "U-Boot > " /* Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/origen.h b/include/configs/origen.h
index dae8fd5aa48..21d8e7ac48b 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -11,9 +11,6 @@
#include <configs/exynos4-common.h>
-#define CONFIG_SYS_PROMPT "ORIGEN # "
-
-
/* High Level Configuration Options */
#define CONFIG_EXYNOS4210 1 /* which is a EXYNOS4210 SoC */
#define CONFIG_ORIGEN 1 /* working with ORIGEN*/
diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index a9f92fa29fd..ec48c14acae 100644
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -96,9 +96,6 @@
#define CONFIG_SYS_HUSH_PARSER 1
#define CONFIG_SYS_LONGHELP
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT "$ "
-#endif
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_PBSIZE \
(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/palmtc.h b/include/configs/palmtc.h
index b68ad3b7dd6..81c3f028ff3 100644
--- a/include/configs/palmtc.h
+++ b/include/configs/palmtc.h
@@ -99,9 +99,6 @@
#define CONFIG_SYS_HUSH_PARSER 1
#define CONFIG_SYS_LONGHELP
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT "$ "
-#endif
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_PBSIZE \
(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h
index 3946607512d..ffb0d1e19a0 100644
--- a/include/configs/palmtreo680.h
+++ b/include/configs/palmtreo680.h
@@ -92,6 +92,7 @@
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_LONGHELP
+#undef CONFIG_SYS_PROMPT
#ifdef CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_PROMPT "$ "
#else
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 0bdeccc5a92..8eac81aa218 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -21,7 +21,6 @@
#include "tegra20-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra20 (Paz00) MOD # "
#define CONFIG_TEGRA_BOARD_STRING "Compal Paz00"
/* Board-specific serial config */
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index af2654e0f4b..516d38144a0 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -52,7 +52,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "Pb1x00 # " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args*/
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 83c96a8c7b1..29feb7bba13 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -337,7 +337,6 @@ RTC configuration
Miscellaneous configurable options
-------------------------------------------------------------------------------*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "uboot> " /* Monitor Command Prompt */
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index 0f5e9feeac3..6c42aaac0e5 100644
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -29,7 +29,6 @@
#define CONFIG_SERIAL3 /* use SERIAL 3 */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
-#define CONFIG_SYS_PROMPT "Peach-Pi # "
#define CONFIG_IDENT_STRING " for Peach-Pi"
/* Display */
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index f2594345c30..6c68dd2e0c6 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -29,7 +29,6 @@
#define CONFIG_SERIAL3 /* use SERIAL 3 */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
-#define CONFIG_SYS_PROMPT "Peach-Pit # "
#define CONFIG_IDENT_STRING " for Peach-Pit"
/* DRAM Memory Banks */
diff --git a/include/configs/pepper.h b/include/configs/pepper.h
index 0bdcf22dc0d..1bc8c4b7fa7 100644
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -17,9 +17,6 @@
#define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK)
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "pepper# "
-
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
/* Mach type */
diff --git a/include/configs/platinum_picon.h b/include/configs/platinum_picon.h
index f5b476f462e..36795304195 100644
--- a/include/configs/platinum_picon.h
+++ b/include/configs/platinum_picon.h
@@ -19,8 +19,6 @@
#define CONFIG_HOSTNAME picon
-#define CONFIG_SYS_PROMPT "picon > "
-
#define CONFIG_PLATFORM_ENV_SETTINGS "\0"
#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_COMMON_ENV_SETTINGS \
diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h
index 9bca10fdf91..ccb6441871b 100644
--- a/include/configs/platinum_titanium.h
+++ b/include/configs/platinum_titanium.h
@@ -26,8 +26,6 @@
#define CONFIG_HOSTNAME titanium
-#define CONFIG_SYS_PROMPT "titanium > "
-
#define CONFIG_PLATFORM_ENV_SETTINGS "\0"
#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_COMMON_ENV_SETTINGS \
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index 7f7ea9754be..1d6df323e8b 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -13,7 +13,6 @@
#include "tegra20-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra20 (Plutux) # "
#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Plutux"
/* Board-specific serial config */
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index f9a1d517474..f4f96a71a05 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -336,7 +336,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_PROMPT "pm9261> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 6c434f06997..bd4357722c0 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -370,7 +370,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_PROMPT "u-boot-pm9263> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index c7938656b32..09f0744b410 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -149,7 +149,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 3a0992a5cfa..8cf3ad84790 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -47,10 +47,6 @@
*/
#include "mv-common.h"
-/* Remove or override few declarations from mv-common.h */
-#undef CONFIG_SYS_PROMPT /* previously defined in mv-common.h */
-#define CONFIG_SYS_PROMPT "PogoE02> "
-
/*
* Environment variables configurations
*/
diff --git a/include/configs/pr1.h b/include/configs/pr1.h
index 3e4aab45f7e..f76e02325f3 100644
--- a/include/configs/pr1.h
+++ b/include/configs/pr1.h
@@ -128,7 +128,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
-#define CONFIG_SYS_PROMPT "pr1>"
#define CONFIG_BOOTCOMMAND "run nandboot"
#define CONFIG_BOOTDELAY 2
#define CONFIG_LOADADDR 0x2000000
diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index 3edeb0812f0..332d79f89f5 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -205,6 +205,7 @@
#define CONFIG_SYS_HUSH_PARSER 1
#define CONFIG_SYS_LONGHELP /* undef to save memory */
+#undef CONFIG_SYS_PROMPT
#ifdef CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_PROMPT "$ " /* Monitor Command Prompt */
#else
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index b22637b3672..a7ec8f54c55 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -78,6 +78,7 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
/* Monitor Command Prompt */
+#undef CONFIG_SYS_PROMPT
#if defined(CONFIG_SYS_LITTLE_ENDIAN)
#define CONFIG_SYS_PROMPT "qemu-mipsel # "
#else
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index fae5b0590b6..4de15bfb756 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -80,6 +80,7 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
/* Monitor Command Prompt */
+#undef CONFIG_SYS_PROMPT
#if defined(CONFIG_SYS_LITTLE_ENDIAN)
#define CONFIG_SYS_PROMPT "qemu-mips64el # "
#else
diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index dd638c485cf..8830a10efb0 100644
--- a/include/configs/rpi-common.h
+++ b/include/configs/rpi-common.h
@@ -115,7 +115,6 @@
/* Shell */
#define CONFIG_SYS_MAXARGS 8
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_COMMAND_HISTORY
/* Commands */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 235bba5de58..aff264bbd29 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -197,7 +197,6 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "Goni # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index e7bace4345f..35fef2b244a 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -12,9 +12,6 @@
#include <configs/exynos4-common.h>
-#define CONFIG_SYS_PROMPT "Universal # " /* Monitor Command Prompt */
-
-
#define CONFIG_TIZEN /* TIZEN lib */
/* Keep L2 Cache Disabled */
diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index f367d62593c..d4ffb467bd8 100644
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -51,7 +51,6 @@
* General options for u-boot. Modify to save memory foot print
*/
#define CONFIG_SYS_LONGHELP /* undef saves memory */
-#define CONFIG_SYS_PROMPT "scb9328> " /* prompt string */
#define CONFIG_SYS_CBSIZE 256 /* console I/O buffer */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* print buffer size */
#define CONFIG_SYS_MAXARGS 16 /* max command args */
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index fdeffb5ab3d..3e904746f29 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -20,7 +20,6 @@
#include "tegra20-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra20 (SeaBoard) # "
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Seaboard"
/* Board-specific serial config */
diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index 114d1fdb678..703f4fcfe92 100644
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -74,9 +74,6 @@
"stderr=serial\0"
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT "SECO MX6Q uQ7 U-Boot > "
-
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index ceac5e08660..bcc8dcbfb25 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -27,7 +27,6 @@
#define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024)
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "U-Boot# "
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index e5aec33307d..d696d4becec 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -154,7 +154,6 @@
/* General Boot Parameter */
#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTCOMMAND "run flashboot"
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 7b4b3b0af93..a6bfa76bf05 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -106,7 +106,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "SMDK2410 # "
#define CONFIG_SYS_CBSIZE 256
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 82d41ccfbb8..f66bb121f32 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -17,7 +17,6 @@
#define CONFIG_BOARD_COMMON
-#define CONFIG_SYS_PROMPT "SMDK5250 # "
#define CONFIG_IDENT_STRING " for SMDK5250"
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 623efa8a622..9cf886c0664 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -27,7 +27,6 @@
#define CONFIG_SERIAL3 /* use SERIAL 3 */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
-#define CONFIG_SYS_PROMPT "SMDK5420 # "
#define CONFIG_IDENT_STRING " for SMDK5420"
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 08a2e9f85eb..4ec9c650dd5 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -152,7 +152,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "SMDKC100 # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index d26e5ecd6fd..dbba88b09c8 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -55,7 +55,6 @@
#define CONFIG_BOOTCOMMAND "fatload mmc 0 40007000 uImage; bootm 40007000"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT "SMDKV310 # "
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
/* memtest works on */
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 70ef9395d77..7758b0f51d0 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -89,7 +89,6 @@
#define CONFIG_USART_ID ATMEL_ID_SYS
#endif
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_PROMPT "Snapper> "
/* I2C - Bit-bashed */
#define CONFIG_SYS_I2C
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index b40c4c0591f..a0ee5bd5a04 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -184,7 +184,6 @@
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PROMPT "Sniper # "
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/snow.h b/include/configs/snow.h
index bf3377cb10c..1d8d8da3973 100644
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -15,7 +15,6 @@
#define CONFIG_BOARD_COMMON
-#define CONFIG_SYS_PROMPT "snow # "
#define CONFIG_IDENT_STRING " for snow"
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
diff --git a/include/configs/snowball.h b/include/configs/snowball.h
index 91aaffab6ae..de03e76ba19 100644
--- a/include/configs/snowball.h
+++ b/include/configs/snowball.h
@@ -154,7 +154,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "U8500 $ " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* Print Buffer Size */
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index f75c306b574..fb1bf66d024 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -201,7 +201,6 @@
#define CONFIG_SYS_MALLOC_LEN (1024*1024)
#define CONFIG_IDENT_STRING "-SPEAr"
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "u-boot> "
#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/spring.h b/include/configs/spring.h
index a692dfd7ec7..8940123f34b 100644
--- a/include/configs/spring.h
+++ b/include/configs/spring.h
@@ -13,7 +13,6 @@
#define CONFIG_BOARD_COMMON
-#define CONFIG_SYS_PROMPT "spring # "
#define CONFIG_IDENT_STRING " for spring"
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
diff --git a/include/configs/stamp9g20.h b/include/configs/stamp9g20.h
index 086ebcfc17f..87df70bdacf 100644
--- a/include/configs/stamp9g20.h
+++ b/include/configs/stamp9g20.h
@@ -180,7 +180,6 @@
/* General Boot Parameter */
#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTCOMMAND "run flashboot"
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 1ac3db69b17..19d9cf9abf3 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -100,7 +100,6 @@
*/
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT "U-Boot > "
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index 887f31a84d1..b1b69197d4f 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -36,7 +36,6 @@
#define CONFIG_PL01X_SERIAL
/* user interface */
-#define CONFIG_SYS_PROMPT "STV0991> "
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
+sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 6676f373f2f..25b7d5f6a69 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -315,7 +315,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "GPPP=> " /* Monitor Command Prompt */
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#else
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 5b1f3ab4034..ee16fea3ae4 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -349,7 +349,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "SSA=> " /* Monitor Command Prompt */
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#else
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index a2cbcf5d954..0ecb91b78df 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -50,8 +50,6 @@
*/
#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_SYS_PROMPT "sunxi# "
-
/* Serial & console */
#define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_SERIAL
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 3eacfa7b14a..408895f3329 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -196,7 +196,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "TAO-3530 # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* turn on command-line edit/hist/auto */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index d5b93eb6e77..2c9f5da55ad 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -165,7 +165,6 @@
"512k(dtb),6M(kernel)ro,-(rootfs) " \
"root=/dev/mtdblock7 rw rootfstype=jffs2"
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 42817aee765..41c2c729502 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -96,7 +96,6 @@
* Console configuration
*/
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "[tb100]:~# "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 14985f859d8..66cb274f68a 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -18,7 +18,6 @@
#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_SYS_PROMPT "Matrix U-Boot> "
#define CONFIG_SYS_HZ 1000
#define CONFIG_IMX6_THERMAL
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 08345cc1e09..32974249b0a 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -11,7 +11,6 @@
#include "tegra30-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra30 (TEC-NG) # "
#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamontenâ„¢ NG Evaluation Carrier"
/* Board-specific serial config */
diff --git a/include/configs/tec.h b/include/configs/tec.h
index 3b543eba6bf..4b8ca5e8da3 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -13,7 +13,6 @@
#include "tegra20-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra20 (TEC) # "
#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Tamonten Evaluation Carrier"
/* Board-specific serial config */
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index ffe167e85ac..145f63587fb 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -87,10 +87,6 @@
#define CONFIG_SYS_STDIO_DEREGISTER
#endif
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_PROMPT V_PROMPT
/*
* Increasing the size of the IO buffer as default nfsargs size is more
* than 256 and so it is not possible to edit it
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index fcfb70e3094..7fa35a15425 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -28,7 +28,6 @@
#define CONFIG_SYS_MALLOC_LEN (1024 << 10)
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* Use HUSH for command parsing */
-#define CONFIG_SYS_PROMPT "U-Boot# "
#define CONFIG_SYS_NO_FLASH
#define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 8d520574195..01d82337415 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -24,7 +24,6 @@
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (32 * 1024))
#define CONFIG_SYS_LONGHELP /* undef save memory */
#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT "u-boot/ti816x# "
#define CONFIG_MACH_TYPE MACH_TYPE_TI8168EVM
#define CONFIG_OF_LIBFDT
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 6dc5ebdd349..18fca02c4c3 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -115,7 +115,6 @@
#define CONFIG_SYS_MALLOC_LEN (16 << 20)
#endif
#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT "U-Boot# "
#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_BAUDRATE 115200
#define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 49aa3c7de33..1b4ca295bc8 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -141,9 +141,6 @@
#define CONFIG_BOOTCOMMAND "run nand_ubifs"
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT "Titanium > "
-
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 6808e789f35..5fb991be5dc 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -12,8 +12,6 @@
#include <configs/exynos4-common.h>
-#define CONFIG_SYS_PROMPT "Trats # " /* Monitor Command Prompt */
-
#define CONFIG_TRATS
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 94c31fbf2b4..f12a9528d65 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -13,9 +13,6 @@
#include <configs/exynos4-common.h>
-#define CONFIG_SYS_PROMPT "Trats2 # " /* Monitor Command Prompt */
-
-
#define CONFIG_TIZEN /* TIZEN lib */
#define CONFIG_SYS_L2CACHE_OFF
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 23bf599ec5a..f04b572985e 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -284,7 +284,6 @@
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_CMDLINE_EDITING /* enable cmdline history */
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_PROMPT "OMAP3 Tricorder # "
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 2db38e5b93a..2ab5511632e 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -12,7 +12,6 @@
#include "tegra20-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra20 (TrimSlice) # "
#define CONFIG_TEGRA_BOARD_STRING "Compulab Trimslice"
/* Board-specific serial config */
diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 8368931e7b7..40c8d718d83 100644
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -130,6 +130,7 @@
#define CONFIG_SYS_HUSH_PARSER 1
#define CONFIG_SYS_LONGHELP /* undef to save memory */
+#undef CONFIG_SYS_PROMPT
#ifdef CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_PROMPT "$ " /* Monitor Command Prompt */
#else
diff --git a/include/configs/tt01.h b/include/configs/tt01.h
index 9501a830d50..ca1e2e25fb5 100644
--- a/include/configs/tt01.h
+++ b/include/configs/tt01.h
@@ -224,7 +224,6 @@
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "TT01> "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/twister.h b/include/configs/twister.h
index f24dc136caa..4f5560fec3b 100644
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -29,8 +29,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_PROMPT "twister => "
-
#define CONFIG_SMC911X
#define CONFIG_SMC911X_16_BIT
#define CONFIG_SMC911X_BASE 0x2C000000
diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h
index 6a225710c2c..a8cc0306cb1 100644
--- a/include/configs/u8500_href.h
+++ b/include/configs/u8500_href.h
@@ -111,7 +111,6 @@
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "U8500 $ " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* Print Buffer Size */
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 4774de5c9a6..10a1664f020 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -140,7 +140,6 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/v5fx30teval.h b/include/configs/v5fx30teval.h
index f30a0904a3f..298fa3e6d0a 100644
--- a/include/configs/v5fx30teval.h
+++ b/include/configs/v5fx30teval.h
@@ -24,7 +24,6 @@
#define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
/*Misc*/
-#define CONFIG_SYS_PROMPT "v5fx30t:/# " /* Monitor Command Prompt */
#define CONFIG_PREBOOT "echo U-Boot is up and runnining;"
/*Flash*/
diff --git a/include/configs/vct.h b/include/configs/vct.h
index b54519d3d1f..80f6a60d84f 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -145,7 +145,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "VCT# " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 8b1189e7c4b..0fc8cf7674d 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -13,7 +13,6 @@
#include "tegra124-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra124 (Venice2) # "
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Venice2"
/* Board-specific serial config */
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 3f1ebcd552f..e9c35001094 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -12,7 +12,6 @@
#include "tegra20-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra20 (Ventana) # "
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Ventana"
/* Board-specific serial config */
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index de23375cd5e..636ca436d9f 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -108,6 +108,7 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Monitor Command Prompt */
+#undef CONFIG_SYS_PROMPT
#ifdef CONFIG_ARCH_VERSATILE_AB
# define CONFIG_SYS_PROMPT "VersatileAB # "
#else
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index c36237f3ebe..6107c64dd2a 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -239,7 +239,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PROMPT "VExpress64# "
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index bed8ffd4a05..98f6ae94e68 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -281,7 +281,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PROMPT "VExpress# "
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index 93c7348981a..b43373f1344 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -137,7 +137,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "Vision II U-boot > "
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h
index e4958ce5653..3facd7f257c 100644
--- a/include/configs/vl_ma2sc.h
+++ b/include/configs/vl_ma2sc.h
@@ -340,7 +340,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE {312500, 230400, 115200, 19200, \
38400, 57600, 9600 }
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
#define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index 95a69b3978a..976ba5db742 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -126,7 +126,6 @@
#define CONFIG_SYS_LONGHELP
#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT "$ "
#else
#endif
#define CONFIG_SYS_CBSIZE 256
diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index 13cc3d3c30a..ff859644c36 100644
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -12,7 +12,6 @@
#include "tegra20-common.h"
/* High-level configuration options */
-#define V_PROMPT "Tegra20 (Whistler) # "
#define CONFIG_TEGRA_BOARD_STRING "NVIDIA Whistler"
/* Board-specific serial config */
diff --git a/include/configs/wireless_space.h b/include/configs/wireless_space.h
index 72190340f3b..191ac1b73f1 100644
--- a/include/configs/wireless_space.h
+++ b/include/configs/wireless_space.h
@@ -64,8 +64,6 @@
#undef CONFIG_SYS_IDE_MAXDEVICE
#define CONFIG_SYS_IDE_MAXBUS 1
#define CONFIG_SYS_IDE_MAXDEVICE 1
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "ws> "
/*
* Ethernet Driver configuration
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 52d392cb16e..5d9f5297ce8 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -130,7 +130,6 @@
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "woodburn U-Boot > "
#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */
diff --git a/include/configs/x600.h b/include/configs/x600.h
index 1d4c1a98269..edb16b1a70d 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -151,7 +151,6 @@
#define CONFIG_SYS_MALLOC_LEN (1024 * 1024)
#define CONFIG_IDENT_STRING "-SPEAr"
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "X600> "
#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index a072464c108..8d19bffa025 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -94,7 +94,7 @@
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER 1
-
+#undef CONFIG_SYS_PROMPT
#ifdef CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_PROMPT "u-boot$ " /* Monitor Command Prompt */
#else
diff --git a/include/configs/xilinx-ppc405-generic.h b/include/configs/xilinx-ppc405-generic.h
index 75b119f8556..40fa0878a43 100644
--- a/include/configs/xilinx-ppc405-generic.h
+++ b/include/configs/xilinx-ppc405-generic.h
@@ -26,7 +26,6 @@
#define CONFIG_ENV_OVERWRITE 1
/*Misc*/
-#define CONFIG_SYS_PROMPT "xlx-ppc405:/# " /* Monitor Command Prompt */
#define CONFIG_PREBOOT "echo U-Boot is up and runnining;"
/*Flash*/
diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h
index 8e684151efe..95b88340783 100644
--- a/include/configs/xilinx-ppc440-generic.h
+++ b/include/configs/xilinx-ppc440-generic.h
@@ -24,7 +24,6 @@
#define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
/*Misc*/
-#define CONFIG_SYS_PROMPT "board:/# " /* Monitor Command Prompt */
#define CONFIG_PREBOOT "echo U-Boot is up and runnining;"
/*Flash*/
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 68853b64de5..01b7993bb6b 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -131,7 +131,6 @@
/* Monitor Command Prompt */
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 2048
-#define CONFIG_SYS_PROMPT "ZynqMP> "
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_HUSH_PARSER
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index cff3ba837c9..0199190eb87 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -119,9 +119,6 @@ unsigned char zipitz2_spi_read(void);
#define CONFIG_SYS_HUSH_PARSER 1
#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT "$ " /* Monitor Command Prompt */
-#endif
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index af7cc497513..81b9ce40d9e 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -138,7 +138,6 @@
#define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM + (512*1024))
#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM + PHYS_SDRAM_SIZE)
-#define CONFIG_SYS_PROMPT "zmx25> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 98bebd02f1d..cc72c8689a3 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -235,7 +235,6 @@
#define CONFIG_SYS_LOAD_ADDR 0 /* default? */
/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT "zynq-uboot> "
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_CMDLINE_EDITING
--
GitLab