* [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig
@ 2018-02-02 20:37 Adam Ford
2018-02-02 20:37 ` [U-Boot] [PATCH 2/2] Remove config_distro_defaults.h Adam Ford
0 siblings, 1 reply; 3+ messages in thread
From: Adam Ford @ 2018-02-02 20:37 UTC (permalink / raw)
To: u-boot
This converts the following to Kconfig:
CONFIG_BOOTP_BOOTPATH
CONFIG_BOOTP_DNS
CONFIG_BOOTP_GATEWAY
CONFIG_BOOTP_HOSTNAME
CONFIG_BOOTP_PXE
CONFIG_BOOTP_SUBNETMASK
CONFIG_CMDLINE_EDITING
CONFIG_AUTO_COMPLETE
CONFIG_SYS_LONGHELP
CONFIG_SUPPORT_RAW_INITRD
CONFIG_ENV_VARS_UBOOT_CONFIG
Signed-off-by: Adam Ford <aford173@gmail.com>
---
Kconfig | 34 +++++++++++++++++++++++++
cmd/Kconfig | 9 +++++++
configs/amcore_defconfig | 1 +
configs/colibri_pxa270_defconfig | 3 +++
configs/colibri_vf_defconfig | 1 +
configs/devkit8000_defconfig | 1 +
configs/s32v234evb_defconfig | 1 +
configs/vct_platinum_onenand_small_defconfig | 1 +
configs/vct_platinum_small_defconfig | 1 +
configs/vct_platinumavc_onenand_small_defconfig | 1 +
configs/vct_platinumavc_small_defconfig | 1 +
configs/vct_premium_onenand_small_defconfig | 1 +
configs/vct_premium_small_defconfig | 1 +
configs/vf610twr_defconfig | 1 +
configs/vf610twr_nand_defconfig | 1 +
configs/zynq_cse_qspi_defconfig | 3 +++
include/config_distro_defaults.h | 13 ----------
include/config_fallbacks.h | 5 ----
include/configs/10m50_devboard.h | 6 -----
include/configs/3c120_devboard.h | 6 -----
include/configs/B4860QDS.h | 3 ---
include/configs/BSC9131RDB.h | 3 ---
include/configs/BSC9132QDS.h | 3 ---
include/configs/C29XPCIE.h | 3 ---
include/configs/M5208EVBE.h | 1 -
include/configs/M52277EVB.h | 5 ----
include/configs/M5235EVB.h | 4 ---
include/configs/M5249EVB.h | 6 -----
include/configs/M5253DEMO.h | 2 --
include/configs/M5253EVBE.h | 5 ----
include/configs/M5272C3.h | 5 ----
include/configs/M5275EVB.h | 5 ----
include/configs/M5282EVB.h | 5 ----
include/configs/M53017EVB.h | 1 -
include/configs/M5329EVB.h | 1 -
include/configs/M5373EVB.h | 1 -
include/configs/M54418TWR.h | 5 ----
include/configs/M54451EVB.h | 5 ----
include/configs/M54455EVB.h | 5 ----
include/configs/M5475EVB.h | 1 -
include/configs/M5485EVB.h | 1 -
include/configs/MCR3000.h | 2 --
include/configs/MPC8308RDB.h | 6 -----
include/configs/MPC8313ERDB.h | 7 -----
include/configs/MPC8315ERDB.h | 7 -----
include/configs/MPC8323ERDB.h | 7 -----
include/configs/MPC832XEMDS.h | 7 -----
include/configs/MPC8349EMDS.h | 7 -----
include/configs/MPC8349ITX.h | 6 -----
include/configs/MPC837XEMDS.h | 7 -----
include/configs/MPC837XERDB.h | 7 -----
include/configs/MPC8536DS.h | 3 ---
include/configs/MPC8540ADS.h | 6 -----
include/configs/MPC8541CDS.h | 6 -----
include/configs/MPC8544DS.h | 6 -----
include/configs/MPC8548CDS.h | 6 -----
include/configs/MPC8555CDS.h | 6 -----
include/configs/MPC8560ADS.h | 6 -----
include/configs/MPC8568MDS.h | 6 -----
include/configs/MPC8569MDS.h | 6 -----
include/configs/MPC8572DS.h | 3 ---
include/configs/MPC8610HPCD.h | 5 ----
include/configs/MPC8641HPCN.h | 5 ----
include/configs/MigoR.h | 1 -
include/configs/P1010RDB.h | 3 ---
include/configs/P1022DS.h | 3 ---
include/configs/P1023RDB.h | 2 --
include/configs/P2041RDB.h | 3 ---
include/configs/T102xQDS.h | 3 ---
include/configs/T102xRDB.h | 3 ---
include/configs/T1040QDS.h | 3 ---
include/configs/T104xRDB.h | 3 ---
include/configs/T208xQDS.h | 3 ---
include/configs/T208xRDB.h | 3 ---
include/configs/T4240RDB.h | 3 ---
include/configs/TQM834x.h | 7 -----
include/configs/UCP1020.h | 2 --
include/configs/adp-ae3xx.h | 3 ---
include/configs/adp-ag101p.h | 3 ---
include/configs/advantech_dms-ba16.h | 4 ---
include/configs/am335x_shc.h | 4 ---
include/configs/am3517_crane.h | 2 --
include/configs/am3517_evm.h | 4 ---
include/configs/am43xx_evm.h | 3 ---
include/configs/am57xx_evm.h | 3 ---
include/configs/amcore.h | 2 --
include/configs/ap121.h | 3 ---
include/configs/ap143.h | 3 ---
include/configs/ap325rxa.h | 1 -
include/configs/ap_sh4a_4a.h | 1 -
include/configs/apalis-tk1.h | 1 -
include/configs/apalis_imx6.h | 7 -----
include/configs/apf27.h | 9 -------
include/configs/armadillo-800eva.h | 1 -
include/configs/aspeed-common.h | 7 -----
include/configs/astro_mcf5373l.h | 4 ---
include/configs/at91-sama5_common.h | 9 -------
include/configs/at91rm9200ek.h | 3 ---
include/configs/at91sam9260ek.h | 7 -----
include/configs/at91sam9261ek.h | 7 -----
include/configs/at91sam9263ek.h | 7 -----
include/configs/at91sam9m10g45ek.h | 7 -----
include/configs/at91sam9n12ek.h | 7 -----
include/configs/at91sam9rlek.h | 4 ---
include/configs/at91sam9x5ek.h | 7 -----
include/configs/axs10x.h | 4 ---
include/configs/bcm23550_w1d.h | 3 ---
include/configs/bcm28155_ap.h | 3 ---
include/configs/bcm_ep_board.h | 3 ---
include/configs/bcm_northstar2.h | 2 --
include/configs/boston.h | 1 -
include/configs/bur_cfg_common.h | 6 -----
include/configs/calimain.h | 4 ---
include/configs/cl-som-am57x.h | 3 ---
include/configs/cm_t35.h | 3 ---
include/configs/cm_t3517.h | 3 ---
include/configs/cm_t43.h | 1 -
include/configs/cobra5272.h | 5 ----
include/configs/colibri_imx6.h | 7 -----
include/configs/colibri_imx7.h | 2 --
include/configs/colibri_pxa270.h | 7 -----
include/configs/colibri_vf.h | 4 ---
include/configs/comtrend_ar5315u.h | 3 ---
include/configs/comtrend_ar5387un.h | 3 ---
include/configs/comtrend_ct5361.h | 4 ---
include/configs/comtrend_vr3032u.h | 3 ---
include/configs/comtrend_wap5813n.h | 4 ---
include/configs/controlcenterd.h | 5 ----
include/configs/corenet_ds.h | 3 ---
include/configs/corvus.h | 7 -----
include/configs/cyrus.h | 3 ---
include/configs/da850evm.h | 4 ---
include/configs/dbau1x00.h | 4 ---
include/configs/devkit3250.h | 4 ---
include/configs/devkit8000.h | 7 -----
include/configs/dh_imx6.h | 4 ---
include/configs/dra7xx_evm.h | 3 ---
include/configs/dragonboard410c.h | 1 -
include/configs/dragonboard820c.h | 1 -
include/configs/ea20.h | 4 ---
include/configs/eb_cpu5282.h | 6 -----
include/configs/eco5pk.h | 1 -
include/configs/ecovec.h | 1 -
include/configs/edb93xx.h | 1 -
include/configs/edison.h | 3 ---
include/configs/edminiv2.h | 2 --
include/configs/espt.h | 1 -
include/configs/ethernut5.h | 5 ----
include/configs/flea3.h | 6 -----
include/configs/ge_bx50v3.h | 4 ---
include/configs/hikey.h | 5 ----
include/configs/hrcon.h | 4 ---
include/configs/hsdk.h | 3 ---
include/configs/huawei_hg556a.h | 4 ---
include/configs/ids8313.h | 6 -----
include/configs/imgtec_xilfpga.h | 1 -
include/configs/imx27lite-common.h | 2 --
include/configs/imx31_phycore.h | 3 ---
include/configs/integrator-common.h | 1 -
include/configs/integratorap.h | 3 ---
include/configs/ipam390.h | 4 ---
include/configs/kc1.h | 4 ---
include/configs/km/keymile-common.h | 6 -----
include/configs/kzm9g.h | 1 -
include/configs/legoev3.h | 3 ---
include/configs/liteboard.h | 2 --
include/configs/ls1012a_common.h | 4 ---
include/configs/ls1021aiot.h | 3 ---
include/configs/ls1021aqds.h | 3 ---
include/configs/ls1021atwr.h | 2 --
include/configs/ls1043a_common.h | 10 --------
include/configs/ls1043aqds.h | 2 --
include/configs/ls1046a_common.h | 4 ---
include/configs/ls1046aqds.h | 2 --
include/configs/ls1088a_common.h | 7 -----
include/configs/ls1088aqds.h | 1 -
include/configs/ls1088ardb.h | 1 -
include/configs/ls2080a_common.h | 5 ----
include/configs/ls2080ardb.h | 1 -
include/configs/lsxl.h | 1 -
include/configs/m53evk.h | 3 ---
include/configs/malta.h | 5 ----
include/configs/mcx.h | 5 ----
include/configs/meesc.h | 6 -----
include/configs/meson-gxbb-common.h | 3 ---
include/configs/microblaze-generic.h | 6 -----
include/configs/mpc8308_p1m.h | 6 -----
include/configs/mpr2.h | 1 -
include/configs/ms7720se.h | 1 -
include/configs/ms7722se.h | 1 -
include/configs/ms7750se.h | 1 -
include/configs/mt_ventoux.h | 1 -
include/configs/mv-common.h | 3 ---
include/configs/mvebu_armada-8k.h | 3 ---
include/configs/mx25pdk.h | 5 ----
include/configs/mx31ads.h | 3 ---
include/configs/mx31pdk.h | 3 ---
include/configs/mx35pdk.h | 7 -----
include/configs/mx51evk.h | 4 ---
include/configs/mx53ard.h | 4 ---
include/configs/mx53cx9020.h | 5 ----
include/configs/mx53evk.h | 4 ---
include/configs/mx53loco.h | 5 ----
include/configs/mx53ppd.h | 7 -----
include/configs/mx53smd.h | 4 ---
include/configs/mx6_common.h | 4 ---
include/configs/mx6ul_14x14_evk.h | 2 --
include/configs/mx7_common.h | 3 ---
include/configs/mx7ulp_evk.h | 5 ----
include/configs/mxs.h | 3 ---
include/configs/nas220.h | 3 ---
include/configs/netgear_cg3100d.h | 3 ---
include/configs/nokia_rx51.h | 4 ---
include/configs/nsim.h | 3 ---
include/configs/nx25-ae250.h | 2 --
include/configs/omapl138_lcdk.h | 4 ---
include/configs/origen.h | 2 --
include/configs/p1_p2_rdb_pc.h | 2 --
include/configs/p1_twr.h | 2 --
include/configs/pb1x00.h | 4 ---
include/configs/pcm052.h | 3 ---
include/configs/pic32mzdask.h | 5 ----
include/configs/pico-imx6ul.h | 2 --
include/configs/picosam9g45.h | 7 -----
include/configs/pm9261.h | 6 -----
include/configs/pm9263.h | 6 -----
include/configs/pm9g45.h | 7 -----
include/configs/poplar.h | 3 ---
include/configs/qemu-mips.h | 7 -----
include/configs/qemu-mips64.h | 7 -----
include/configs/qemu-ppce500.h | 3 ---
include/configs/r0p7734.h | 1 -
include/configs/r2dplus.h | 1 -
include/configs/r7780mp.h | 1 -
include/configs/rcar-gen2-common.h | 2 --
include/configs/rcar-gen3-common.h | 3 ---
include/configs/rpi.h | 2 --
include/configs/rsk7203.h | 1 -
include/configs/rsk7264.h | 1 -
include/configs/rsk7269.h | 1 -
include/configs/s32v234evb.h | 7 -----
include/configs/s5p_goni.h | 3 ---
include/configs/s5pc210_universal.h | 1 -
include/configs/sagem_f at st1704.h | 3 ---
include/configs/sandbox.h | 4 ---
include/configs/sbc8349.h | 7 -----
include/configs/sbc8548.h | 6 -----
include/configs/sbc8641d.h | 2 --
include/configs/sfr_nb4_ser.h | 4 ---
include/configs/sh7752evb.h | 3 ---
include/configs/sh7753evb.h | 3 ---
include/configs/sh7757lcr.h | 1 -
include/configs/sh7763rdp.h | 1 -
include/configs/sh7785lcr.h | 1 -
include/configs/shmin.h | 1 -
include/configs/siemens-am33x-common.h | 8 ------
include/configs/smartweb.h | 7 -----
include/configs/smdkc100.h | 2 --
include/configs/snapper9260.h | 6 -----
include/configs/snapper9g45.h | 6 -----
include/configs/sniper.h | 4 ---
include/configs/socfpga_common.h | 3 ---
include/configs/socrates.h | 7 -----
include/configs/spear-common.h | 2 --
include/configs/stih410-b2260.h | 7 -----
include/configs/stm32f429-discovery.h | 3 ---
include/configs/stm32f429-evaluation.h | 3 ---
include/configs/stm32f469-discovery.h | 3 ---
include/configs/stm32f746-disco.h | 3 ---
include/configs/stm32h743-disco.h | 3 ---
include/configs/stm32h743-eval.h | 3 ---
include/configs/stmark2.h | 2 --
include/configs/strider.h | 4 ---
include/configs/stv0991.h | 2 --
include/configs/t4qds.h | 3 ---
include/configs/tam3517-common.h | 6 -----
include/configs/tao3530.h | 3 ---
include/configs/taurus.h | 4 ---
include/configs/tb100.h | 4 ---
include/configs/tegra-common.h | 2 --
include/configs/thunderx_88xx.h | 6 -----
include/configs/ti814x_evm.h | 5 ----
include/configs/ti816x_evm.h | 3 ---
include/configs/ti_am335x_common.h | 3 ---
include/configs/ti_armv7_common.h | 6 -----
include/configs/ti_armv7_keystone2.h | 1 -
include/configs/tplink_wdr4300.h | 3 ---
include/configs/trats.h | 1 -
include/configs/trats2.h | 1 -
include/configs/tricorder.h | 3 ---
include/configs/ts4800.h | 4 ---
include/configs/uniphier.h | 5 ----
include/configs/usb_a9263.h | 7 -----
include/configs/vct.h | 7 -----
include/configs/ve8313.h | 7 -----
include/configs/vexpress_aemv8a.h | 8 ------
include/configs/vexpress_common.h | 4 ---
include/configs/vf610twr.h | 2 --
include/configs/vme8349.h | 7 -----
include/configs/wb45n.h | 6 -----
include/configs/wb50n.h | 6 -----
include/configs/woodburn_common.h | 7 -----
include/configs/work_92105.h | 4 ---
include/configs/x600.h | 3 ---
include/configs/x86-common.h | 7 -----
include/configs/xilinx_zynqmp.h | 13 ----------
include/configs/xpedite517x.h | 2 --
include/configs/xpedite520x.h | 5 ----
include/configs/xpedite537x.h | 3 ---
include/configs/xpedite550x.h | 3 ---
include/configs/xpress.h | 2 --
include/configs/xtfpga.h | 3 ---
include/configs/zipitz2.h | 2 --
include/configs/zmx25.h | 6 -----
include/configs/zynq-common.h | 6 -----
include/configs/zynq_cse.h | 4 ---
net/Kconfig | 24 +++++++++++++++++
scripts/config_whitelist.txt | 11 --------
318 files changed, 85 insertions(+), 1182 deletions(-)
diff --git a/Kconfig b/Kconfig
index f713c6a..d192ce4 100644
--- a/Kconfig
+++ b/Kconfig
@@ -83,12 +83,46 @@ config DISTRO_DEFAULTS
Select this to enable various options and commands which are suitable
for building u-boot for booting general purpose Linux distributions.
+config ENV_VARS_UBOOT_CONFIG
+ bool "Add arch, board, vendor and soc variables to default environment"
+ default y
+ help
+ Define this in order to add variables describing the
+ U-Boot build configuration to the default environment.
+ These will be named arch, cpu, board, vendor, and soc.
+ Enabling this option will cause the following to be defined:
+ - CONFIG_SYS_ARCH
+ - CONFIG_SYS_CPU
+ - CONFIG_SYS_BOARD
+ - CONFIG_SYS_VENDOR
+ - CONFIG_SYS_SOC
+
config SYS_BOOT_GET_CMDLINE
bool "Enable kernel command line setup"
help
Enables allocating and saving kernel cmdline in space between
"bootm_low" and "bootm_low" + BOOTMAPSZ.
+config CMDLINE_EDITING
+ bool "Enable command line editing"
+ default y
+ help
+ Enable editing and History functions for interactive command line
+ input operations
+
+config AUTO_COMPLETE
+ bool "Enable auto complete using TAB"
+ default y
+ help
+ Enable auto completion of commands using TAB.
+
+config SYS_LONGHELP
+ bool "Enable long help messages"
+ default y
+ help
+ Defined when you want long help messages included
+ Do not set this option when short of memory.
+
config SYS_BOOT_GET_KBD
bool "Enable kernel board information setup"
help
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 676011d..43462b7 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -189,6 +189,15 @@ config CMD_BOOTZ
help
Boot the Linux zImage
+config SUPPORT_RAW_INITRD
+ bool "Enable raw initrd images"
+ default y
+ help
+ Note, defining the SUPPORT_RAW_INITRD allows user to supply
+ kernel with raw initrd images. The syntax is slightly different, the
+ address of the initrd must be augmented by it's size, in the following
+ format: "<initrd addres>:<initrd size>".
+
config CMD_BOOTI
bool "booti"
depends on ARM64
diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig
index 3332a31..0ed5de7 100644
--- a/configs/amcore_defconfig
+++ b/configs/amcore_defconfig
@@ -2,6 +2,7 @@ CONFIG_M68K=y
CONFIG_SYS_TEXT_BASE=0xffc00000
CONFIG_SYS_MALLOC_F_LEN=0x800
CONFIG_TARGET_AMCORE=y
+# CONFIG_SYS_LONGHELP is not set
CONFIG_BOOTDELAY=1
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
index 9720b5f..24fa692 100644
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -1,5 +1,8 @@
CONFIG_ARM=y
CONFIG_TARGET_COLIBRI_PXA270=y
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
+# CONFIG_SYS_LONGHELP is not set
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=tty0 console=ttyS0,115200"
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
index 9b8c407..cc77128 100644
--- a/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y
CONFIG_ARCH_VF610=y
CONFIG_TARGET_COLIBRI_VF=y
CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
+# CONFIG_AUTO_COMPLETE is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,IMX_NAND"
CONFIG_BOOTDELAY=1
CONFIG_LOGLEVEL=3
diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index 0d970ca..0bec85b 100644
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -7,6 +7,7 @@ CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y
CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y
+# CONFIG_SUPPORT_RAW_INITRD is not set
# CONFIG_CMD_IMI is not set
CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_NAND_OFS=0x680000
diff --git a/configs/s32v234evb_defconfig b/configs/s32v234evb_defconfig
index c3d199e..0aafea0 100644
--- a/configs/s32v234evb_defconfig
+++ b/configs/s32v234evb_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_TARGET_S32V234EVB=y
CONFIG_DISTRO_DEFAULTS=y
+# CONFIG_AUTO_COMPLETE is not set
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/s32v234evb/s32v234evb.cfg"
CONFIG_USE_BOOTARGS=y
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index c0c5afd..a5573f7 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUM=y
CONFIG_VCT_ONENAND=y
CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_SYS_LONGHELP is not set
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig
index 5c53850..b927e3f 100644
--- a/configs/vct_platinum_small_defconfig
+++ b/configs/vct_platinum_small_defconfig
@@ -2,6 +2,7 @@ CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUM=y
CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_SYS_LONGHELP is not set
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index 75ba8f2..1dcbed5 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUMAVC=y
CONFIG_VCT_ONENAND=y
CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_SYS_LONGHELP is not set
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig
index 9931f5f..ebf1166 100644
--- a/configs/vct_platinumavc_small_defconfig
+++ b/configs/vct_platinumavc_small_defconfig
@@ -2,6 +2,7 @@ CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PLATINUMAVC=y
CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_SYS_LONGHELP is not set
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index 6dfeab5..de77c0d 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y
CONFIG_VCT_PREMIUM=y
CONFIG_VCT_ONENAND=y
CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_SYS_LONGHELP is not set
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig
index b0ec5f2..bad1e60 100644
--- a/configs/vct_premium_small_defconfig
+++ b/configs/vct_premium_small_defconfig
@@ -2,6 +2,7 @@ CONFIG_MIPS=y
CONFIG_TARGET_VCT=y
CONFIG_VCT_PREMIUM=y
CONFIG_VCT_SMALL_IMAGE=y
+# CONFIG_SYS_LONGHELP is not set
CONFIG_BOOTDELAY=5
CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SYS_PROMPT="$ "
diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig
index 46d1ea4..0d4ee5b 100644
--- a/configs/vf610twr_defconfig
+++ b/configs/vf610twr_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_VF610=y
CONFIG_DEFAULT_DEVICE_TREE="vf610-twr"
+# CONFIG_AUTO_COMPLETE is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg"
CONFIG_BOOTDELAY=3
CONFIG_LOGLEVEL=3
diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig
index 6be20f5..8529216 100644
--- a/configs/vf610twr_nand_defconfig
+++ b/configs/vf610twr_nand_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_VF610=y
CONFIG_DEFAULT_DEVICE_TREE="vf610-twr"
+# CONFIG_AUTO_COMPLETE is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg"
CONFIG_BOOTDELAY=3
CONFIG_LOGLEVEL=3
diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig
index 9659fae..8ce92a0 100644
--- a/configs/zynq_cse_qspi_defconfig
+++ b/configs/zynq_cse_qspi_defconfig
@@ -6,6 +6,9 @@ CONFIG_SPL_STACK_R_ADDR=0x200000
# CONFIG_ZYNQ_DDRC_INIT is not set
CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-qspi-single"
CONFIG_DEBUG_UART=y
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
+# CONFIG_SYS_LONGHELP is not set
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
CONFIG_BOOTDELAY=-1
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 41bbfb9..35e704e 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -13,17 +13,4 @@
* consistent manner.
*/
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_PXE
-#define CONFIG_BOOTP_SUBNETMASK
-
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SUPPORT_RAW_INITRD
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
-
#endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index 9695ee7..805df51 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -92,9 +92,4 @@
# endif
#endif
-#ifndef CONFIG_CMDLINE
-#undef CONFIG_CMDLINE_EDITING
-#undef CONFIG_SYS_LONGHELP
-#endif
-
#endif /* __CONFIG_FALLBACKS_H */
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index ec30ed0..c9742f3 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -37,9 +37,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* FDT options
@@ -77,7 +74,6 @@
/*
* MISC
*/
-#define CONFIG_SYS_LONGHELP /* Provide extended help */
#define CONFIG_SYS_LOAD_ADDR 0xcc000000 /* Half of RAM */
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
@@ -85,7 +81,5 @@
CONFIG_ENV_SIZE - \
CONFIG_SYS_MALLOC_LEN - \
0x10000)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#endif /* __CONFIG_H */
diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index f934a17..afd6488 100644
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -40,9 +40,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* FDT options
@@ -80,7 +77,6 @@
/*
* MISC
*/
-#define CONFIG_SYS_LONGHELP /* Provide extended help */
#define CONFIG_SYS_LOAD_ADDR 0xd4000000 /* Half of RAM */
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
@@ -88,7 +84,5 @@
CONFIG_ENV_SIZE - \
CONFIG_SYS_MALLOC_LEN - \
0x10000)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#endif /* __CONFIG_H */
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 6c0ea17..5c1612d 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -701,9 +701,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 35712c0..27e3584 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -286,9 +286,6 @@ extern unsigned long get_sdram_size(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#if defined(CONFIG_CMD_KGDB)
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 1378bf2..b79de18 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -509,9 +509,6 @@ combinations. this should be removed later
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 52ac738..8c33abf 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -425,9 +425,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index fca3adb..5c04eb3 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -77,7 +77,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x40010000
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 584882f..f2a84ba 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -30,9 +30,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_HOSTNAME M52277EVB
#define CONFIG_SYS_UBOOT_END 0x3FFFF
@@ -127,8 +124,6 @@
#define CONFIG_PRAM 2048 /* 2048 KB */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x10000)
#define CONFIG_SYS_MBAR 0xFC000000
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index ffecbad..c4b699f 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -29,9 +29,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_MCFFEC
#ifdef CONFIG_MCFFEC
@@ -92,7 +89,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE+0x20000)
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index ccd40b2..6b37e46 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -31,18 +31,12 @@
* BOOTP options
*/
#undef CONFIG_BOOTP_BOOTFILESIZE
-#undef CONFIG_BOOTP_BOOTPATH
-#undef CONFIG_BOOTP_GATEWAY
-#undef CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */
-#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */
#define CONFIG_SYS_LOAD_ADDR 0x200000 /* default load address */
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index f89007a..7186084 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -89,8 +89,6 @@
#define CONFIG_SYS_I2C_PINMUX_CLR (0xFFFFE7FF)
#define CONFIG_SYS_I2C_PINMUX_SET (0)
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_LOAD_ADDR 0x00100000
#define CONFIG_SYS_MEMTEST_START 0x400
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index 8d7250a..daa44b3 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -35,9 +35,6 @@
* BOOTP options
*/
#undef CONFIG_BOOTP_BOOTFILESIZE
-#undef CONFIG_BOOTP_BOOTPATH
-#undef CONFIG_BOOTP_GATEWAY
-#undef CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -60,8 +57,6 @@
#define CONFIG_SYS_ATA_ALT_OFFSET 0xC0 /* Offset for alternate registers */
#define CONFIG_SYS_ATA_STRIDE 4 /* Interval between registers */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_LOAD_ADDR 0x00100000
#define CONFIG_SYS_MEMTEST_START 0x400
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 52ca7de..936a91e 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -46,9 +46,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -96,8 +93,6 @@
"save\0" \
""
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_LOAD_ADDR 0x20000
#define CONFIG_SYS_MEMTEST_START 0x400
#define CONFIG_SYS_MEMTEST_END 0x380000
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 5cc2cdf..815de50 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -46,9 +46,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* Available command configuration */
@@ -86,8 +83,6 @@
#define CONFIG_SYS_I2C_PINMUX_CLR (0xFFF0)
#define CONFIG_SYS_I2C_PINMUX_SET (0x000F)
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_LOAD_ADDR 0x800000
#define CONFIG_BOOTCOMMAND "bootm ffe40000"
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 3886469..b295150 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -38,9 +38,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -88,8 +85,6 @@
"save\0" \
""
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_LOAD_ADDR 0x20000
#define CONFIG_SYS_MEMTEST_START 0x400
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 5045ad5..c322417 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -94,7 +94,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x40010000
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index f0a8c9d..2272dc2 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -86,7 +86,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x40010000
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 9ff15da..89e024f 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -86,7 +86,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x40010000
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 3e2b6e1..4f91ef9 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -33,9 +33,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* NAND FLASH
@@ -177,8 +174,6 @@
#define CONFIG_PRAM 2048 /* 2048 KB */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x10000)
#define CONFIG_SYS_MBAR 0xFC000000
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 5a66dda..4c771b4 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -33,9 +33,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* Network configuration */
#define CONFIG_MCFFEC
@@ -141,8 +138,6 @@
#define CONFIG_PRAM 2048 /* 2048 KB */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x10000)
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index b583660..6128e97 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -33,9 +33,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* Network configuration */
#define CONFIG_MCFFEC
@@ -192,8 +189,6 @@
#define CONFIG_PRAM 2048 /* 2048 KB */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x10000)
#define CONFIG_SYS_MBAR 0xFC000000
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 24ecc62..96fa12c 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -123,7 +123,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x00010000
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index a6a820b..111c8d8 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -111,7 +111,6 @@
""
#define CONFIG_PRAM 512 /* 512 KB */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x00010000
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 9d2c486..6b03873 100644
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -69,9 +69,7 @@
#define CONFIG_WATCHDOG 1 /* watchdog enabled */
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING 1
#ifdef CONFIG_HUSH_PARSER
#define CONFIG_SYS_PROMPT_HUSH_PS2 "S3K> "
#endif
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 9ad1cf9..ff72922 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -406,20 +406,14 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
*/
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index c20a984..4c9e90c 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -452,21 +452,14 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
*/
-#define CONFIG_CMDLINE_EDITING 1
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 2bdec42..1b59221 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -428,23 +428,16 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
*/
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 0ae48e6..dfa5f59 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -218,9 +218,6 @@
#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500)
#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600)
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
/* I2C */
#define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_FSL_I2C_SPEED 400000
@@ -310,9 +307,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -323,7 +317,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index fdbac9b..723a5f6 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -299,9 +299,6 @@
#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500)
#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600)
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
/* I2C */
#define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_FSL_I2C_SPEED 400000
@@ -394,9 +391,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -407,7 +401,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 86acf33..03e5c32 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -317,9 +317,6 @@
#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500)
#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600)
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
/* I2C */
#define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_FSL_I2C_SPEED 400000
@@ -452,9 +449,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -465,7 +459,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index cf078cc..9d69da7 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -465,9 +465,6 @@ boards, we say we have two, but don't display a message if we find only one. */
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* Watchdog */
#undef CONFIG_WATCHDOG /* watchdog disabled */
@@ -475,9 +472,6 @@ boards, we say we have two, but don't display a message if we find only one. */
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#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_LOADADDR 800000 /* default location for tftp and bootm */
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 2cad8e5..b21ad76 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -453,17 +453,11 @@ extern int board_pci_host_broken(void);
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
*/
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
#ifdef CONFIG_MMC
@@ -475,7 +469,6 @@ extern int board_pci_host_broken(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index ef12e6d..b8247c2 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -467,17 +467,11 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
*/
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
#ifdef CONFIG_MMC
@@ -489,7 +483,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index b0e011f..37dc5ad 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -594,9 +594,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index dae3db9..ce5db40 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -305,9 +305,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -318,9 +315,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 8dbdd3b..c3e2d90 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -333,18 +333,12 @@ extern unsigned long get_clock_freq(void);
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 066d22c..001d6b1 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -334,9 +334,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* USB
@@ -352,9 +349,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 9304f04..88b59b5 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -451,18 +451,12 @@ extern unsigned long get_clock_freq(void);
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 6416bb0..6a00362 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -331,18 +331,12 @@ extern unsigned long get_clock_freq(void);
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index b31f68d..e8efee5 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -344,18 +344,12 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default load address */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 5ce570a..979831e 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -346,18 +346,12 @@ extern unsigned long get_clock_freq(void);
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 227e712..ecafcaf 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -438,9 +438,6 @@ extern unsigned long get_clock_freq(void);
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#undef CONFIG_WATCHDOG /* watchdog disabled */
@@ -453,9 +450,6 @@ extern unsigned long get_clock_freq(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_SYS_CBSIZE 2048 /* Console I/O Buffer Size */
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 353cec6..4f8b09d 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -550,9 +550,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 04d2fec..72aca3d 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -411,9 +411,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -425,8 +422,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 7e42686..bd9656e 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -573,17 +573,12 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index dbdf3dc..cc69195 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -24,7 +24,6 @@
#define MIGO_R_FLASH_BANK_SIZE (64 * 1024 * 1024)
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 71eb946..beebd5e 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -710,9 +710,6 @@ extern unsigned long get_sdram_size(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 8dbb13a..e3f0ddb 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -580,9 +580,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index ad6bd15..e46e84f 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -247,8 +247,6 @@ extern unsigned long get_clock_freq(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index b48f7f1..cfc89f6 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -584,9 +584,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 005aa27..e195bca 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -758,9 +758,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 7325567..c21f213 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -772,9 +772,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index c1a7020..5757556 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -636,9 +636,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 442122b..8a3372a 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -759,9 +759,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 1f63771..0a2d033 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -724,9 +724,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index f8564e8..b20ef15 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -671,9 +671,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 7f2f421..a1f4581 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -267,9 +267,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index a9d0abb..e064881 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -258,19 +258,12 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index f8c04b8..6e842db 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -434,8 +434,6 @@
/*
* Miscellaneous configurable options
*/
-#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_HZ 1000 /* decrementer freq: 1ms tick */
diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h
index f75274e..2963bfd 100644
--- a/include/configs/adp-ae3xx.h
+++ b/include/configs/adp-ae3xx.h
@@ -20,8 +20,6 @@
#define CONFIG_SKIP_TRUNOFF_WATCHDOG
-#define CONFIG_CMDLINE_EDITING
-
#define CONFIG_ARCH_MAP_SYSMEM
#define CONFIG_BOOTP_SEND_HOSTNAME
@@ -96,7 +94,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
/*
* Size of malloc() pool
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index f836593..0720e87 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -18,8 +18,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_CMDLINE_EDITING
-
#define CONFIG_ARCH_MAP_SYSMEM
#define CONFIG_BOOTP_SEND_HOSTNAME
@@ -101,7 +99,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
/*
* Size of malloc() pool
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index c05bcd5..80ef13b 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -203,8 +203,6 @@
#define CONFIG_ARP_TIMEOUT 200UL
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0x10000000
#define CONFIG_SYS_MEMTEST_END 0x10010000
@@ -212,8 +210,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index e2d329a..8d87d5a 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -65,7 +65,6 @@
# define CONFIG_RESET_TO_RETRY
#endif
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#ifndef CONFIG_SPL_BUILD
@@ -258,11 +257,8 @@
#define CONFIG_DRIVER_TI_CPSW
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_NET_RETRY_COUNT 10
#define CONFIG_PHY_ADDR 0
#define CONFIG_PHY_SMSC
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index c620b09..58aac65 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -153,11 +153,9 @@
"fi; " \
"else run nandboot; fi"
-#define CONFIG_AUTO_COMPLETE 1
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_MAXARGS 32 /* max number of command */
/* args */
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 4d94078..356dc6e 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -62,7 +62,6 @@
#define CONFIG_DRIVER_TI_EMAC_USE_RMII
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 10
@@ -171,9 +170,6 @@
"else run nandboot; fi"
/* Miscellaneous configurable options */
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
/* We set the max number of command args high to avoid HUSH bugs. */
#define CONFIG_SYS_MAXARGS 64
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 726dbba..a0d2b36 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -216,11 +216,8 @@
/* CPSW Ethernet */
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_NET_RETRY_COUNT 10
#endif
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index 7546b3f..9c76862 100644
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -77,11 +77,8 @@
#define CONFIG_HSMMC2_8BIT
/* CPSW Ethernet */
-#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_NET_RETRY_COUNT 10
#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */
#define CONFIG_MII /* Required in net/eth.c */
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index b9fc5b5..569fd98 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -30,9 +30,7 @@
"cp.b 0x20000 0xfff00000 ${filesize}\0"
/* undef to save memory */
-#undef CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */
#define CONFIG_SYS_LOAD_ADDR 0x20000 /* default load address */
diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index 251d258..e1a192d 100644
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -37,9 +37,6 @@
#define CONFIG_ENV_SIZE 0x10000
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
/*
* Diagnostics
diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index cfea0b2..94b5332 100644
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -41,9 +41,6 @@
#define CONFIG_ENV_SIZE 0x10000
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
/*
* Diagnostics
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 4c2a2bd..e01b963 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -23,7 +23,6 @@
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
/* undef to save memory */
-#define CONFIG_SYS_LONGHELP
/* Monitor Command Prompt */
/* Buffer size for Console output */
#define CONFIG_SYS_PBSIZE 256
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index 2a01000..d156677 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -26,7 +26,6 @@
#define CONFIG_BITBANGMII_MULTI
/* undef to save memory */
-#define CONFIG_SYS_LONGHELP
/* Monitor Command Prompt */
/* Buffer size for Console output */
#define CONFIG_SYS_PBSIZE 256
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index c13e446..5f53a52 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -147,7 +147,6 @@
#define CONFIG_CMD_TIME
-#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_SYS_BOOT_RAMDISK_HIGH
#include "tegra-common-usb-gadget.h"
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 6955310..654f745 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -41,7 +41,6 @@
/* Make the HW version stuff available in U-Boot env */
#define CONFIG_VERSION_VARIABLE /* ver environment variable */
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
/* I2C Configs */
@@ -252,8 +251,6 @@
"fbmem=32M\0 "
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
#undef CONFIG_SYS_CBSIZE
#define CONFIG_SYS_CBSIZE 1024
#undef CONFIG_SYS_MAXARGS
@@ -266,8 +263,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
@@ -297,6 +292,4 @@
#define CONFIG_CMD_TIME
-#define CONFIG_SUPPORT_RAW_INITRD
-
#endif /* __CONFIG_H */
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 607b27c..d2a0d9a 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -39,12 +39,7 @@
/*
* BOOTP options
*/
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
@@ -90,13 +85,9 @@
/*
* U-Boot general configurations
*/
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_PREBOOT "run check_flash check_env;"
/*
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index cade5bb..a122cda 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -33,7 +33,6 @@
#define ARMADILLO_800EVA_SDRAM_BASE 0x40000000
#define ARMADILLO_800EVA_SDRAM_SIZE (512 * 1024 * 1024)
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
index 1e182a1..f219349 100644
--- a/include/configs/aspeed-common.h
+++ b/include/configs/aspeed-common.h
@@ -16,8 +16,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-
/* Enable cache controller */
#define CONFIG_SYS_DCACHE_OFF
@@ -48,15 +46,10 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_SUBNETMASK
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP
#define CONFIG_BOOTCOMMAND "bootm 20080000 20300000"
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 84ce35c..8b154d4 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -55,8 +55,6 @@
#define ENABLE_JFFS 1
#endif
-#define CONFIG_CMDLINE_EDITING
-
#define CONFIG_MCFRTC
#undef RTC_DEBUG
@@ -173,8 +171,6 @@
/* default RAM address for user programs */
#define CONFIG_SYS_LOAD_ADDR 0x20000
-#define CONFIG_SYS_LONGHELP
-
#define CONFIG_FPGA_COUNT 1
#define CONFIG_FPGA_XILINX
#define CONFIG_FPGA_SPARTAN3
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index dc36c2a..68d23b4 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -22,8 +22,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT
#endif
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
-
/* general purpose I/O */
#ifndef CONFIG_DM_GPIO
#define CONFIG_AT91_GPIO
@@ -34,9 +32,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -84,10 +79,6 @@
#endif
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024)
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 8dcd6f4..f768c39 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -171,9 +171,6 @@
/*
* Shell Settings
*/
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
/*
* Size of malloc() pool
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index ea7478b..19af4a3 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -50,9 +50,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE 1
-#define CONFIG_BOOTP_BOOTPATH 1
-#define CONFIG_BOOTP_GATEWAY 1
-#define CONFIG_BOOTP_HOSTNAME 1
/*
* SDRAM: 1 bank, min 32, max 128 MB
@@ -159,10 +156,6 @@
"fatload mmc 0:1 0x22000000 uImage; bootm"
#endif
-#define CONFIG_SYS_LONGHELP 1
-#define CONFIG_CMDLINE_EDITING 1
-#define CONFIG_AUTO_COMPLETE
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 39e4b38..3477bb0 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -51,9 +51,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
@@ -136,10 +133,6 @@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
#endif
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 9431777..10eff62 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -59,9 +59,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE 1
-#define CONFIG_BOOTP_BOOTPATH 1
-#define CONFIG_BOOTP_GATEWAY 1
-#define CONFIG_BOOTP_HOSTNAME 1
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
@@ -252,10 +249,6 @@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
#endif
-#define CONFIG_SYS_LONGHELP 1
-#define CONFIG_CMDLINE_EDITING 1
-#define CONFIG_AUTO_COMPLETE
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 2957da9..a436fa7 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -44,9 +44,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
@@ -98,10 +95,6 @@
"bootz 0x72000000 - 0x71000000"
#endif
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 87728df..d95c4b4 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -35,9 +35,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SYS_SDRAM_BASE 0x20000000
@@ -147,10 +144,6 @@
#endif
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index c08fb2e..0896865 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -107,10 +107,6 @@
"bootz 0x22000000 - 0x21000000"
#endif
-#define CONFIG_SYS_LONGHELP 1
-#define CONFIG_CMDLINE_EDITING 1
-#define CONFIG_AUTO_COMPLETE
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 9450784..264793b 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -27,9 +27,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0)
@@ -121,10 +118,6 @@
#define CONFIG_ENV_SIZE 0x4000
#endif
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index a9c4d1a..5f11f42 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -62,9 +62,6 @@
#define CONFIG_USB_OHCI_NEW
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
/*
* Environment settings
*/
@@ -79,7 +76,6 @@
/*
* Console configuration
*/
-#define CONFIG_SYS_LONGHELP
/*
* Misc utility configuration
diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h
index 31bcd51..b9d5585 100644
--- a/include/configs/bcm23550_w1d.h
+++ b/include/configs/bcm23550_w1d.h
@@ -96,9 +96,6 @@
*/
/* version string, parser, etc */
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_MX_CYCLIC
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index fe135b5..aff1489 100644
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -95,9 +95,6 @@
*/
/* version string, parser, etc */
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_MX_CYCLIC
diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h
index fd893e6..ed3c427 100644
--- a/include/configs/bcm_ep_board.h
+++ b/include/configs/bcm_ep_board.h
@@ -53,9 +53,6 @@
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* version string, parser, etc */
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_MX_CYCLIC
diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h
index 3605d86..847b9bd 100644
--- a/include/configs/bcm_northstar2.h
+++ b/include/configs/bcm_northstar2.h
@@ -45,7 +45,5 @@
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* version string, parser, etc */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#endif /* __BCM_NORTHSTAR2_H */
diff --git a/include/configs/boston.h b/include/configs/boston.h
index fdd5ef5..9e84157 100644
--- a/include/configs/boston.h
+++ b/include/configs/boston.h
@@ -44,7 +44,6 @@
/*
* Console
*/
-#define CONFIG_SYS_LONGHELP
/*
* Flash
diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h
index f90542c..a832b2b 100644
--- a/include/configs/bur_cfg_common.h
+++ b/include/configs/bur_cfg_common.h
@@ -27,10 +27,7 @@
#define CONFIG_PREBOOT "run cfgscr; run brdefaultip"
/* Network defines */
-#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */
#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_NET_RETRY_COUNT 10
/* Network console */
@@ -40,9 +37,6 @@
#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */
/* As stated above, the following choices are optional. */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
/* We set the max number of command args high to avoid HUSH bugs. */
#define CONFIG_SYS_MAXARGS 64
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 4c2f6ba..8ddcd79 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -158,7 +158,6 @@
*/
#ifdef CONFIG_DRIVER_TI_EMAC
#define CONFIG_MII
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 10
@@ -172,9 +171,6 @@
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
#define CONFIG_LOADADDR 0xc0700000
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_MX_CYCLIC
/*
diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h
index 4f64672..eaf2754 100644
--- a/include/configs/cl-som-am57x.h
+++ b/include/configs/cl-som-am57x.h
@@ -86,14 +86,11 @@
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
#define CONFIG_PHY_ATHEROS
#define CONFIG_SYS_RX_ETH_BUFFER 64
#define PHY_ANEG_TIMEOUT 8000
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
-#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_NET_RETRY_COUNT 10
/* Default environment */
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index d20c731..78024da 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -155,11 +155,8 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_TIMESTAMP
#define CONFIG_SYS_AUTOLOAD "no"
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0) /* memtest */
/* works on */
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 2367f5a..b96d469 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -160,11 +160,8 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_TIMESTAMP
#define CONFIG_SYS_AUTOLOAD "no"
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index a564b86..1b057ef 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -49,7 +49,6 @@
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
#define CONFIG_PHY_ATHEROS
#define CONFIG_SYS_RX_ETH_BUFFER 64
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 442f8e0..ee870f9 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -109,9 +109,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -167,8 +164,6 @@ from which user programs will be started */
/*---*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
/*
*-----------------------------------------------------------------------------
* End of user parameters to be customized
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index f2d5e61..4da6feb 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -39,7 +39,6 @@
/* Make the HW version stuff available in U-Boot env */
#define CONFIG_VERSION_VARIABLE /* ver environment variable */
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
/* I2C Configs */
@@ -227,8 +226,6 @@
"video=mxcfb1:off fbmem=8M\0 "
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
#undef CONFIG_SYS_CBSIZE
#define CONFIG_SYS_CBSIZE 1024
#undef CONFIG_SYS_MAXARGS
@@ -241,8 +238,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
@@ -271,6 +266,4 @@
#define CONFIG_CMD_TIME
-#define CONFIG_SUPPORT_RAW_INITRD
-
#endif /* __CONFIG_H */
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 04036c8..6ca5724 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -19,7 +19,6 @@
#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
/* Size of malloc() pool */
@@ -124,7 +123,6 @@
"updlevel=2\0"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x0c000000)
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 123e5d7..2623584 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -27,7 +27,6 @@
* Environment settings
*/
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_SYS_MALLOC_LEN (128 * 1024)
#define CONFIG_ARCH_CPU_INIT
@@ -78,15 +77,9 @@
#define CONFIG_NET_RETRY_COUNT 10
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#endif
-#undef CONFIG_SYS_LONGHELP /* Saves 10 KB */
#define CONFIG_SYS_DEVICE_NULLDEV 1
-#undef CONFIG_CMDLINE_EDITING /* Saves 2.5 KB */
-#undef CONFIG_AUTO_COMPLETE /* Saves 2.5 KB */
/*
* Clock Configuration
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index c7a34c2..67407f0 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -39,7 +39,6 @@
/* Allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
/* NAND support */
@@ -132,8 +131,6 @@
UBI_BOOTCMD
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#undef CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
@@ -142,7 +139,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
-#define CONFIG_CMDLINE_EDITING
/* Physical memory map */
#define CONFIG_NR_DRAM_BANKS 1
diff --git a/include/configs/comtrend_ar5315u.h b/include/configs/comtrend_ar5315u.h
index 3fda2d9..b008682 100644
--- a/include/configs/comtrend_ar5315u.h
+++ b/include/configs/comtrend_ar5315u.h
@@ -11,6 +11,3 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
diff --git a/include/configs/comtrend_ar5387un.h b/include/configs/comtrend_ar5387un.h
index 99630c0..790cb24 100644
--- a/include/configs/comtrend_ar5387un.h
+++ b/include/configs/comtrend_ar5387un.h
@@ -11,6 +11,3 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
diff --git a/include/configs/comtrend_ct5361.h b/include/configs/comtrend_ct5361.h
index 94ec498..7923e63 100644
--- a/include/configs/comtrend_ct5361.h
+++ b/include/configs/comtrend_ct5361.h
@@ -11,9 +11,5 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
-
#define CONFIG_SYS_FLASH_CFI 1
#define CONFIG_FLASH_CFI_DRIVER 1
diff --git a/include/configs/comtrend_vr3032u.h b/include/configs/comtrend_vr3032u.h
index 6d46041..152faa9 100644
--- a/include/configs/comtrend_vr3032u.h
+++ b/include/configs/comtrend_vr3032u.h
@@ -11,6 +11,3 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
diff --git a/include/configs/comtrend_wap5813n.h b/include/configs/comtrend_wap5813n.h
index 2eafb81..addd75e 100644
--- a/include/configs/comtrend_wap5813n.h
+++ b/include/configs/comtrend_wap5813n.h
@@ -11,9 +11,5 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
-
#define CONFIG_SYS_FLASH_CFI 1
#define CONFIG_FLASH_CFI_DRIVER 1
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index edc52cb..c6be602 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -312,11 +312,6 @@
/*
* Command line configuration.
*/
-#ifndef CONFIG_TRAILBLAZER
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-#endif /* CONFIG_TRAILBLAZER */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 8718965..639d5e4 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -593,9 +593,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index cc671f2..2940f18 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -56,9 +56,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
@@ -106,10 +103,6 @@
"nand read 0x70000000 0x200000 0x300000;" \
"bootm 0x70000000"
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index b045d2b..9a0ab16 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -416,9 +416,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 4fbfc72..e378caa 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -203,7 +203,6 @@
*/
#ifdef CONFIG_DRIVER_TI_EMAC
#define CONFIG_MII
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 10
@@ -243,9 +242,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_MX_CYCLIC
/*
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 1f0c11c..ebd2c23 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -58,9 +58,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -69,7 +66,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_MALLOC_LEN 128*1024
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 6b2fafe..c7505b9 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -117,13 +117,9 @@
/*
* U-Boot General Configurations
*/
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
/*
* Pass open firmware flat tree
*/
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 5f47c0f..34a25dd 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -78,16 +78,9 @@
#define CONFIG_JFFS2_PART_SIZE 0xf980000 /* size of jffs2 */
/* partition */
-#undef CONFIG_SUPPORT_RAW_INITRD
-
/* BOOTP/DHCP options */
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_NISDOMAIN
-#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_BOOTP_NTPSERVER
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 2054b45..9aa3b23 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -30,16 +30,12 @@
#define CONFIG_SPL_TARGET "u-boot-with-spl.imx"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG
-#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_BZIP2
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index ff90b6d..24c45fe 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -96,11 +96,8 @@
#define CONFIG_HSMMC2_8BIT
/* CPSW Ethernet */
-#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_NET_RETRY_COUNT 10
#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */
#define CONFIG_MII /* Required in net/eth.c */
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index 530d667..6b5a295 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -101,7 +101,6 @@ REFLASH(dragonboard/u-boot.img, 8)\
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_SYS_MMC_ENV_DEV 0 /* mmc0 = emmc, mmc1 = sd */
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M)
diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h
index e28a956..4bc36b7 100644
--- a/include/configs/dragonboard820c.h
+++ b/include/configs/dragonboard820c.h
@@ -61,7 +61,6 @@
BOOTENV
#define CONFIG_ENV_SIZE 0x4000
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_8M)
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index a7e104f..44180f3 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -75,7 +75,6 @@
*/
#ifdef CONFIG_DRIVER_TI_EMAC
#define CONFIG_MII
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 10
@@ -102,9 +101,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_MX_CYCLIC
/*
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 9f09299..8cfca45 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -48,19 +48,13 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
*/
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_MCFTMR
-#define CONFIG_SYS_LONGHELP 1
-
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h
index a75932f..3c4ec17 100644
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -27,7 +27,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_ECO5_PK
#define CONFIG_BOOTFILE "uImage"
-#define CONFIG_AUTO_COMPLETE
/*
* Set its own mtdparts, different from common
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 8ec6b4a..653e55e 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -59,7 +59,6 @@
#define CONFIG_SUPERH_ON_CHIP_R8A66597
/* undef to save memory */
-#define CONFIG_SYS_LONGHELP
/* Monitor Command Prompt */
/* Buffer size for Console output */
#define CONFIG_SYS_PBSIZE 256
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index fcad7c4..b8c4735 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -76,7 +76,6 @@
/* Monitor configuration */
-#define CONFIG_SYS_LONGHELP /* Enable "long" help in mon */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
/* Serial port hardware configuration */
diff --git a/include/configs/edison.h b/include/configs/edison.h
index 79dd690..dcfd311 100644
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -18,14 +18,11 @@
/* DISK Partition support */
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_MAXARGS 128
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_AUTO_COMPLETE
-
/* Memory */
#define CONFIG_SYS_LOAD_ADDR 0x100000
#define CONFIG_PHYSMEM
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 2f9e129..05252cd 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -201,10 +201,8 @@
#define CONFIG_SYS_RESET_ADDRESS 0xffff0000
/* Enable command line editing */
-#define CONFIG_CMDLINE_EDITING
/* provide extensive help */
-#define CONFIG_SYS_LONGHELP
/* additions for new relocation code, must be added to all boards */
#define CONFIG_SYS_SDRAM_BASE 0
diff --git a/include/configs/espt.h b/include/configs/espt.h
index 65221fc..54625b0 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -22,7 +22,6 @@
#define CONFIG_CONS_SCIF0 1
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate
settings for this board */
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index a014bbf..0c57047 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -142,9 +142,6 @@
/* DHCP/BOOTP options */
#ifdef CONFIG_CMD_DHCP
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_SYS_AUTOLOAD "n"
#endif
@@ -161,7 +158,5 @@
"bootm 0x22000000"
/* Misc. u-boot settings */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
#endif
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index ac0e903..0ee2d19 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -62,9 +62,6 @@
/*
* Command definition
*/
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_DNS
#define CONFIG_NET_RETRY_COUNT 100
@@ -85,10 +82,7 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index dc6fe58..42c3292 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -228,8 +228,6 @@
#define CONFIG_ARP_TIMEOUT 200UL
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0x10000000
#define CONFIG_SYS_MEMTEST_END 0x10010000
@@ -237,8 +235,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 8679b6b..c82ad93 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -19,8 +19,6 @@
#define CONFIG_REMAKE_ELF
-#define CONFIG_SUPPORT_RAW_INITRD
-
/* Physical Memory Map */
/* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */
@@ -95,12 +93,9 @@
/* Preserve environment on sd card */
#define CONFIG_ENV_SIZE 0x1000
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_MAXARGS 64 /* max command args */
#endif /* __HIKEY_H */
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 3331a15..52fa3d6 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -509,13 +509,9 @@ void fpga_control_clear(unsigned int bus, int pin);
* Command line configuration.
*/
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */
diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index e17b56e..fb4829a 100644
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -70,9 +70,6 @@
/*
* Console configuration
*/
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
/*
* Misc utility configuration
diff --git a/include/configs/huawei_hg556a.h b/include/configs/huawei_hg556a.h
index 6bd2d76..f994219 100644
--- a/include/configs/huawei_hg556a.h
+++ b/include/configs/huawei_hg556a.h
@@ -11,9 +11,5 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
-
#define CONFIG_SYS_FLASH_CFI 1
#define CONFIG_FLASH_CFI_DRIVER 1
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 7e3652e..14eaedc 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -409,11 +409,6 @@
/*
* U-Boot environment setup
*/
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_BOOTPATH
#define CONFIG_BOOTP_BOOTFILESIZE
/*
@@ -447,7 +442,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h
index 4ae64bb..75bb98c 100644
--- a/include/configs/imgtec_xilfpga.h
+++ b/include/configs/imgtec_xilfpga.h
@@ -40,7 +40,6 @@
/*----------------------------------------------------------------------
* Commands
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
/*------------------------------------------------------------
* Console Configuration
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 9596f0b..9104121 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -142,8 +142,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_LOADADDR 0xa0800000 /* loadaddr env var */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index b9f5474..c9b79b9 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -83,15 +83,12 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */
#define CONFIG_SYS_MEMTEST_END 0x10000
#define CONFIG_SYS_LOAD_ADDR 0 /* default load address */
-#define CONFIG_CMDLINE_EDITING
-
/*
* Physical Memory Map
*/
diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index f66d954..0d8a500 100644
--- a/include/configs/integrator-common.h
+++ b/include/configs/integrator-common.h
@@ -12,7 +12,6 @@
#define CONFIG_SYS_MEMTEST_END 0x10000000
#define CONFIG_SYS_TIMERBASE 0x13000100 /* Timer1 */
#define CONFIG_SYS_LOAD_ADDR 0x7fc0 /* default load address */
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */
#define CONFIG_CONS_INDEX 0
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index ceb9096..4669f39 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -24,9 +24,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index a6fa458..a7fab88 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -167,7 +167,6 @@
#ifdef CONFIG_DRIVER_TI_EMAC
#define CONFIG_DRIVER_TI_EMAC_USE_RMII
#define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 10
@@ -181,9 +180,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_MX_CYCLIC
/*
diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index 003e4fc..5002af2 100644
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -89,10 +89,6 @@
* Console
*/
-#define CONFIG_AUTO_COMPLETE
-
-#define CONFIG_SYS_LONGHELP
-
#define CONFIG_SYS_CBSIZE 512
/*
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 4d9a133..bb70a61 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -15,7 +15,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#else
@@ -23,8 +22,6 @@
#endif
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_HUSH_INIT_VAR
@@ -47,9 +44,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* UBI Support for all Keymile boards */
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index af882d4..a12ec5d 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -39,7 +39,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT (512)
/* prompt */
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 3419cbb..1a3252b 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -126,9 +126,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_MX_CYCLIC
/*
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 9761690..1e1fb77 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -112,8 +112,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 2140723..35ce97e 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -13,8 +13,6 @@
#include <asm/arch/config.h>
#include <asm/arch/stream_id_lsch2.h>
-#define CONFIG_SUPPORT_RAW_INITRD
-
#define CONFIG_DISPLAY_BOARDINFO_LATE
#define CONFIG_SYS_TEXT_BASE 0x40100000
@@ -123,8 +121,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MAXARGS 64 /* max command args */
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index ecc2d66..daa5e29 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -202,7 +202,6 @@
#define CONFIG_CMD_MII
#define CONFIG_CMDLINE_TAG
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_PEN_ADDR_BIG_ENDIAN
#define CONFIG_LAYERSCAPE_NS_ACCESS
@@ -222,9 +221,7 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMD_GREPENV
#define CONFIG_CMD_MEMINFO
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 3f26672..cfb25f9 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -458,7 +458,6 @@ unsigned long get_board_ddr_clk(void);
#endif
#define CONFIG_CMDLINE_TAG
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_PEN_ADDR_BIG_ENDIAN
#define CONFIG_LAYERSCAPE_NS_ACCESS
@@ -490,8 +489,6 @@ unsigned long get_board_ddr_clk(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END 0x9fffffff
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index ecc3c1d..0a2dd46 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -479,8 +479,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END 0x9fffffff
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 219db66..5dc73d3 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -37,8 +37,6 @@
/* Link Definitions */
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0)
-#define CONFIG_SUPPORT_RAW_INITRD
-
#define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_VERY_BIG_RAM
@@ -332,15 +330,7 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_LONGHELP
-
-#ifndef SPL_NO_MISC
-#ifndef CONFIG_CMDLINE_EDITING
-#define CONFIG_CMDLINE_EDITING 1
-#endif
-#endif
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MAXARGS 64 /* max command args */
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index a7f78f4..1979740 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -372,8 +372,6 @@ unsigned long get_board_ddr_clk(void);
* Miscellaneous configurable options
*/
#define CONFIG_MISC_INIT_R
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END 0x9fffffff
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 68b4076..09e2a34 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -35,8 +35,6 @@
/* Link Definitions */
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0)
-#define CONFIG_SUPPORT_RAW_INITRD
-
#define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_VERY_BIG_RAM
@@ -289,9 +287,7 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MAXARGS 64 /* max command args */
#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 456f61a..8389e70 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -397,8 +397,6 @@ unsigned long get_board_ddr_clk(void);
* Miscellaneous configurable options
*/
#define CONFIG_MISC_INIT_R
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END 0x9fffffff
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 7120c47..40e6472 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -43,8 +43,6 @@
#endif
#endif
-#define CONFIG_SUPPORT_RAW_INITRD
-
#ifdef CONFIG_QSPI_BOOT
#define CONFIG_SYS_FSL_QSPI_BASE 0x20000000
#define CONFIG_ENV_OFFSET 0x300000 /* 3MB */
@@ -240,11 +238,6 @@ unsigned long long get_qixis_addr(void);
sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */
-#define CONFIG_SYS_LONGHELP
-#ifndef SPL_NO_ENV
-#define CONFIG_CMDLINE_EDITING 1
-#endif
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MAXARGS 64 /* max command args */
#ifdef CONFIG_SPL
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 5674a5d..a1772ae 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -474,7 +474,6 @@ unsigned long get_board_ddr_clk(void);
#endif
-#undef CONFIG_CMDLINE_EDITING
#include <config_distro_defaults.h>
#define BOOT_TARGET_DEVICES(func) \
func(USB, usb, 0) \
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index a6271f5..9f5a32a 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -462,7 +462,6 @@
#endif
#ifndef SPL_NO_ENV
-#undef CONFIG_CMDLINE_EDITING
#include <config_distro_defaults.h>
#define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 83b4061..968baa6 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -36,8 +36,6 @@
#define CONFIG_ENV_SECT_SIZE 0x40000
#endif
-#define CONFIG_SUPPORT_RAW_INITRD
-
#define CONFIG_SKIP_LOWLEVEL_INIT
#ifndef CONFIG_SPL
@@ -215,9 +213,6 @@ unsigned long long get_qixis_addr(void);
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING 1
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MAXARGS 64 /* max command args */
#define CONFIG_SPL_BSS_START_ADDR 0x80100000
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 6f3301c..aa37c96 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -331,7 +331,6 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_MISC_INIT_R
-#undef CONFIG_CMDLINE_EDITING
#include <config_distro_defaults.h>
#define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 0793fcb..624356a 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -46,7 +46,6 @@
#include "mv-common.h"
/* loading initramfs images without uimage header */
-#define CONFIG_SUPPORT_RAW_INITRD
/* ST M25P40 */
#undef CONFIG_ENV_SPI_MAX_HZ
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 70c30f2..21285f8 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -44,13 +44,10 @@
/*
* U-Boot general configurations
*/
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
#define CONFIG_SYS_MAXARGS 32 /* Max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
-#define CONFIG_AUTO_COMPLETE /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING /* Command history etc */
/*
* Serial Driver
diff --git a/include/configs/malta.h b/include/configs/malta.h
index e15c6bb..17951bf 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -52,9 +52,6 @@
#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024)
#define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
/*
* Serial driver
*/
@@ -96,6 +93,4 @@
* Commands
*/
-#define CONFIG_SYS_LONGHELP /* verbose help, undef to save memory */
-
#endif /* _MALTA_CONFIG_H */
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 6961471..b31c44f 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -191,13 +191,9 @@
"bootcmd=mmc rescan;if fatload mmc 0 82000000 loadbootscr.scr;" \
"then source 82000000;else run nandboot;fi\0"
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
@@ -301,7 +297,6 @@
#define CONFIG_DRIVER_TI_EMAC
#define CONFIG_DRIVER_TI_EMAC_USE_RMII
#define CONFIG_MII
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 10
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 1540221..9f7c88a 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -53,9 +53,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* SDRAM: 1 bank, min 32, max 128 MB
@@ -118,9 +115,6 @@
#endif
#define CONFIG_SYS_CBSIZE 512
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
/*
* Size of malloc() pool
diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
index c2b306a..9216d7b 100644
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -25,9 +25,6 @@
#define GICD_BASE 0xc4301000
#define GICC_BASE 0xc4302000
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-
#include <config_distro_defaults.h>
#define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 41e6790..e5edd5f 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -156,9 +156,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#if defined(CONFIG_CMD_JFFS2)
# define CONFIG_MTD_PARTITIONS
@@ -180,7 +177,6 @@
#define CONFIG_SYS_CBSIZE 512
/* max number of command args */
#define CONFIG_SYS_MAXARGS 15
-#define CONFIG_SYS_LONGHELP
/* default load address */
#define CONFIG_SYS_LOAD_ADDR 0
@@ -204,8 +200,6 @@
"setenv stdin serial\0"
#endif
-#define CONFIG_CMDLINE_EDITING
-
/* Enable flat device tree support */
#define CONFIG_LMB 1
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 7441765..f4cbda4 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -373,20 +373,14 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
*/
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index a6e1726..007d840 100644
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -22,7 +22,6 @@
#define CONFIG_DISPLAY_BOARDINFO
/* U-Boot internals */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024)
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index cade328..492687e 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -23,7 +23,6 @@
#define MS7720SE_FLASH_BANK_SIZE (8 * 1024 * 1024)
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */
/* List of legal baudrate settings for this board */
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 3db6c24..e6056ef 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -24,7 +24,6 @@
#define MS7722SE_FLASH_BANK_SIZE (8*1024 * 1024)
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate settings for this board */
diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 1cd7ae0..6bab111 100644
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -27,7 +27,6 @@
#define CONFIG_SYS_SDRAM_BASE (0x8C000000)
#define CONFIG_SYS_SDRAM_SIZE (64 * 1024 * 1024)
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 11ba3e7..e4b69fe 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -22,7 +22,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_AM3517_MT_VENTOUX
#define CONFIG_BOOTFILE "uImage"
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_HOSTNAME mt_ventoux
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 1721fef..15f8f1b 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -77,9 +77,6 @@
/*
* Other required minimal configurations
*/
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */
#define CONFIG_SYS_MEMTEST_START 0x00800000 /* 8M */
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 86e0d43..4da98ea 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -46,9 +46,6 @@
/*
* Other required minimal configurations
*/
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */
#define CONFIG_SYS_MEMTEST_START 0x00800000 /* 8M */
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 8482cc8..31cf151 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -58,12 +58,9 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
/* U-Boot general configuration */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
/* Ethernet */
#define CONFIG_FEC_MXC
@@ -190,7 +187,5 @@
"else run netboot; fi"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
#endif /* __CONFIG_H */
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 18ee355..fa8cf27 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -94,15 +94,12 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */
#define CONFIG_SYS_MEMTEST_END 0x10000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING 1
-
/*-----------------------------------------------------------------------
* Physical Memory Map
*/
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 3259e82..8fd8e84 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -82,7 +82,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
/* memtest works on */
#define CONFIG_SYS_MEMTEST_START 0x80000000
@@ -91,8 +90,6 @@
/* default load address */
#define CONFIG_SYS_LOAD_ADDR 0x81000000
-#define CONFIG_CMDLINE_EDITING
-
/*-----------------------------------------------------------------------
* Physical Memory Map
*/
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 2b6d00b..8eea38a 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -72,9 +72,6 @@
/*
* Command definition
*/
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_DNS
#define CONFIG_NET_RETRY_COUNT 100
@@ -101,10 +98,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING
-
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */
#define CONFIG_SYS_MEMTEST_END 0x10000
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 3ecb92c..dd55aed 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -169,16 +169,12 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0x90000000
#define CONFIG_SYS_MEMTEST_END 0x90010000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/*-----------------------------------------------------------------------
* Physical Memory Map
*/
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 84a972f..b4d4e2e 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -152,16 +152,12 @@
#define CONFIG_ARP_TIMEOUT 200UL
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0x70000000
#define CONFIG_SYS_MEMTEST_END 0x70010000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 2
#define PHYS_SDRAM_1 CSD0_BASE_ADDR
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index ccb1a4a..45e9820 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -55,7 +55,6 @@
#define CONFIG_CONS_INDEX 1
/* Command definition */
-#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_LOADADDR 0x70010000 /* loadaddr env var */
#define CONFIG_SYS_TEXT_BASE 0x77800000
@@ -138,8 +137,6 @@
#define CONFIG_ARP_TIMEOUT 200UL
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_MEMTEST_START 0x70000000
@@ -147,8 +144,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 2
#define PHYS_SDRAM_1 CSD0_BASE_ADDR
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 62762824..40894d0 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -105,16 +105,12 @@
#define CONFIG_ARP_TIMEOUT 200UL
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0x70000000
#define CONFIG_SYS_MEMTEST_END 0x70010000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM_1 CSD0_BASE_ADDR
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 33d33ae..dbe1c88 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -67,7 +67,6 @@
#define CONFIG_CONS_INDEX 1
/* Command definition */
-#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_ETHPRIME "FEC0"
@@ -147,8 +146,6 @@
#define CONFIG_ARP_TIMEOUT 200UL
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_MEMTEST_START 0x70000000
@@ -156,8 +153,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 2
#define PHYS_SDRAM_1 CSD0_BASE_ADDR
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 57664e5..94c822e 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -40,8 +40,6 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
#define CONFIG_SYS_FSL_ESDHC_NUM 2
-#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */
-
/* Eth Configs */
#define CONFIG_MII
@@ -83,7 +81,6 @@
#define CONFIG_BAUDRATE 115200
/* Command definition */
-#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_ETHPRIME "FEC0"
@@ -175,8 +172,6 @@
#define CONFIG_ARP_TIMEOUT 200UL
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_MAXARGS 48 /* max number of command args */
@@ -187,8 +182,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 2
#define PHYS_SDRAM_1 CSD0_BASE_ADDR
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 54753c7..b6c7913 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -97,16 +97,12 @@
#define CONFIG_ARP_TIMEOUT 200UL
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0x70000000
#define CONFIG_SYS_MEMTEST_END 0x70010000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 2
#define PHYS_SDRAM_1 CSD0_BASE_ADDR
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index ddc645c..69852be 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -60,12 +60,8 @@
#define CONFIG_CONS_INDEX 1
/* Filesystems and image support */
-#define CONFIG_SUPPORT_RAW_INITRD
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 32
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 546ee95..9f99f59 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -148,8 +148,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 1785040..6b15707 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -36,9 +36,6 @@
#define CONFIG_CONS_INDEX 1
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 32
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 6ab8db3..17d3409 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -68,9 +68,6 @@
#define CONFIG_CONS_INDEX 1
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-
#define CONFIG_SYS_CACHELINE_SIZE 64
/* Miscellaneous configurable options */
@@ -79,8 +76,6 @@
#define CONFIG_SYS_MAXARGS 256
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 3a27c15..9acca0b 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -82,13 +82,10 @@
#define CONFIG_SPL_TEXT_BASE 0x00001000
/* U-Boot general configuration */
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
#define CONFIG_SYS_MAXARGS 32 /* Max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
-#define CONFIG_AUTO_COMPLETE /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING /* Command history etc */
/* Booting Linux */
#define CONFIG_CMDLINE_TAG
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 90be7bd..99cf4d8 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -41,9 +41,6 @@
/*
* Commands configuration
*/
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
/*
* mv-common.h should be defined after CMD configs since it used them
diff --git a/include/configs/netgear_cg3100d.h b/include/configs/netgear_cg3100d.h
index 457a50d..86d983e 100644
--- a/include/configs/netgear_cg3100d.h
+++ b/include/configs/netgear_cg3100d.h
@@ -9,6 +9,3 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index faeaf2e..2d39438 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -91,9 +91,6 @@
/* commands to include */
-#define CONFIG_CMDLINE_EDITING /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
/*
* TWL4030
*/
@@ -310,7 +307,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0)
#define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + 0x01F00000)/*31MB*/
diff --git a/include/configs/nsim.h b/include/configs/nsim.h
index c4775e5..58d3e5f 100644
--- a/include/configs/nsim.h
+++ b/include/configs/nsim.h
@@ -34,8 +34,6 @@
/*
* Command line configuration
*/
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
/*
* Environment settings
@@ -52,6 +50,5 @@
/*
* Console configuration
*/
-#define CONFIG_SYS_LONGHELP
#endif /* _CONFIG_NSIM_H_ */
diff --git a/include/configs/nx25-ae250.h b/include/configs/nx25-ae250.h
index b523797..7ed5bc1 100644
--- a/include/configs/nx25-ae250.h
+++ b/include/configs/nx25-ae250.h
@@ -13,7 +13,6 @@
*/
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_BOOTP_SERVERIP
@@ -30,7 +29,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/*
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 42e722e..7e2c853 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -205,7 +205,6 @@
#define CONFIG_MII
#undef CONFIG_DRIVER_TI_EMAC_USE_RMII
#define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 10
@@ -219,9 +218,6 @@
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x700000)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_MX_CYCLIC
/*
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 69f6930..ce69b0d 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -47,8 +47,6 @@
#define S5P_CHECK_DIDLE 0xBAD00000
#define S5P_CHECK_LPA 0xABAD0000
-#define CONFIG_SUPPORT_RAW_INITRD
-
/* MMC SPL */
#define COPY_BL2_FNPTR_ADDR 0x02020030
#define CONFIG_SPL_TEXT_BASE 0x02021410
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index d48e61c..1ee0a13 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -796,8 +796,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 61800f2..1b6b16f 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -386,8 +386,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index f6816dd..972c13a 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -44,7 +44,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_MALLOC_LEN 128*1024
@@ -133,9 +132,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index fdc95e9..62dd5dc 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -186,9 +186,6 @@
"nand write ${ram_addr} root ${filesize}; fi\0"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_MEMTEST_START 0x80010000
#define CONFIG_SYS_MEMTEST_END 0x87C00000
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 7a959c4..d81c11b 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -52,13 +52,11 @@
/*----------------------------------------------------------------------
* Commands
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
/*------------------------------------------------------------
* Console Configuration
*/
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
-#define CONFIG_CMDLINE_EDITING 1
/*-----------------------------------------------------------------------
* Networking Configuration
@@ -73,9 +71,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*--------------------------------------------------
* USB Configuration
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 0672dea..f99946c 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -123,8 +123,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index dc7a67d..0bbc512 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -61,9 +61,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* Enable the watchdog */
#define CONFIG_AT91SAM9_WATCHDOG
@@ -111,10 +108,6 @@
"bootz 0x22000000 - 0x21000000"
#endif
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index dec23a7..bb2a086 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -155,9 +155,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE 1
-#define CONFIG_BOOTP_BOOTPATH 1
-#define CONFIG_BOOTP_GATEWAY 1
-#define CONFIG_BOOTP_HOSTNAME 1
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
@@ -269,9 +266,6 @@
#error "Undefined memory device"
#endif
-#define CONFIG_SYS_LONGHELP 1
-#define CONFIG_CMDLINE_EDITING 1
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 8aab3e1..0049702 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -169,9 +169,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE 1
-#define CONFIG_BOOTP_BOOTPATH 1
-#define CONFIG_BOOTP_GATEWAY 1
-#define CONFIG_BOOTP_HOSTNAME 1
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
@@ -300,9 +297,6 @@
#error "Undefined memory device"
#endif
-#define CONFIG_SYS_LONGHELP 1
-#define CONFIG_CMDLINE_EDITING 1
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index e11c67f..0fe8641 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -60,9 +60,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE 1
-#define CONFIG_BOOTP_BOOTPATH 1
-#define CONFIG_BOOTP_GATEWAY 1
-#define CONFIG_BOOTP_HOSTNAME 1
#define CONFIG_JFFS2_CMDLINE 1
#define CONFIG_JFFS2_NAND 1
@@ -119,10 +116,6 @@
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x72000000 0x200000 0x200000; bootm"
-#define CONFIG_SYS_LONGHELP 1
-#define CONFIG_CMDLINE_EDITING 1
-#define CONFIG_AUTO_COMPLETE
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index 859da38..76c70bf 100644
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -63,11 +63,8 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_OFFSET (0x780 * 512) /* env_mmc_blknum */
#define CONFIG_ENV_SIZE 0x10000 /* env_mmc_nblks bytes */
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
/* Monitor Command Prompt */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 64
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index 2714404..58895a8 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -32,9 +32,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -65,10 +62,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_MALLOC_LEN (256 << 10)
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 063e504..382c580 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -32,9 +32,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -65,10 +62,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_MALLOC_LEN (256 << 10)
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 8b78f08..7422839 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -126,9 +126,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index f9800ec..1208df6 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -27,7 +27,6 @@
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
/* undef to save memory */
-#define CONFIG_SYS_LONGHELP
/* List of legal baudrate settings for this board */
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 6ca66b8..87b1e0e 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -16,7 +16,6 @@
#define CONFIG_SYS_SDRAM_SIZE 0x04000000
#define CONFIG_SYS_TEXT_BASE 0x8FE00000
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
#define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE)
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 241d067..4fdba69 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -25,7 +25,6 @@
#define CONFIG_SYS_SDRAM_BASE (0x08000000)
#define CONFIG_SYS_SDRAM_SIZE (128 * 1024 * 1024)
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
#define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE)
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index ad436fd..eff4f0b 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -14,7 +14,6 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
#undef CONFIG_SHOW_BOOT_PROGRESS
@@ -27,7 +26,6 @@
/* console */
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
#define CONFIG_SYS_BAUDRATE_TABLE { 38400, 115200 }
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index e9e5fec..b33bc79 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -15,12 +15,10 @@
#define CONFIG_REMAKE_ELF
/* boot option */
-#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
#undef CONFIG_SHOW_BOOT_PROGRESS
@@ -34,7 +32,6 @@
/* console */
#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_MAXARGS 64
#define CONFIG_SYS_BAUDRATE_TABLE { 115200, 38400 }
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index f2d3646..1712846 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -80,12 +80,10 @@
/* Environment */
#define CONFIG_ENV_SIZE SZ_16K
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_SYS_LOAD_ADDR 0x1000000
#define CONFIG_PREBOOT "usb start"
/* Shell */
-#define CONFIG_CMDLINE_EDITING
/* ATAGs support for bootm/bootz */
#define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index a5aa11c..1165c6b 100644
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -23,7 +23,6 @@
#define RSK7203_FLASH_BANK_SIZE (4 * 1024 * 1024)
#define CONFIG_SYS_TEXT_BASE 0x0C7C0000
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
/* List of legal baudrate settings for this board */
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 2ecc328..8024260 100644
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -17,7 +17,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE }
-#define CONFIG_SYS_LONGHELP 1 /* undef to save memory */
#define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */
/* Serial */
diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index 88d50ef..39eaa0d 100644
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@@ -16,7 +16,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE }
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 256 /* Print Buffer Size */
/* Serial */
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index fd1527c..8ffaee4 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -158,11 +158,8 @@
#include <config_distro_bootcmd.h>
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_PROMPT "=> "
-#undef CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_CMD_MEMTEST
#define CONFIG_SYS_MEMTEST_START (DDR_BASE_ADDR)
@@ -179,7 +176,6 @@
#if 0
/* Configure PXE */
-#define CONFIG_BOOTP_PXE
#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
#endif
@@ -206,8 +202,5 @@
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#endif
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index c31896d..0d7a8be 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -34,7 +34,6 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_REVISION_TAG
#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
/* Size of malloc() pool before and after relocation */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20))
@@ -108,7 +107,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_UPDATEB \
@@ -157,7 +155,6 @@
"opts=always_resume=1\0" \
"dfu_alt_info=" CONFIG_DFU_ALT "\0"
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
/* memtest works on */
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index b0bcc56..6a1bc6d 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -73,7 +73,6 @@
#define CONFIG_ENV_COMMON_BOOT "${console} ${meminfo}"
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/sagem_f at st1704.h b/include/configs/sagem_f at st1704.h
index fd1c759..73b2832 100644
--- a/include/configs/sagem_f at st1704.h
+++ b/include/configs/sagem_f@st1704.h
@@ -9,6 +9,3 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index cfb3e7a..e023efa 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -33,13 +33,10 @@
#define CONFIG_MALLOC_F_ADDR 0x0010000
#define CONFIG_SYS_MALLOC_LEN (32 << 20) /* 32MB */
-#define CONFIG_SYS_LONGHELP /* #undef to save memory */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_DISPLAY_BOARDINFO_LATE
/* turn on command-line edit/c/auto */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_ENV_SIZE 8192
@@ -77,7 +74,6 @@
#define CONFIG_KEEP_SERVERADDR
#define CONFIG_UDP_CHECKSUM
#define CONFIG_TIMESTAMP
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_BOOTP_SERVERIP
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 331fcbe..6f28c3b 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -272,9 +272,6 @@
#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR+0x4500)
#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600)
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
/* I2C */
#define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_FSL_I2C_SPEED 400000
@@ -388,9 +385,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -401,7 +395,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index b04df6b..14c5976 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -500,18 +500,12 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
* Miscellaneous configurable options
*/
-#define CONFIG_CMDLINE_EDITING /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 87b3cfd..c873486 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -451,9 +451,7 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
/*
* For booting Linux, the board info and command line data
diff --git a/include/configs/sfr_nb4_ser.h b/include/configs/sfr_nb4_ser.h
index 6bd2d76..f994219 100644
--- a/include/configs/sfr_nb4_ser.h
+++ b/include/configs/sfr_nb4_ser.h
@@ -11,9 +11,5 @@
#define CONFIG_ENV_SIZE (8 * 1024)
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
-
#define CONFIG_SYS_FLASH_CFI 1
#define CONFIG_FLASH_CFI_DRIVER 1
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index ee57eb2..07f2cdc 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -15,14 +15,11 @@
#define CONFIG_DISPLAY_BOARDINFO
#undef CONFIG_SHOW_BOOT_PROGRESS
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
/* MEMORY */
#define SH7752EVB_SDRAM_BASE (0x40000000)
#define SH7752EVB_SDRAM_SIZE (512 * 1024 * 1024)
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index e7f9f61..78646ff 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -15,14 +15,11 @@
#define CONFIG_DISPLAY_BOARDINFO
#undef CONFIG_SHOW_BOOT_PROGRESS
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
/* MEMORY */
#define SH7753EVB_SDRAM_BASE (0x40000000)
#define SH7753EVB_SDRAM_SIZE (512 * 1024 * 1024)
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index a2b3307..4a0635c 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -23,7 +23,6 @@
#define SH7757LCR_SDRAM_ECC_SETTING 0x0f000000 /* 240MByte */
#define SH7757LCR_SDRAM_DVC_SIZE (16 * 1024 * 1024)
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index de4a587..8b9e8d3 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -22,7 +22,6 @@
#define CONFIG_CONS_SCIF2 1
#define CONFIG_SYS_TEXT_BASE 0x8FFC0000
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 } /* List of legal baudrate
settings for this board */
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index c90cbe1..a51bdd2 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -38,7 +38,6 @@
#define SH7785LCR_USB_BASE (0xb4000000)
#endif
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PBSIZE 256
#define CONFIG_SYS_BAUDRATE_TABLE { 115200 }
diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index 1a69303..a56babc 100644
--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -27,7 +27,6 @@
#define SHMIN_FLASH_BASE_1 (0xA0000000)
#define CONFIG_SYS_TEXT_BASE 0x8DFB0000
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 256 /* Buffer size for Console output */
/* List of legal baudrate settings for this board */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600,14400,19200,38400,57600,115200 }
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 109441f..091ca8e 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -21,7 +21,6 @@
#define CONFIG_ENV_SIZE (0x2000)
#define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024)
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#ifdef CONFIG_SIEMENS_MACH_TYPE
#define CONFIG_MACH_TYPE CONFIG_SIEMENS_MACH_TYPE
#endif
@@ -32,16 +31,12 @@
/* commands to include */
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#ifndef CONFIG_SPL_BUILD
#define CONFIG_ROOTPATH "/opt/eldk"
#endif
#define CONFIG_ENV_OVERWRITE 1
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_AUTOLOAD "yes"
/* Clock Defines */
@@ -202,11 +197,8 @@
#define CONFIG_DRIVER_TI_CPSW
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_NET_RETRY_COUNT 10
/* NAND support */
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 49c838b..e6ac877 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -52,9 +52,7 @@
/* setting board specific options */
#define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_ENV_OVERWRITE 1 /* Overwrite ethaddr / serial# */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_AUTOLOAD "yes"
#define CONFIG_RESET_TO_RETRY
@@ -114,9 +112,6 @@
/* BOOTP and DHCP options */
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_NFSBOOTCOMMAND \
"setenv autoload yes; setenv autoboot yes; " \
"setenv bootargs ${basicargs} ${mtdparts} " \
@@ -154,8 +149,6 @@
/* General Boot Parameter */
#define CONFIG_BOOTCOMMAND "run flashboot"
#define CONFIG_SYS_CBSIZE 512
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
/*
* RAM Memory address where to put the
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index be0bf4a..c422e27 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -37,7 +37,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_CMDLINE_TAG
#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
/*
* Size of malloc() pool
@@ -118,7 +117,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
/* 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 d41a3a1..ca63996 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -113,9 +113,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x23000000
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* Environment settings */
#define CONFIG_ENV_OFFSET (512 << 10)
@@ -123,9 +120,6 @@
#define CONFIG_ENV_OVERWRITE
/* Console settings */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
/* U-Boot memory settings */
#define CONFIG_SYS_MALLOC_LEN (1 << 20)
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index f0e1a1d..ccb297d 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -80,9 +80,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x23000000
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* Environment settings */
#define CONFIG_ENV_OFFSET (512 << 10)
@@ -110,9 +107,6 @@
"altbootcmd=run boot_mmc ; run boot_usb ; run boot_safe ; run boot_working\0"
/* Console settings */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
/* U-Boot memory settings */
#define CONFIG_SYS_MALLOC_LEN (1 << 20)
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 95df5af..4babac6 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -84,10 +84,6 @@
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
-#define CONFIG_AUTO_COMPLETE
-
-#define CONFIG_SYS_LONGHELP
-
#define CONFIG_SYS_CBSIZE 512
/*
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 826bcf5..2e16b40 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -52,14 +52,11 @@
/*
* U-Boot general configurations
*/
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
/* Print buffer size */
#define CONFIG_SYS_MAXARGS 32 /* Max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
-#define CONFIG_AUTO_COMPLETE /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING /* Command history etc */
#ifndef CONFIG_SYS_HOSTNAME
#define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 4c05141..31ad607 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -187,9 +187,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
-
/*
* I2C
*/
@@ -268,16 +265,12 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 16b42ba..d367e5b 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -164,8 +164,6 @@
#define CONFIG_SYS_MEMTEST_START 0x00800000
#define CONFIG_SYS_MEMTEST_END 0x04000000
#define CONFIG_SYS_MALLOC_LEN (1024*1024)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_LOAD_ADDR 0x00800000
#define CONFIG_SYS_FLASH_EMPTY_INFO
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index 856a408..ea2d7c1 100644
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -23,8 +23,6 @@
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
-
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
func(USB, usb, 0) \
@@ -46,7 +44,6 @@
/* Extra Commands */
#define CONFIG_CMD_ASKENV
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SETUP_MEMORY_TAGS
@@ -74,9 +71,5 @@
#define CONFIG_USB_ETHER_SMSC95XX
/* NET Configs */
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_BOOTPATH
#endif /* __CONFIG_H */
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index af9daad..37495b0 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -67,8 +67,5 @@
/*
* Command line configuration.
*/
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#endif /* __CONFIG_H */
diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h
index ab33d0f..8dbc971 100644
--- a/include/configs/stm32f429-evaluation.h
+++ b/include/configs/stm32f429-evaluation.h
@@ -58,8 +58,5 @@
/*
* Command line configuration.
*/
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#endif /* __CONFIG_H */
diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index c290a66..cc4bea3 100644
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -60,8 +60,5 @@
/*
* Command line configuration.
*/
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#endif /* __CONFIG_H */
diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 3e952c2..db25e8b 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -61,9 +61,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_CMD_CACHE
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_DISPLAY_BOARDINFO
diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h
index 531de70..a4a5d7b 100644
--- a/include/configs/stm32h743-disco.h
+++ b/include/configs/stm32h743-disco.h
@@ -42,9 +42,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_CMD_CACHE
#define CONFIG_BOARD_LATE_INIT
diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h
index 531de70..a4a5d7b 100644
--- a/include/configs/stm32h743-eval.h
+++ b/include/configs/stm32h743-eval.h
@@ -42,9 +42,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_CMD_CACHE
#define CONFIG_BOARD_LATE_INIT
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index cefadc1..916e60d 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -91,8 +91,6 @@
#define CONFIG_EXTRA_CLOCK
#define CONFIG_PRAM 2048 /* 2048 KB */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
/* Print Buffer Size */
diff --git a/include/configs/strider.h b/include/configs/strider.h
index 0805114..a930522 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -543,13 +543,9 @@ void fpga_control_clear(unsigned int bus, int pin);
* Command line configuration.
*/
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index c21fea3..75a11a7 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -51,8 +51,6 @@
#define CONFIG_SYS_MEMTEST_END 1024*1024
/* Misc configuration */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_BOOTCOMMAND "go 0x40040000"
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index 7f2f4a3..1aca88e 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -236,9 +236,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* Command-line editing */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index bd57b91..bb7f101 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -80,14 +80,9 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */
/* NAND devices */
-#define CONFIG_AUTO_COMPLETE
-
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_MAXARGS 32 /* max number of command */
@@ -143,7 +138,6 @@
#define CONFIG_DRIVER_TI_EMAC
#define CONFIG_DRIVER_TI_EMAC_USE_RMII
#define CONFIG_MII
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 10
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 50433b7..ed6d04e 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -136,11 +136,8 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
/* turn on command-line edit/hist/auto */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_ALT_MEMTEST 1
#define CONFIG_SYS_MEMTEST_START (0x82000000) /* memtest */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index ce06f7b..dea87cc 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -143,10 +143,6 @@
#define CONFIG_ENV_SIZE (SZ_128K) /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index a395e67..8216d6e 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -53,9 +53,6 @@
* Command line configuration
*/
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
/*
* Environment settings
*/
@@ -71,6 +68,5 @@
/*
* Console configuration
*/
-#define CONFIG_SYS_LONGHELP
#endif /* _CONFIG_TB100_H_ */
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 2d98a6f..bfc2831 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -26,7 +26,6 @@
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
/* Environment */
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_SIZE 0x2000 /* Total Size Environment */
/*
@@ -50,7 +49,6 @@
#define CONFIG_ENV_OVERWRITE
/* turn on command-line edit/hist/auto */
-#define CONFIG_CMDLINE_EDITING
/*
* Increasing the size of the IO buffer as default nfsargs size is more
diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index 34940ef..036dc7b 100644
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -46,10 +46,6 @@
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_PXE
/* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR (MEM_BASE)
@@ -73,8 +69,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_SYS_MAXARGS 64 /* max command args */
#define CONFIG_NO_RELOCATION 1
#define CONFIG_LIB_RAND
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 93d1e5e..477799c 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -20,7 +20,6 @@
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_SYS_MALLOC_LEN (1024 << 10)
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
@@ -29,7 +28,6 @@
/* commands to include */
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x80200000\0" \
@@ -162,11 +160,8 @@
/* Ethernet */
#define CONFIG_DRIVER_TI_CPSW
#define CONFIG_MII
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_NET_RETRY_COUNT 10
#define CONFIG_PHY_ET1011C
#define CONFIG_PHY_ET1011C_TX_CLK_FIX
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index b0f84ed..22a78e1 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -103,11 +103,8 @@
#define CONFIG_DRIVER_TI_EMAC
#define CONFIG_MII
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_NET_RETRY_COUNT 10
/* Since SPL did pll and ddr initialization for us,
diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index 66cacdf..6c93fd3 100644
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -30,11 +30,8 @@
#ifndef CONFIG_SPL_BUILD
/* Network defines. */
-#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
#define CONFIG_NET_RETRY_COUNT 10
#define CONFIG_MII /* Required in net/eth.c */
#endif
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index cdbcf91..fbc268e 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -112,13 +112,9 @@
* console baudrate of 115200 and use the default baud rate table.
*/
#define CONFIG_SYS_MALLOC_LEN SZ_32M
-#define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */
#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */
/* As stated above, the following choices are optional. */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
/* We set the max number of command args high to avoid HUSH bugs. */
#define CONFIG_SYS_MAXARGS 64
@@ -137,8 +133,6 @@
#define CONFIG_MTD_DEVICE /* Required for mtdparts */
#endif
-#define CONFIG_SUPPORT_RAW_INITRD
-
/*
* Our platforms make use of SPL to initalize the hardware (primarily
* memory) enough for full U-Boot to be loaded. We make use of the general
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index bbed17a..cf022af 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -99,7 +99,6 @@
#define CONFIG_PHY_MARVELL
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_NET_RETRY_COUNT 32
diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index ba76dcd..15b4ada 100644
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -41,13 +41,10 @@
* Command
*/
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */
#define CONFIG_SYS_MAXARGS 32 /* Max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* Boot argument buffer size */
-#define CONFIG_AUTO_COMPLETE /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING /* Command history etc */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
/* USB, USB storage, USB ethernet */
diff --git a/include/configs/trats.h b/include/configs/trats.h
index b97efc2..ca15f5c 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -60,7 +60,6 @@
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
/* Tizen - partitions definitions */
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 871accf..782b465 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -54,7 +54,6 @@
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
/* Tizen - partitions definitions */
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index ad9b36c..8647634 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -189,9 +189,6 @@
#endif /* CONFIG_FLASHCARD */
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING /* enable cmdline history */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0 + 0x00000000)
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index ebfbb66..057ce5b 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -120,13 +120,9 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-#define CONFIG_CMDLINE_EDITING
-
/*-----------------------------------------------------------------------
* Physical Memory Map
*/
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 5ab06f6..7526ace 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -48,9 +48,6 @@
/* serial console configuration */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
-#define CONFIG_CMDLINE_EDITING /* add command line history */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
@@ -94,8 +91,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_BOOTM_LEN (32 << 20)
-#define CONFIG_CMDLINE_EDITING /* add command line history */
-
#if defined(CONFIG_ARM64)
/* ARM Trusted Firmware */
#define BOOT_IMAGES \
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index cd28c4d..99b9b52 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -40,9 +40,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
@@ -95,10 +92,6 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_LONGHELP
-
/*
* Size of malloc() pool
*/
diff --git a/include/configs/vct.h b/include/configs/vct.h
index e9dda42..6486ac8 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -87,18 +87,12 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_SUBNETMASK
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
-#define CONFIG_CMDLINE_EDITING /* add command line history */
/*
* FLASH and environment organization
@@ -209,7 +203,6 @@ int vct_gpio_get(int pin);
#if defined(CONFIG_VCT_SMALL_IMAGE)
#undef CONFIG_SYS_I2C_SOFT
#undef CONFIG_SOURCE
-#undef CONFIG_SYS_LONGHELP
#undef CONFIG_TIMESTAMP
#endif /* CONFIG_VCT_SMALL_IMAGE */
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 94a59f3..be18f16 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -304,21 +304,14 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
*/
-#define CONFIG_CMDLINE_EDITING 1
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x100000 /* default load address */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 07cc92c..52ea596 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -17,8 +17,6 @@
#define CONFIG_REMAKE_ELF
-#define CONFIG_SUPPORT_RAW_INITRD
-
/* Link Definitions */
#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM)
@@ -120,10 +118,6 @@
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_PXE
/* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR (V2M_BASE + 0x10000000)
@@ -222,8 +216,6 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_MAXARGS 64 /* max command args */
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 94a352f..7f734f3 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -149,9 +149,6 @@
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR (V2M_BASE + 0x8000)
@@ -262,6 +259,5 @@
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-#define CONFIG_SYS_LONGHELP
#endif /* VEXPRESS_COMMON_H */
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index b28e8e4..47ef252 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -178,8 +178,6 @@
"else run netboot; fi"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#undef CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0x80010000
#define CONFIG_SYS_MEMTEST_END 0x87C00000
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 89c61b6..ae038ac 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -207,9 +207,6 @@
#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500)
#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x4600)
-#define CONFIG_CMDLINE_EDITING /* add command line history */
-#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
-
/* I2C */
#define CONFIG_SYS_I2C_FSL
#define CONFIG_SYS_FSL_I2C_SPEED 400000
@@ -332,9 +329,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -351,7 +345,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
/*
diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h
index 8989d55..5194d72 100644
--- a/include/configs/wb45n.h
+++ b/include/configs/wb45n.h
@@ -33,9 +33,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
@@ -120,9 +117,6 @@
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
/*
* Size of malloc() pool
diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h
index 4ab81c8..3e0b097 100644
--- a/include/configs/wb50n.h
+++ b/include/configs/wb50n.h
@@ -40,9 +40,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
@@ -107,9 +104,6 @@
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024)
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 45ba9f1..6750e8c 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -71,9 +71,6 @@
/*
* Command definition
*/
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_DNS
#define CONFIG_MXC_GPIO
@@ -97,10 +94,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING
-
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */
#define CONFIG_SYS_MEMTEST_END 0x10000
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 430cc30..5ca8c1a 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -84,13 +84,9 @@
/*
* U-Boot General Configurations
*/
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
/*
* NAND chip timings for FIXME: which one?
*/
diff --git a/include/configs/x600.h b/include/configs/x600.h
index a8313dd..608c942 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -116,9 +116,6 @@
#define CONFIG_SYS_MEMTEST_START 0x00800000
#define CONFIG_SYS_MEMTEST_END 0x04000000
#define CONFIG_SYS_MALLOC_LEN (8 << 20)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_LOAD_ADDR 0x00800000
/* Use last 2 lwords in internal SRAM for bootcounter */
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index e8f680f..8d8c689 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -55,9 +55,6 @@
9600, 19200, 38400, 115200}
#define CONFIG_SYS_NS16550_PORT_MAPPED
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-
/*-----------------------------------------------------------------------
* Command line configuration.
*/
@@ -74,7 +71,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MEMTEST_START 0x00100000
@@ -113,9 +109,6 @@
#define CONFIG_TFTP_TSIZE
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/* Default environment */
#define CONFIG_ROOTPATH "/opt/nfsroot"
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index ff07e90..fdbc6ef 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -52,20 +52,9 @@
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
#define CONFIG_BOOTP_MAY_FAIL
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_PXE
-#define CONFIG_BOOTP_SUBNETMASK
/* Diff from config_distro_defaults.h */
-#define CONFIG_SUPPORT_RAW_INITRD
-#if !defined(CONFIG_SPL_BUILD)
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
-#endif
-#define CONFIG_AUTO_COMPLETE
#if defined(CONFIG_MMC_SDHCI_ZYNQ)
# define CONFIG_SUPPORT_EMMC_BOOT
@@ -124,8 +113,6 @@
/* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
#define CONFIG_PANIC_HANG
#define CONFIG_SYS_MAXARGS 64
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 049a714..4739b82 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -481,9 +481,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_CMDLINE_EDITING 1 /* Command-line editing */
#define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS */
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 47da089..e523161 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -278,16 +278,11 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS */
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index b676713..2809a44 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -335,10 +335,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS */
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 88477b2..d647a5a 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -332,10 +332,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
-#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS */
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 735959b..03cb3c9 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -38,8 +38,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
-#define CONFIG_CMDLINE_EDITING
-
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 3119f00..52d1e0e 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -124,9 +124,6 @@
#define CONFIG_BOOT_RETRY_TIME 60 /* retry after 60 secs */
-#define CONFIG_AUTO_COMPLETE /* Support tab autocompletion */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
#define CONFIG_MX_CYCLIC
#define CONFIG_SHOW_BOOT_PROGRESS
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 71f8be8..b933428 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -79,8 +79,6 @@ unsigned char zipitz2_spi_read(void);
#endif
#endif
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-
#define CONFIG_SYS_DEVICE_NULLDEV 1
/*
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index f9783a2..4c2f162 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -60,9 +60,6 @@
* BOOTP options
*/
#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
/*
* Command line configuration.
@@ -115,9 +112,6 @@
#define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM + (512*1024))
#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM + PHYS_SDRAM_SIZE)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-
#define CONFIG_PREBOOT ""
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 3e30625..8697eab 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -41,9 +41,6 @@
# define CONFIG_PHY_MARVELL
# define CONFIG_PHY_REALTEK
# define CONFIG_PHY_XILINX
-# define CONFIG_BOOTP_BOOTPATH
-# define CONFIG_BOOTP_GATEWAY
-# define CONFIG_BOOTP_HOSTNAME
# define CONFIG_BOOTP_MAY_FAIL
#endif
@@ -259,9 +256,6 @@
/* Miscellaneous configurable options */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_LONGHELP
#define CONFIG_CLOCKS
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h
index dd65b52..4211f3b 100644
--- a/include/configs/zynq_cse.h
+++ b/include/configs/zynq_cse.h
@@ -21,13 +21,9 @@
#undef CONFIG_BOARD_LATE_INIT
#undef CONFIG_BOOTCOMMAND
#undef CONFIG_ENV_SIZE
-#undef CONFIG_CMDLINE_EDITING
-#undef CONFIG_AUTO_COMPLETE
#undef CONFIG_ZLIB
#undef CONFIG_GZIP
-#undef CONFIG_SYS_LONGHELP
-
#undef CONFIG_SYS_CBSIZE
#undef CONFIG_BOOTM_VXWORKS
#undef CONFIG_BOOTM_LINUX
diff --git a/net/Kconfig b/net/Kconfig
index 414c549..aac33f2 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -32,6 +32,30 @@ config NET_TFTP_VARS
If unset, timeout and maximum are hard-defined as 1 second
and 10 timouts per TFTP transfer.
+config BOOTP_BOOTPATH
+ bool "Enable BOOTP BOOTPATH"
+ default y
+
+config BOOTP_DNS
+ bool "Enable bootp DNS"
+ default y
+
+config BOOTP_GATEWAY
+ bool "Enable BOOTP gateway"
+ default y
+
+config BOOTP_HOSTNAME
+ bool "Enable BOOTP hostname"
+ default y
+
+config BOOTP_PXE
+ bool "Enable BOOTP PXE"
+ default y
+
+config BOOTP_SUBNETMASK
+ bool "Enable BOOTP subnetmask"
+ default y
+
config BOOTP_PXE_CLIENTARCH
hex
default 0x16 if ARM64
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2e767fc..a3331c4 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -111,7 +111,6 @@ CONFIG_ATMEL_NAND_HWECC
CONFIG_ATMEL_NAND_HW_PMECC
CONFIG_ATMEL_SPI0
CONFIG_AT_TRANS
-CONFIG_AUTO_COMPLETE
CONFIG_AUTO_ZRELADDR
CONFIG_BACKSIDE_L2_CACHE
CONFIG_BARIX_IPAM390
@@ -169,22 +168,16 @@ CONFIG_BOOTM_VXWORKS
CONFIG_BOOTP_
CONFIG_BOOTP_BOOTFILE
CONFIG_BOOTP_BOOTFILESIZE
-CONFIG_BOOTP_BOOTPATH
CONFIG_BOOTP_DEFAULT
CONFIG_BOOTP_DHCP_REQUEST_DELAY
-CONFIG_BOOTP_DNS
CONFIG_BOOTP_DNS2
-CONFIG_BOOTP_GATEWAY
-CONFIG_BOOTP_HOSTNAME
CONFIG_BOOTP_ID_CACHE_SIZE
CONFIG_BOOTP_MAY_FAIL
CONFIG_BOOTP_NISDOMAIN
CONFIG_BOOTP_NTPSERVER
-CONFIG_BOOTP_PXE
CONFIG_BOOTP_RANDOM_DELAY
CONFIG_BOOTP_SEND_HOSTNAME
CONFIG_BOOTP_SERVERIP
-CONFIG_BOOTP_SUBNETMASK
CONFIG_BOOTP_TIMEOFFSET
CONFIG_BOOTP_VENDOREX
CONFIG_BOOTROM_ERR_REG
@@ -250,7 +243,6 @@ CONFIG_CLOCKS
CONFIG_CLOCKS_IN_MHZ
CONFIG_CLOCK_SYNTHESIZER
CONFIG_CM922T_XA10
-CONFIG_CMDLINE_EDITING
CONFIG_CMDLINE_PS_SUPPORT
CONFIG_CMDLINE_TAG
CONFIG_CM_INIT
@@ -566,7 +558,6 @@ CONFIG_ENV_TOTAL_SIZE
CONFIG_ENV_UBIFS_OPTION
CONFIG_ENV_UBI_MTD
CONFIG_ENV_UBI_VOLUME_REDUND
-CONFIG_ENV_VARS_UBOOT_CONFIG
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
CONFIG_ENV_VERSION
CONFIG_EP9301
@@ -2145,7 +2136,6 @@ CONFIG_SUNXI_USB_PHYS
CONFIG_SUPERH_ON_CHIP_R8A66597
CONFIG_SUPPORT_EMMC_BOOT
CONFIG_SUPPORT_EMMC_RPMB
-CONFIG_SUPPORT_RAW_INITRD
CONFIG_SUVD3
CONFIG_SXNI855T
CONFIG_SYSFLAGS_ADDR
@@ -3502,7 +3492,6 @@ CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE
CONFIG_SYS_LOADS_BAUD_CHANGE
CONFIG_SYS_LOAD_ADDR
CONFIG_SYS_LOAD_ADDR2
-CONFIG_SYS_LONGHELP
CONFIG_SYS_LOW
CONFIG_SYS_LOWBOOT
CONFIG_SYS_LOWMEM_BASE
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH 2/2] Remove config_distro_defaults.h
2018-02-02 20:37 [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig Adam Ford
@ 2018-02-02 20:37 ` Adam Ford
2018-02-05 22:45 ` Tom Rini
0 siblings, 1 reply; 3+ messages in thread
From: Adam Ford @ 2018-02-02 20:37 UTC (permalink / raw)
To: u-boot
With the contents of config_distro_defaults.h migrated to Kconfig,
we can remove this header file completely
Signed-off-by: Adam Ford <aford173@gmail.com>
---
include/config_distro_defaults.h | 16 ----------------
include/configs/am335x_sl50.h | 2 +-
include/configs/clearfog.h | 2 +-
include/configs/cm_fx6.h | 2 +-
include/configs/dh_imx6.h | 2 +-
include/configs/dragonboard410c.h | 2 +-
include/configs/dragonboard820c.h | 2 +-
include/configs/el6x_common.h | 2 +-
include/configs/embestmx6boards.h | 2 +-
include/configs/exynos-common.h | 2 +-
include/configs/highbank.h | 2 +-
include/configs/hikey.h | 2 +-
include/configs/imx6_logic.h | 2 +-
include/configs/kc1.h | 2 +-
include/configs/ls1012a_common.h | 2 +-
include/configs/ls1021atwr.h | 2 +-
include/configs/ls1043a_common.h | 2 +-
include/configs/ls1046a_common.h | 2 +-
include/configs/ls1088aqds.h | 2 +-
include/configs/ls1088ardb.h | 2 +-
include/configs/ls2080ardb.h | 2 +-
include/configs/mccmon6.h | 2 +-
include/configs/meson-gxbb-common.h | 2 +-
include/configs/mvebu_armada-37xx.h | 2 +-
include/configs/mx6cuboxi.h | 2 +-
include/configs/novena.h | 2 +-
include/configs/omap3_evm.h | 2 +-
include/configs/pcm058.h | 2 +-
include/configs/pfla02.h | 2 +-
include/configs/poplar.h | 2 +-
include/configs/qemu-arm.h | 2 +-
include/configs/rockchip-common.h | 2 +-
include/configs/rpi.h | 2 +-
include/configs/s32v234evb.h | 2 +-
include/configs/sandbox.h | 2 +-
include/configs/sksimx6.h | 2 +-
include/configs/sniper.h | 2 +-
include/configs/socfpga_common.h | 2 +-
include/configs/stih410-b2260.h | 2 +-
include/configs/sunxi-common.h | 2 +-
include/configs/tegra-common.h | 2 +-
include/configs/ti_armv7_common.h | 2 +-
include/configs/turris_omnia.h | 2 +-
include/configs/udoo_neo.h | 2 +-
include/configs/usbarmory.h | 2 +-
include/configs/vexpress_common.h | 2 +-
include/configs/wandboard.h | 2 +-
include/configs/zynq-common.h | 2 +-
48 files changed, 47 insertions(+), 63 deletions(-)
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
deleted file mode 100644
index 35e704e..0000000
--- a/include/config_distro_defaults.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2013-2014 Red Hat, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#ifndef _CONFIG_CMD_DISTRO_DEFAULTS_H
-#define _CONFIG_CMD_DISTRO_DEFAULTS_H
-
-/*
- * List of all commands and options that when defined enables support for
- * features required by distros to support boards in a standardised and
- * consistent manner.
- */
-
-#endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index b1c7ede..24406c1 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -30,7 +30,7 @@
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
#define MEM_LAYOUT_ENV_SETTINGS \
"scriptaddr=0x80000000\0" \
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index c2d7548..30168e2 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -125,7 +125,7 @@
/* Include the common distro boot environment */
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
#ifdef CONFIG_MMC
#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index fb710ec..06eae06 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -14,7 +14,7 @@
#include "mx6_common.h"
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
#endif
/* Machine config */
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 9aa3b23..ca095e4 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -11,7 +11,7 @@
#include <asm/arch/imx-regs.h>
-#include <config_distro_defaults.h>
+
#include "mx6_common.h"
/*
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index 6b5a295..0cabe42 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -46,7 +46,7 @@
/* Partition table support */
#define HAVE_BLOCK_DEVICE /* Needed for partition commands */
-#include <config_distro_defaults.h>
+
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h
index 4bc36b7..f3929ae 100644
--- a/include/configs/dragonboard820c.h
+++ b/include/configs/dragonboard820c.h
@@ -40,7 +40,7 @@
#define CONFIG_BOOTP_BOOTFILESIZE
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
#include <config_distro_bootcmd.h>
#endif
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 17690e1..603dd07 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -11,7 +11,7 @@
#define CONFIG_BOARD_NAME EL6Q
-#include <config_distro_defaults.h>
+
#include "mx6_common.h"
#define CONFIG_IMX_THERMAL
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index dc686aa..bf18f2e 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -110,7 +110,7 @@
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
-#include <config_distro_defaults.h>
+
#include "mx6_common.h"
/* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 1670dac..48e443e 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -48,6 +48,6 @@
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#include <config_distro_defaults.h>
+
#endif /* __CONFIG_H */
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 726ae8a..dc5e562 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -7,7 +7,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#include <config_distro_defaults.h>
+
#define CONFIG_SYS_DCACHE_OFF
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index c82ad93..d267804 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -68,7 +68,7 @@
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
-#include <config_distro_defaults.h>
+
/* Initial environment variables */
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index f0ff5b2..70d7641 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -12,7 +12,7 @@
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CONSOLE_DEV "ttymxc0"
-#include <config_distro_defaults.h>
+
#include "mx6_common.h"
/* Size of malloc() pool */
diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index 5002af2..7c8fadb 100644
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -165,6 +165,6 @@
*/
#include <config_defaults.h>
-#include <config_distro_defaults.h>
+
#endif
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 35ce97e..d704101 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -94,7 +94,7 @@
#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128
-#include <config_distro_defaults.h>
+
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \
func(SCSI, scsi, 0) \
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 0a2dd46..3543756 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -332,7 +332,7 @@
#define CONFIG_FSL_DEVICE_DISABLE
-#include <config_distro_defaults.h>
+
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
func(USB, usb, 0)
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 5dc73d3..af5acf4 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -235,7 +235,7 @@
#define HWCONFIG_BUFFER_SIZE 128
#ifndef SPL_NO_MISC
-#include <config_distro_defaults.h>
+
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 09e2a34..e3f1723 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -203,7 +203,7 @@
#define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128
-#include <config_distro_defaults.h>
+
#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGET_DEVICES(func) \
func(SCSI, scsi, 0) \
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index a1772ae..58a0bb6 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -474,7 +474,7 @@ unsigned long get_board_ddr_clk(void);
#endif
-#include <config_distro_defaults.h>
+
#define BOOT_TARGET_DEVICES(func) \
func(USB, usb, 0) \
func(MMC, mmc, 0) \
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 9f5a32a..8f12b3d 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -462,7 +462,7 @@
#endif
#ifndef SPL_NO_ENV
-#include <config_distro_defaults.h>
+
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index aa37c96..b705fa8 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -331,7 +331,7 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_MISC_INIT_R
-#include <config_distro_defaults.h>
+
#define BOOT_TARGET_DEVICES(func) \
func(USB, usb, 0) \
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index f34f934..a6bd163 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -8,7 +8,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#include <config_distro_defaults.h>
+
#include "mx6_common.h"
#define CONFIG_SPL_LIBCOMMON_SUPPORT
diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
index 9216d7b..3b006de 100644
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -25,7 +25,7 @@
#define GICD_BASE 0xc4301000
#define GICC_BASE 0xc4302000
-#include <config_distro_defaults.h>
+
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 5c53dd3..13509c8 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -102,7 +102,7 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
-#include <config_distro_defaults.h>
+
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index d649172..828d9a2 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -8,7 +8,7 @@
#ifndef __MX6CUBOXI_CONFIG_H
#define __MX6CUBOXI_CONFIG_H
-#include <config_distro_defaults.h>
+
#include "mx6_common.h"
#include "imx6_spl.h"
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 858e6c0..b53238e 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -13,7 +13,7 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_KEYBOARD
-#include <config_distro_defaults.h>
+
#include "mx6_common.h"
/* U-Boot Commands */
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 71d49e3..84eadcc 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -81,7 +81,7 @@
/* Environment */
#define CONFIG_PREBOOT "usb start"
-#include <config_distro_defaults.h>
+
#define MEM_LAYOUT_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 44c186c..cb3c2b8 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -8,7 +8,7 @@
#ifndef __PCM058_CONFIG_H
#define __PCM058_CONFIG_H
-#include <config_distro_defaults.h>
+
#ifdef CONFIG_SPL
#define CONFIG_SPL_SPI_LOAD
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index e1078ad..c59ea89 100644
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -8,7 +8,7 @@
#ifndef __PCM058_CONFIG_H
#define __PCM058_CONFIG_H
-#include <config_distro_defaults.h>
+
#ifdef CONFIG_SPL
#define CONFIG_SPL_SPI_LOAD
diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index 76c70bf..25af0ac 100644
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -41,7 +41,7 @@
func(MMC, mmc, 0) \
func(DHCP, dhcp, na)
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
#include <config_distro_bootcmd.h>
#endif
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index c8ba78d..a83b83a 100644
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -32,7 +32,7 @@
/* Environment options */
#define CONFIG_ENV_SIZE SZ_64K
-#include <config_distro_defaults.h>
+
#define BOOT_TARGET_DEVICES(func) \
func(SCSI, scsi, 0)
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index f465d35..3f06f2a 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -9,7 +9,7 @@
#include <linux/sizes.h>
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
/* First try to boot from SD (index 0), then eMMC (index 1) */
#if CONFIG_IS_ENABLED(CMD_MMC)
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 1712846..d7ced41 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -90,7 +90,7 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_INITRD_TAG
-#include <config_distro_defaults.h>
+
/* Environment */
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 8ffaee4..e124cd4 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -10,7 +10,7 @@
#define __CONFIG_H
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
#endif
#include <asm/arch/imx-regs.h>
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index e023efa..de1c8a2 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -63,7 +63,7 @@
115200}
/* include default commands */
-#include <config_distro_defaults.h>
+
#define BOOT_TARGET_DEVICES(func) \
func(HOST, host, 1) \
diff --git a/include/configs/sksimx6.h b/include/configs/sksimx6.h
index b7e18dd..7a19125 100644
--- a/include/configs/sksimx6.h
+++ b/include/configs/sksimx6.h
@@ -8,7 +8,7 @@
#ifndef __SKSIMX6_CONFIG_H
#define __SKSIMX6_CONFIG_H
-#include <config_distro_defaults.h>
+
#include "mx6_common.h"
#include "imx6_spl.h"
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 4babac6..5b498ec 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -159,6 +159,6 @@
*/
#include <config_defaults.h>
-#include <config_distro_defaults.h>
+
#endif
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 2e16b40..b0c87f2 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -295,7 +295,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
/* Extra Environment */
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
#ifdef CONFIG_CMD_DHCP
#define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na)
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index ea2d7c1..c8306bb 100644
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -18,7 +18,7 @@
#define CONFIG_SYS_HZ_CLOCK 1000000000 /* 1 GHz */
-#include <config_distro_defaults.h>
+
/* Environment */
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 2df2328..2842fb7 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -325,7 +325,7 @@ extern int soft_i2c_gpio_scl;
#define CONFIG_MISC_INIT_R
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
#ifdef CONFIG_ARM64
/*
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index bfc2831..48bad59 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -96,7 +96,7 @@
#define CONFIG_BOUNCE_BUFFER
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
#endif
#endif /* _TEGRA_COMMON_H_ */
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index fbc268e..3084b9d 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -229,6 +229,6 @@
#define NETARGS ""
#endif
-#include <config_distro_defaults.h>
+
#endif /* __CONFIG_TI_ARMV7_COMMON_H__ */
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 40d94a2..abb73e3 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -124,7 +124,7 @@
/* Include the common distro boot environment */
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
#ifdef CONFIG_MMC
#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index bd00145..5dcfc68 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -11,7 +11,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#include <config_distro_defaults.h>
+
#include "mx6_common.h"
#include "imx6_spl.h"
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 11bf629..522db19 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -16,7 +16,7 @@
#include <asm/arch/imx-regs.h>
-#include <config_distro_defaults.h>
+
/* U-Boot environment */
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 7f734f3..937a15e 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -170,7 +170,7 @@
GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET
-#include <config_distro_defaults.h>
+
/* Basic environment settings */
#define BOOT_TARGET_DEVICES(func) \
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 4d37a5b..e79a3f9 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -9,7 +9,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#include <config_distro_defaults.h>
+
#include "mx6_common.h"
#include "imx6_spl.h"
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 8697eab..73ed12d 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -164,7 +164,7 @@
#ifdef CONFIG_SPL_BUILD
#define BOOTENV
#else
-#include <config_distro_defaults.h>
+
#ifdef CONFIG_CMD_MMC
#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH 2/2] Remove config_distro_defaults.h
2018-02-02 20:37 ` [U-Boot] [PATCH 2/2] Remove config_distro_defaults.h Adam Ford
@ 2018-02-05 22:45 ` Tom Rini
0 siblings, 0 replies; 3+ messages in thread
From: Tom Rini @ 2018-02-05 22:45 UTC (permalink / raw)
To: u-boot
On Fri, Feb 02, 2018 at 02:37:11PM -0600, Adam Ford wrote:
> With the contents of config_distro_defaults.h migrated to Kconfig,
> we can remove this header file completely
>
> Signed-off-by: Adam Ford <aford173@gmail.com>
> ---
> include/config_distro_defaults.h | 16 ----------------
So, I have a problem. In 1/2, and sadly, oops!, in other cases, we've
not been good about enforcing config_distro_defaults.h -> select X under
DISTRO_DEFAULTS entry in the top-level Kconfig. Can you please re-do
1/2 so that it adds a select line during migration? I think in general
there's likely been no functional loss (as I'd have noticed size
differences) but there is an ease of use loss (DISTRO_DEFAULTS should
get X/Y/Z for a new board). Thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180205/91e1a770/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-05 22:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-02 20:37 [U-Boot] [PATCH 1/2] Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig Adam Ford
2018-02-02 20:37 ` [U-Boot] [PATCH 2/2] Remove config_distro_defaults.h Adam Ford
2018-02-05 22:45 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.