[U-Boot] [PATCH v2 1/1] common: Move CONFIG_BOOTARGS to Kconfig

Also introduce CONFIG_USE_BOOTARGS option so we can control if CONFIG_BOOTARGS defined at all.

Signed-off-by: Sam Protsenko semen.protsenko@linaro.org --- Changes in v2: - remove CONFIG_USE_BOOTARGS=y when no CONFIG_BOOTARGS defined - fixed mistakes found by running buildman

README | 5 -- common/Kconfig | 16 +++++ configs/M53017EVB_defconfig | 2 + configs/M54418TWR_defconfig | 2 + configs/M54418TWR_nand_mii_defconfig | 2 + configs/M54418TWR_nand_rmii_defconfig | 2 + configs/M54418TWR_nand_rmii_lowfreq_defconfig | 2 + configs/M54418TWR_serial_mii_defconfig | 2 + configs/M54418TWR_serial_rmii_defconfig | 2 + configs/M54451EVB_defconfig | 2 + configs/M54451EVB_stmicro_defconfig | 2 + configs/M54455EVB_a66_defconfig | 2 + configs/M54455EVB_defconfig | 2 + configs/M54455EVB_i66_defconfig | 2 + configs/M54455EVB_intel_defconfig | 2 + configs/M54455EVB_stm33_defconfig | 2 + configs/MCR3000_defconfig | 2 + configs/MPC8349ITXGP_defconfig | 2 + configs/MPC8349ITX_LOWBOOT_defconfig | 2 + configs/MPC8349ITX_defconfig | 2 + configs/MigoR_defconfig | 2 + configs/ap121_defconfig | 2 + configs/ap143_defconfig | 2 + configs/ap325rxa_defconfig | 2 + configs/ap_sh4a_4a_defconfig | 2 + configs/apf27_defconfig | 2 + configs/astro_mcf5373l_defconfig | 2 + configs/at91sam9260ek_dataflash_cs0_defconfig | 2 + configs/at91sam9260ek_dataflash_cs1_defconfig | 2 + configs/at91sam9260ek_nandflash_defconfig | 2 + configs/at91sam9261ek_dataflash_cs0_defconfig | 2 + configs/at91sam9261ek_dataflash_cs3_defconfig | 2 + configs/at91sam9261ek_nandflash_defconfig | 2 + configs/at91sam9263ek_dataflash_cs0_defconfig | 2 + configs/at91sam9263ek_dataflash_defconfig | 2 + configs/at91sam9263ek_nandflash_defconfig | 2 + configs/at91sam9g10ek_dataflash_cs0_defconfig | 2 + configs/at91sam9g10ek_dataflash_cs3_defconfig | 2 + configs/at91sam9g10ek_nandflash_defconfig | 2 + configs/at91sam9g20ek_2mmc_defconfig | 2 + configs/at91sam9g20ek_2mmc_nandflash_defconfig | 2 + configs/at91sam9g20ek_dataflash_cs0_defconfig | 2 + configs/at91sam9g20ek_dataflash_cs1_defconfig | 2 + configs/at91sam9g20ek_nandflash_defconfig | 2 + configs/at91sam9m10g45ek_mmc_defconfig | 2 + configs/at91sam9m10g45ek_nandflash_defconfig | 2 + configs/at91sam9rlek_dataflash_defconfig | 2 + configs/at91sam9rlek_mmc_defconfig | 2 + configs/at91sam9rlek_nandflash_defconfig | 2 + configs/at91sam9x5ek_dataflash_defconfig | 2 + configs/at91sam9x5ek_mmc_defconfig | 2 + configs/at91sam9x5ek_nandflash_defconfig | 2 + configs/at91sam9x5ek_spiflash_defconfig | 2 + configs/at91sam9xeek_dataflash_cs0_defconfig | 2 + configs/at91sam9xeek_dataflash_cs1_defconfig | 2 + configs/at91sam9xeek_nandflash_defconfig | 2 + configs/axm_defconfig | 2 + configs/axs101_defconfig | 2 + configs/axs103_defconfig | 2 + configs/bayleybay_defconfig | 2 + configs/bg0900_defconfig | 2 + configs/chromebook_link64_defconfig | 2 + configs/chromebook_link_defconfig | 2 + configs/chromebook_samus_defconfig | 2 + configs/chromebox_panther_defconfig | 2 + configs/colibri_pxa270_defconfig | 2 + ...conga-qeval20-qa3-e3845-internal-uart_defconfig | 2 + configs/conga-qeval20-qa3-e3845_defconfig | 2 + configs/coreboot-x86_defconfig | 2 + configs/corvus_defconfig | 2 + configs/cougarcanyon2_defconfig | 2 + configs/crownbay_defconfig | 2 + configs/d2net_v2_defconfig | 2 + configs/da850_am18xxevm_defconfig | 2 + configs/da850evm_defconfig | 2 + configs/da850evm_direct_nor_defconfig | 2 + configs/devkit3250_defconfig | 2 + configs/dfi-bt700-q7x-151_defconfig | 2 + configs/dragonboard410c_defconfig | 2 + configs/ds414_defconfig | 2 + configs/ecovec_defconfig | 2 + configs/edb9315a_defconfig | 2 + configs/efi-x86_defconfig | 2 + configs/espt_defconfig | 2 + configs/ethernut5_defconfig | 2 + configs/evb-ast2500_defconfig | 2 + configs/galileo_defconfig | 2 + configs/h2200_defconfig | 2 + configs/hikey_defconfig | 2 + configs/hsdk_defconfig | 2 + configs/inetspace_v2_defconfig | 2 + configs/integratorap_cm720t_defconfig | 2 + configs/integratorap_cm920t_defconfig | 2 + configs/integratorap_cm926ejs_defconfig | 2 + configs/integratorap_cm946es_defconfig | 2 + configs/integratorcp_cm1136_defconfig | 2 + configs/integratorcp_cm920t_defconfig | 2 + configs/integratorcp_cm926ejs_defconfig | 2 + configs/integratorcp_cm946es_defconfig | 2 + configs/kzm9g_defconfig | 2 + configs/ls1012afrdm_qspi_defconfig | 2 + configs/ls1012aqds_qspi_defconfig | 2 + configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 2 + configs/ls1012ardb_qspi_defconfig | 2 + configs/ls1043aqds_defconfig | 2 + configs/ls1043aqds_lpuart_defconfig | 2 + configs/ls1043aqds_nor_ddr3_defconfig | 2 + configs/ls1043aqds_qspi_defconfig | 2 + configs/ls1043ardb_SECURE_BOOT_defconfig | 2 + configs/ls1043ardb_defconfig | 2 + configs/ls1046aqds_SECURE_BOOT_defconfig | 2 + configs/ls1046aqds_defconfig | 2 + configs/ls1046aqds_lpuart_defconfig | 2 + configs/ls1046aqds_qspi_defconfig | 2 + configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 2 + configs/ls1046ardb_qspi_defconfig | 2 + configs/ls2080a_emu_defconfig | 2 + configs/ls2080a_simu_defconfig | 2 + configs/ls2080aqds_SECURE_BOOT_defconfig | 2 + configs/ls2080aqds_defconfig | 2 + configs/ls2080aqds_nand_defconfig | 2 + configs/ls2080aqds_qspi_defconfig | 2 + configs/ls2080aqds_sdcard_defconfig | 2 + configs/ls2080ardb_SECURE_BOOT_defconfig | 2 + configs/ls2080ardb_defconfig | 2 + configs/ls2080ardb_nand_defconfig | 2 + configs/ls2081ardb_defconfig | 2 + configs/ls2088ardb_qspi_defconfig | 2 + configs/lschlv2_defconfig | 2 + configs/lsxhl_defconfig | 2 + configs/m28evk_defconfig | 2 + configs/m53evk_defconfig | 2 + configs/ma5d4evk_defconfig | 2 + configs/microblaze-generic_defconfig | 2 + configs/minnowmax_defconfig | 2 + configs/mpr2_defconfig | 2 + configs/ms7720se_defconfig | 2 + configs/ms7722se_defconfig | 2 + configs/ms7750se_defconfig | 2 + configs/net2big_v2_defconfig | 2 + configs/netspace_lite_v2_defconfig | 2 + configs/netspace_max_v2_defconfig | 2 + configs/netspace_mini_v2_defconfig | 2 + configs/netspace_v2_defconfig | 2 + configs/novena_defconfig | 2 + configs/nsim_700_defconfig | 2 + configs/nsim_700be_defconfig | 2 + configs/nsim_hs38_defconfig | 2 + configs/nsim_hs38be_defconfig | 2 + configs/odroid_defconfig | 2 + configs/opos6uldev_defconfig | 2 + configs/picosam9g45_defconfig | 2 + configs/pm9261_defconfig | 2 + configs/pm9263_defconfig | 2 + configs/pm9g45_defconfig | 2 + configs/qemu-x86_64_defconfig | 2 + configs/qemu-x86_defconfig | 2 + configs/qemu-x86_efi_payload32_defconfig | 2 + configs/qemu-x86_efi_payload64_defconfig | 2 + configs/r0p7734_defconfig | 2 + configs/r2dplus_defconfig | 2 + configs/r7780mp_defconfig | 2 + configs/r8a7795_salvator-x_defconfig | 2 + configs/r8a7796_salvator-x_defconfig | 2 + configs/rsk7203_defconfig | 2 + configs/rsk7264_defconfig | 2 + configs/rsk7269_defconfig | 2 + configs/s32v234evb_defconfig | 2 + configs/s5p_goni_defconfig | 2 + configs/s5pc210_universal_defconfig | 2 + configs/sama5d2_ptc_nandflash_defconfig | 2 + configs/sama5d2_ptc_spiflash_defconfig | 2 + configs/sama5d2_xplained_mmc_defconfig | 2 + configs/sama5d2_xplained_spiflash_defconfig | 2 + configs/sama5d36ek_cmp_mmc_defconfig | 2 + configs/sama5d36ek_cmp_nandflash_defconfig | 2 + configs/sama5d36ek_cmp_spiflash_defconfig | 2 + configs/sama5d3_xplained_mmc_defconfig | 2 + configs/sama5d3_xplained_nandflash_defconfig | 2 + configs/sama5d3xek_mmc_defconfig | 2 + configs/sama5d3xek_nandflash_defconfig | 2 + configs/sama5d3xek_spiflash_defconfig | 2 + configs/sama5d4_xplained_mmc_defconfig | 2 + configs/sama5d4_xplained_nandflash_defconfig | 2 + configs/sama5d4_xplained_spiflash_defconfig | 2 + configs/sama5d4ek_mmc_defconfig | 2 + configs/sama5d4ek_nandflash_defconfig | 2 + configs/sama5d4ek_spiflash_defconfig | 2 + configs/sansa_fuze_plus_defconfig | 2 + configs/sc_sps_1_defconfig | 2 + configs/sh7752evb_defconfig | 2 + configs/sh7753evb_defconfig | 2 + configs/sh7757lcr_defconfig | 2 + configs/sh7763rdp_defconfig | 2 + configs/sh7785lcr_32bit_defconfig | 2 + configs/sh7785lcr_defconfig | 2 + configs/shmin_defconfig | 2 + configs/smdkc100_defconfig | 2 + configs/snapper9260_defconfig | 2 + configs/snapper9g20_defconfig | 2 + configs/socfpga_arria10_defconfig | 2 + configs/socfpga_is1_defconfig | 2 + configs/socfpga_mcvevk_defconfig | 2 + configs/socfpga_vining_fpga_defconfig | 2 + configs/som-db5800-som-6867_defconfig | 2 + configs/spear300_defconfig | 2 + configs/spear300_nand_defconfig | 2 + configs/spear300_usbtty_defconfig | 2 + configs/spear300_usbtty_nand_defconfig | 2 + configs/spear310_defconfig | 2 + configs/spear310_nand_defconfig | 2 + configs/spear310_pnor_defconfig | 2 + configs/spear310_usbtty_defconfig | 2 + configs/spear310_usbtty_nand_defconfig | 2 + configs/spear310_usbtty_pnor_defconfig | 2 + configs/spear320_defconfig | 2 + configs/spear320_nand_defconfig | 2 + configs/spear320_pnor_defconfig | 2 + configs/spear320_usbtty_defconfig | 2 + configs/spear320_usbtty_nand_defconfig | 2 + configs/spear320_usbtty_pnor_defconfig | 2 + configs/spear600_defconfig | 2 + configs/spear600_nand_defconfig | 2 + configs/spear600_usbtty_defconfig | 2 + configs/spear600_usbtty_nand_defconfig | 2 + configs/stih410-b2260_defconfig | 2 + configs/stm32f429-discovery_defconfig | 2 + configs/stm32f746-disco_defconfig | 2 + configs/taurus_defconfig | 2 + configs/tb100_defconfig | 2 + configs/theadorable-x86-dfi-bt700_defconfig | 2 + configs/thunderx_88xx_defconfig | 2 + configs/ti816x_evm_defconfig | 2 + configs/tplink_wdr4300_defconfig | 2 + configs/trats2_defconfig | 2 + configs/trats_defconfig | 2 + configs/usb_a9263_dataflash_defconfig | 2 + configs/vexpress_aemv8a_dram_defconfig | 2 + configs/vexpress_aemv8a_juno_defconfig | 2 + configs/vexpress_aemv8a_semi_defconfig | 2 + configs/vinco_defconfig | 2 + configs/work_92105_defconfig | 2 + configs/xfi3_defconfig | 2 + configs/zipitz2_defconfig | 2 + doc/README.x86 | 8 +-- include/config_fsl_chain_trust.h | 2 +- include/configs/M53017EVB.h | 2 - include/configs/M54418TWR.h | 16 ----- include/configs/M54451EVB.h | 1 - include/configs/M54455EVB.h | 1 - include/configs/MCR3000.h | 4 -- include/configs/MPC8315ERDB.h | 2 - include/configs/MPC832XEMDS.h | 2 - include/configs/MPC8349EMDS.h | 2 - include/configs/MPC8349ITX.h | 16 ----- include/configs/MPC837XEMDS.h | 2 - include/configs/MPC8536DS.h | 2 - include/configs/MPC8540ADS.h | 2 - include/configs/MPC8541CDS.h | 2 - include/configs/MPC8544DS.h | 2 - include/configs/MPC8548CDS.h | 2 - include/configs/MPC8555CDS.h | 2 - include/configs/MPC8560ADS.h | 2 - include/configs/MPC8568MDS.h | 2 - include/configs/MPC8569MDS.h | 2 - include/configs/MPC8572DS.h | 2 - include/configs/MPC8610HPCD.h | 2 - include/configs/MPC8641HPCN.h | 2 - include/configs/MigoR.h | 2 - include/configs/P1010RDB.h | 2 - include/configs/TQM834x.h | 4 -- include/configs/UCP1020.h | 2 - include/configs/ap121.h | 3 - include/configs/ap143.h | 3 - include/configs/ap325rxa.h | 2 - include/configs/ap_sh4a_4a.h | 2 - include/configs/apf27.h | 3 - include/configs/armadillo-800eva.h | 2 - include/configs/aspeed-common.h | 4 -- include/configs/astro_mcf5373l.h | 4 -- include/configs/at91-sama5_common.h | 10 +--- include/configs/at91sam9260ek.h | 20 ------- include/configs/at91sam9261ek.h | 14 ----- include/configs/at91sam9263ek.h | 10 ---- include/configs/at91sam9m10g45ek.h | 10 ---- include/configs/at91sam9rlek.h | 14 ----- include/configs/at91sam9x5ek.h | 15 ----- include/configs/axs10x.h | 1 - include/configs/bg0900.h | 1 - include/configs/calimain.h | 1 - include/configs/cobra5272.h | 3 - include/configs/colibri_pxa270.h | 1 - include/configs/conga-qeval20-qa3-e3845.h | 4 -- include/configs/corvus.h | 6 -- include/configs/da850evm.h | 2 - include/configs/dbau1x00.h | 1 - include/configs/devkit3250.h | 1 - include/configs/dfi-bt700.h | 4 -- include/configs/dragonboard410c.h | 3 - include/configs/ds414.h | 1 - include/configs/ecovec.h | 2 - include/configs/edb93xx.h | 1 - include/configs/espt.h | 1 - include/configs/ethernut5.h | 6 -- include/configs/h2200.h | 2 - include/configs/hikey.h | 3 - include/configs/hsdk.h | 1 - include/configs/ids8313.h | 1 - include/configs/integratorap.h | 1 - include/configs/integratorcp.h | 1 - include/configs/km/keymile-common.h | 2 - include/configs/kzm9g.h | 2 - include/configs/lacie_kw.h | 2 - include/configs/ls1012a_common.h | 2 - include/configs/ls1043a_common.h | 4 -- include/configs/ls1046a_common.h | 4 -- include/configs/ls2080a_common.h | 4 -- include/configs/ls2080ardb.h | 7 --- include/configs/lsxl.h | 1 - include/configs/m28evk.h | 1 - include/configs/m53evk.h | 1 - include/configs/ma5d4evk.h | 2 - include/configs/microblaze-generic.h | 1 - include/configs/mpr2.h | 1 - include/configs/ms7720se.h | 1 - include/configs/ms7722se.h | 2 - include/configs/ms7750se.h | 1 - include/configs/novena.h | 1 - include/configs/nsim.h | 1 - include/configs/odroid.h | 1 - include/configs/opos6uldev.h | 1 - include/configs/p1_p2_rdb_pc.h | 2 - include/configs/p1_twr.h | 2 - include/configs/pb1x00.h | 1 - include/configs/picosam9g45.h | 2 - include/configs/pm9261.h | 11 ---- include/configs/pm9263.h | 16 ----- include/configs/pm9g45.h | 7 --- include/configs/qemu-mips.h | 1 - include/configs/qemu-mips64.h | 1 - include/configs/r0p7734.h | 2 - include/configs/r2dplus.h | 1 - include/configs/r7780mp.h | 1 - include/configs/rcar-gen2-common.h | 2 - include/configs/rcar-gen3-common.h | 4 -- include/configs/rsk7203.h | 1 - include/configs/rsk7264.h | 1 - include/configs/rsk7269.h | 1 - include/configs/s32v234evb.h | 1 - include/configs/s5p_goni.h | 3 - include/configs/s5pc210_universal.h | 1 - include/configs/sama5d2_ptc.h | 6 -- include/configs/sama5d2_xplained.h | 3 - include/configs/sandbox.h | 2 - include/configs/sansa_fuze_plus.h | 1 - include/configs/sbc8349.h | 2 - include/configs/sbc8548.h | 2 - include/configs/sbc8641d.h | 2 - include/configs/sc_sps_1.h | 1 - include/configs/sh7752evb.h | 2 - include/configs/sh7753evb.h | 2 - include/configs/sh7757lcr.h | 2 - include/configs/sh7763rdp.h | 1 - include/configs/sh7785lcr.h | 2 - include/configs/shmin.h | 2 - include/configs/smdkc100.h | 3 - include/configs/snapper9260.h | 1 - include/configs/socfpga_arria10_socdk.h | 7 --- include/configs/socfpga_is1.h | 1 - include/configs/socfpga_mcvevk.h | 1 - include/configs/socfpga_vining_fpga.h | 1 - include/configs/socrates.h | 2 - include/configs/spear-common.h | 5 -- include/configs/stih410-b2260.h | 3 - include/configs/stm32f429-discovery.h | 2 - include/configs/stm32f746-disco.h | 2 - include/configs/taurus.h | 69 ---------------------- include/configs/tb100.h | 1 - include/configs/thunderx_88xx.h | 6 -- include/configs/ti816x_evm.h | 2 - include/configs/ti_armv7_keystone2.h | 2 - include/configs/tplink_wdr4300.h | 2 - include/configs/trats.h | 1 - include/configs/trats2.h | 1 - include/configs/usb_a9263.h | 4 -- include/configs/usbarmory.h | 1 - include/configs/vexpress_aemv8a.h | 20 ------- include/configs/vinco.h | 3 - include/configs/vme8349.h | 2 - include/configs/work_92105.h | 1 - include/configs/x86-common.h | 2 - include/configs/xfi3.h | 1 - include/configs/zipitz2.h | 2 - include/env_default.h | 2 +- scripts/config_whitelist.txt | 3 - 395 files changed, 507 insertions(+), 540 deletions(-)

diff --git a/README b/README index 1527dee040..d2cdd0ada3 100644 --- a/README +++ b/README @@ -699,11 +699,6 @@ The following options need to be configured: when no character is read on the console interface within "Boot Delay" after reset.

- CONFIG_BOOTARGS - This can be used to pass arguments to the bootm - command. The value of CONFIG_BOOTARGS goes into the - environment value "bootargs". - CONFIG_RAMBOOT and CONFIG_NFSBOOT The value of these goes into the environment as "ramboot" and "nfsboot" respectively, and can be used diff --git a/common/Kconfig b/common/Kconfig index 8c8d2e4832..96683128c8 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -615,6 +615,22 @@ config BOOTDELAY

See doc/README.autoboot for details.

+config USE_BOOTARGS + bool "Enable boot arguments" + help + Provide boot arguments to bootm command. Boot arguments are specified + in CONFIG_BOOTARGS option. Enable this option to be able to specify + CONFIG_BOOTARGS string. If this option is disabled, CONFIG_BOOTARGS + will be undefined and won't take any space in U-Boot image. + +config BOOTARGS + string "Boot arguments" + depends on USE_BOOTARGS + help + This can be used to pass arguments to the bootm command. The value of + CONFIG_BOOTARGS goes into the environment value "bootargs". Note that + this value will also override the "chosen" node in FDT blob. + menu "Console"

config MENU diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig index 67dfe0bec1..b5caeedd2c 100644 --- a/configs/M53017EVB_defconfig +++ b/configs/M53017EVB_defconfig @@ -3,6 +3,8 @@ CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_M53017EVB=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock3 rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_SETEXPR is not set diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig index bf0b34fd23..debe959269 100644 --- a/configs/M54418TWR_defconfig +++ b/configs/M54418TWR_defconfig @@ -3,6 +3,8 @@ CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=50000000" CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.1.1:/tftpboot/192.168.1.2 ip=192.168.1.2:192.168.1.1:192.168.1.1: 255.255.255.0::eth0:off:rw console=ttyS0,115200" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="-> " diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig index ba7cb9f4bd..d24c86e48c 100644 --- a/configs/M54418TWR_nand_mii_defconfig +++ b/configs/M54418TWR_nand_mii_defconfig @@ -3,6 +3,8 @@ CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_INPUT_CLKSRC=25000000" CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock2 rw rootfstype=jffs2 mtdparts=NAND:1M(u-boot)ro,7M(kernel)ro,-(jffs2) console=ttyS0,115200" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="-> " diff --git a/configs/M54418TWR_nand_rmii_defconfig b/configs/M54418TWR_nand_rmii_defconfig index 6abe98a4ca..b863422e25 100644 --- a/configs/M54418TWR_nand_rmii_defconfig +++ b/configs/M54418TWR_nand_rmii_defconfig @@ -3,6 +3,8 @@ CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_INPUT_CLKSRC=50000000" CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock2 rw rootfstype=jffs2 mtdparts=NAND:1M(u-boot)ro,7M(kernel)ro,-(jffs2) console=ttyS0,115200" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="-> " diff --git a/configs/M54418TWR_nand_rmii_lowfreq_defconfig b/configs/M54418TWR_nand_rmii_lowfreq_defconfig index 3860716919..23d3f5b19e 100644 --- a/configs/M54418TWR_nand_rmii_lowfreq_defconfig +++ b/configs/M54418TWR_nand_rmii_lowfreq_defconfig @@ -3,6 +3,8 @@ CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_INPUT_CLKSRC=50000000" CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock2 rw rootfstype=jffs2 mtdparts=NAND:1M(u-boot)ro,7M(kernel)ro,-(jffs2) console=ttyS0,115200" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="-> " diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig index 47a786a8a6..955878ad22 100644 --- a/configs/M54418TWR_serial_mii_defconfig +++ b/configs/M54418TWR_serial_mii_defconfig @@ -3,6 +3,8 @@ CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=25000000" CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.1.1:/tftpboot/192.168.1.2 ip=192.168.1.2:192.168.1.1:192.168.1.1: 255.255.255.0::eth0:off:rw console=ttyS0,115200" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="-> " diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig index bf0b34fd23..debe959269 100644 --- a/configs/M54418TWR_serial_rmii_defconfig +++ b/configs/M54418TWR_serial_rmii_defconfig @@ -3,6 +3,8 @@ CONFIG_SYS_TEXT_BASE=0x47E00000 CONFIG_TARGET_M54418TWR=y CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=50000000" CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.1.1:/tftpboot/192.168.1.2 ip=192.168.1.2:192.168.1.1:192.168.1.1: 255.255.255.0::eth0:off:rw console=ttyS0,115200" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="-> " diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig index 5f6382d46a..3ada606ad8 100644 --- a/configs/M54451EVB_defconfig +++ b/configs/M54451EVB_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_M54451EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INPUT_CLKSRC=24000000" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:2M(kernel)ro,-(jffs2)" CONFIG_SYS_PROMPT="-> " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/M54451EVB_stmicro_defconfig b/configs/M54451EVB_stmicro_defconfig index 0f7a87ce98..ddded4322f 100644 --- a/configs/M54451EVB_stmicro_defconfig +++ b/configs/M54451EVB_stmicro_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_M54451EVB=y CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_STMICRO_BOOT,SYS_INPUT_CLKSRC=24000000" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:2M(kernel)ro,-(jffs2)" # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig index 11ed3c64eb..54e2e4cf14 100644 --- a/configs/M54455EVB_a66_defconfig +++ b/configs/M54455EVB_a66_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=66666666" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)" CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig index 9c90ca536d..c57f334a47 100644 --- a/configs/M54455EVB_defconfig +++ b/configs/M54455EVB_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=33333333" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)" CONFIG_SYS_PROMPT="-> " CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig index d5cdf73c01..3b9ad632b0 100644 --- a/configs/M54455EVB_i66_defconfig +++ b/configs/M54455EVB_i66_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=66666666" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)" CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig index 158024237b..6e61424a57 100644 --- a/configs/M54455EVB_intel_defconfig +++ b/configs/M54455EVB_intel_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=33333333" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)" CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig index dac5f6f7c6..c5525c3003 100644 --- a/configs/M54455EVB_stm33_defconfig +++ b/configs/M54455EVB_stm33_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_INPUT_CLKSRC=33333333" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)" CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig index 7aaf339213..b75dd576e0 100644 --- a/configs/MCR3000_defconfig +++ b/configs/MCR3000_defconfig @@ -69,3 +69,5 @@ CONFIG_MPC8XX_FEC=y CONFIG_SHA256=y CONFIG_LZMA=y CONFIG_OF_LIBFDT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="ubi.mtd=4 root=ubi0:rootfs rw rootfstype=ubifs rootflags=sync console=ttyCPM0,115200N8 ip=${ipaddr}:::${netmask}:mcr3k:eth0:off" diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig index fc672be7e9..915453387b 100644 --- a/configs/MPC8349ITXGP_defconfig +++ b/configs/MPC8349ITXGP_defconfig @@ -5,6 +5,8 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITXGP,SYS_TEXT_BASE=0xFE000000" CONFIG_BOOTDELAY=6 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitxgp:eth0:off console=ttyS0,115200" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="MPC8349E-mITX-GP> " CONFIG_CMD_I2C=y diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig index c7f093eaa7..2039ac5f4d 100644 --- a/configs/MPC8349ITX_LOWBOOT_defconfig +++ b/configs/MPC8349ITX_LOWBOOT_defconfig @@ -5,6 +5,8 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX,SYS_TEXT_BASE=0xFE000000" CONFIG_BOOTDELAY=6 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitx:eth0:off console=ttyS0,115200" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="MPC8349E-mITX> " CONFIG_CMD_IDE=y diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig index e508b3d388..e725a46340 100644 --- a/configs/MPC8349ITX_defconfig +++ b/configs/MPC8349ITX_defconfig @@ -5,6 +5,8 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX" CONFIG_BOOTDELAY=6 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=:/nfsroot/rootfs ip=::::mpc8349emitx:eth0:off console=ttyS0,115200" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="MPC8349E-mITX> " CONFIG_CMD_IDE=y diff --git a/configs/MigoR_defconfig b/configs/MigoR_defconfig index 091045f6a3..b2a8ab6afc 100644 --- a/configs/MigoR_defconfig +++ b/configs/MigoR_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_MIGOR=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200 root=1f01" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig index afe6c96fd1..9ce2288d25 100644 --- a/configs/ap121_defconfig +++ b/configs/ap121_defconfig @@ -5,6 +5,8 @@ CONFIG_DEFAULT_DEVICE_TREE="ap121" CONFIG_DEBUG_UART=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs" CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="ap121 # " diff --git a/configs/ap143_defconfig b/configs/ap143_defconfig index ca77e7902d..1d6a2c0f66 100644 --- a/configs/ap143_defconfig +++ b/configs/ap143_defconfig @@ -6,6 +6,8 @@ CONFIG_DEFAULT_DEVICE_TREE="ap143" CONFIG_DEBUG_UART=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs" CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="ap143 # " diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig index ebefe3cdb3..82a031b88e 100644 --- a/configs/ap325rxa_defconfig +++ b/configs/ap325rxa_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_AP325RXA=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC2,38400" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/ap_sh4a_4a_defconfig b/configs/ap_sh4a_4a_defconfig index c08ae4f3eb..36cb45d1c0 100644 --- a/configs/ap_sh4a_4a_defconfig +++ b/configs/ap_sh4a_4a_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_AP_SH4A_4A=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC4,115200" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig index 6d7c1983d4..d25fc242ad 100644 --- a/configs/apf27_defconfig +++ b/configs/apf27_defconfig @@ -6,6 +6,8 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_IDENT_STRING=" apf27 patch 3.10" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=5 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySMX0,115200 mtdparts=mxc_nand.0:1M(u-boot)ro,512K(env),512K(env2),512K(firmware),512K(dtb),5M(kernel),-(rootfs) ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs " CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index 888bb334bf..0395fc664e 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -1,6 +1,8 @@ CONFIG_M68K=y CONFIG_TARGET_ASTRO_MCF5373L=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS=" console=ttyS2,115200 rootfstype=romfs loaderversion=$loaderversion" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="URMEL > " diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig index d0aff37106..fa0f742bc2 100644 --- a/configs/at91sam9260ek_dataflash_cs0_defconfig +++ b/configs/at91sam9260ek_dataflash_cs0_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig index 1aa7c17867..80524064d1 100644 --- a/configs/at91sam9260ek_dataflash_cs1_defconfig +++ b/configs/at91sam9260ek_dataflash_cs1_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig index 36c48cc13c..231e5017be 100644 --- a/configs/at91sam9260ek_nandflash_defconfig +++ b/configs/at91sam9260ek_nandflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig index a044dd095d..f779db001c 100644 --- a/configs/at91sam9261ek_dataflash_cs0_defconfig +++ b/configs/at91sam9261ek_dataflash_cs0_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_AT91SAM9261EK=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig index 19a73330dc..75e8cba5e5 100644 --- a/configs/at91sam9261ek_dataflash_cs3_defconfig +++ b/configs/at91sam9261ek_dataflash_cs3_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_AT91SAM9261EK=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig index bcb9614565..c535e1690b 100644 --- a/configs/at91sam9261ek_nandflash_defconfig +++ b/configs/at91sam9261ek_nandflash_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_AT91SAM9261EK=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig index b5cf90997e..c3211c6eb4 100644 --- a/configs/at91sam9263ek_dataflash_cs0_defconfig +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig index b5cf90997e..c3211c6eb4 100644 --- a/configs/at91sam9263ek_dataflash_defconfig +++ b/configs/at91sam9263ek_dataflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig index 771dacb5a8..4adfb1e0f5 100644 --- a/configs/at91sam9263ek_nandflash_defconfig +++ b/configs/at91sam9263ek_nandflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig index 8b6edd9ac8..f508f6c0f1 100644 --- a/configs/at91sam9g10ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_AT91SAM9261EK=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig index 1597d0e52a..8236fe1b21 100644 --- a/configs/at91sam9g10ek_dataflash_cs3_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_AT91SAM9261EK=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig index 18bff857ee..ede8d8f76b 100644 --- a/configs/at91sam9g10ek_nandflash_defconfig +++ b/configs/at91sam9g10ek_nandflash_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_AT91SAM9261EK=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig index 5cbba37fd5..7ac01b8b11 100644 --- a/configs/at91sam9g20ek_2mmc_defconfig +++ b/configs/at91sam9g20ek_2mmc_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC" CONFIG_ENV_IS_IN_MMC=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig index 90266feb18..c2218e4215 100644 --- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig +++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig index c7192a72bc..d654b28cff 100644 --- a/configs/at91sam9g20ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig index 6ace30adee..d6dcf36a04 100644 --- a/configs/at91sam9g20ek_dataflash_cs1_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig index fdfe92e3ae..19292749f3 100644 --- a/configs/at91sam9g20ek_nandflash_defconfig +++ b/configs/at91sam9g20ek_nandflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig index ed9e9c20b9..0bc1a0bc2b 100644 --- a/configs/at91sam9m10g45ek_mmc_defconfig +++ b/configs/at91sam9m10g45ek_mmc_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 mtdparts=atmel_nand:8M(bootstrap/uboot/kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootwait" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig index c6e75fd285..7839d93140 100644 --- a/configs/at91sam9m10g45ek_nandflash_defconfig +++ b/configs/at91sam9m10g45ek_nandflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig index a104fbaae3..0b8a9a8e16 100644 --- a/configs/at91sam9rlek_dataflash_defconfig +++ b/configs/at91sam9rlek_dataflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig index 69ff8e6236..170ce34c9d 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_MMC" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 mtdparts=atmel_nand:8M(bootstrap/uboot/kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootwait" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig index a599777e3c..4cb789ff56 100644 --- a/configs/at91sam9rlek_nandflash_defconfig +++ b/configs/at91sam9rlek_nandflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig index 8fc457b28c..d161d17055 100644 --- a/configs/at91sam9x5ek_dataflash_defconfig +++ b/configs/at91sam9x5ek_dataflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 1b76127934..16a1dc8dc2 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="mem=128M console=ttyS0,115200 mtdparts=atmel_nand:8M(bootstrap/uboot/kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig index 23ef8072a3..3fb43c08aa 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig index 48c2559c52..0cf1c0d8b2 100644 --- a/configs/at91sam9x5ek_spiflash_defconfig +++ b/configs/at91sam9x5ek_spiflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig index 34e5681808..35d3cb41ee 100644 --- a/configs/at91sam9xeek_dataflash_cs0_defconfig +++ b/configs/at91sam9xeek_dataflash_cs0_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig index 8a3500a5e9..bb78a89bdd 100644 --- a/configs/at91sam9xeek_dataflash_cs1_defconfig +++ b/configs/at91sam9xeek_dataflash_cs1_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig index 7a7facf087..6c1255a53d 100644 --- a/configs/at91sam9xeek_nandflash_defconfig +++ b/configs/at91sam9xeek_nandflash_defconfig @@ -7,6 +7,8 @@ CONFIG_DEBUG_UART=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " # CONFIG_CMD_BDI is not set diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 7b26d45762..9697566e14 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -15,6 +15,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus" CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="\0addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}::off\0addtest=setenv bootargs ${bootargs} loglevel=4 test\0baudrate=115200\0boot_file=setenv bootfile /${project_dir}/kernel/uImage\0boot_retries=0\0bootcmd=run flash_self\0bootdelay=3\0ethact=macb0\0flash_nfs=run nand_kernel;run nfsargs;run addip;upgrade_available;bootm ${kernel_ram};reset\0flash_self=run nand_kernel;run setbootargs;upgrade_available;bootm ${kernel_ram};reset\0flash_self_test=run nand_kernel;run setbootargs addtest; upgrade_available;bootm ${kernel_ram};reset\0hostname=systemone\0kernel_Off=0x00200000\0kernel_Off_fallback=0x03800000\0kernel_ram=0x21500000\0kernel_size=0x00400000\0kernel_size_fallback=0x00400000\0loads_echo=1\0nand_kernel=nand read.e ${kernel_ram} ${kernel_Off} ${kernel_size}\0net_nfs=run boot_file;tftp ${kernel_ram} ${bootfile};run nfsargs;run addip;upgrade_available;bootm ${kernel_ram};reset\0netdev=eth0\0nfsargs=run root_path;setenv bootargs ${bootargs} root=/dev/nfs rw nfsroot=${serverip}:${rootpath} at91sam9_wdt.wdt_timeout=16\0partitionset_active=A\0preboot=echo;echo Type 'run flash_self' to use kernel and root filesystem on memory;echo Type 'run flash_nfs' to use kernel from memory and root filesystem over NFS;echo Type 'run net_nfs' to get Kernel over TFTP and mount root filesystem over NFS;echo\0project_dir=systemone\0root_path=setenv rootpath /home/projects/${project_dir}/rootfs\0rootfs=/dev/mtdblock5\0rootfs_fallback=/dev/mtdblock7\0setbootargs=setenv bootargs ${bootargs} console=ttyMTD,mtdoops root=${rootfs} rootfstype=jffs2 panic=7 at91sam9_wdt.wdt_timeout=16\0stderr=serial\0stdin=serial\0stdout=serial\0upgrade_available=0\0" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig index 4e5f2e5fc8..d2c1d24263 100644 --- a/configs/axs101_defconfig +++ b/configs/axs101_defconfig @@ -5,6 +5,8 @@ CONFIG_SYS_CLK_FREQ=750000000 CONFIG_DEFAULT_DEVICE_TREE="axs101" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS3,115200n8" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="AXS# " # CONFIG_CMD_IMLS is not set diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index ff0bf19303..224d677843 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -5,6 +5,8 @@ CONFIG_SYS_CLK_FREQ=100000000 CONFIG_DEFAULT_DEVICE_TREE="axs103" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS3,115200n8" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="AXS# " # CONFIG_CMD_IMLS is not set diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index 03a71edb24..b72f6e7388 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -15,6 +15,8 @@ CONFIG_SEABIOS=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_ARCH_EARLY_INIT_R is not set CONFIG_ARCH_MISC_INIT=y diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index 01012c83d4..4d361d3482 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -6,6 +6,8 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200" CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig index 11ceb76a04..f7c917b686 100644 --- a/configs/chromebook_link64_defconfig +++ b/configs/chromebook_link64_defconfig @@ -20,6 +20,8 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CPU_SUPPORT=y diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 461266d09f..6abff6cff7 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -12,6 +12,8 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index 19c96c0176..3b6bf37f5e 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_defconfig @@ -12,6 +12,8 @@ CONFIG_HAVE_VGA_BIOS=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index e447431931..1244278a50 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -9,6 +9,8 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig index 040408bcda..51f3a09fc0 100644 --- a/configs/colibri_pxa270_defconfig +++ b/configs/colibri_pxa270_defconfig @@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_TARGET_COLIBRI_PXA270=y CONFIG_ENV_IS_IN_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=tty0 console=ttyS0,115200" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_ELF is not set diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index a0cce754ff..f464dd8b9a 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -78,3 +78,5 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_114=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_USE_PRIVATE_LIBGCC=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sda2 ro quiet" diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 26eed7c268..791bddad44 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -15,6 +15,8 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sda2 ro quiet" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_ARCH_MISC_INIT=y CONFIG_HUSH_PARSER=y diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index ab7f0d6b43..fd83b40857 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -5,6 +5,8 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_BOARD_EARLY_INIT_F is not set CONFIG_HUSH_PARSER=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index af0beb2a81..0531a27d2e 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -13,6 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-corvus" CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig index 3a4ef1c29d..9b6da828f3 100644 --- a/configs/cougarcanyon2_defconfig +++ b/configs/cougarcanyon2_defconfig @@ -3,6 +3,8 @@ CONFIG_VENDOR_INTEL=y CONFIG_DEFAULT_DEVICE_TREE="cougarcanyon2" CONFIG_TARGET_COUGARCANYON2=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_ARCH_EARLY_INIT_R is not set diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index dde07f7e70..b05362ee7b 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -9,6 +9,8 @@ CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_FIT=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index 0b3769e8d1..e2be02c5e2 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" D2 v2" CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig index e3320e6641..7e056e891d 100644 --- a/configs/da850_am18xxevm_defconfig +++ b/configs/da850_am18xxevm_defconfig @@ -9,6 +9,8 @@ CONFIG_SPL_SPI_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp" CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index a49ef71e2d..0135e7d2f3 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -9,6 +9,8 @@ CONFIG_SPL_SPI_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp" CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index 0a5c636c50..5c6ae25622 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_DA850EVM=y CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp" CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index c17e7ec162..1540d85dd9 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -6,6 +6,8 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200n8" CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index c86e0a9e4f..5edfc0a3f7 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -15,6 +15,8 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sda1 ro quiet" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_ARCH_EARLY_INIT_R is not set CONFIG_HUSH_PARSER=y diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index c78b4a6fd5..0c8f03069f 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 410C" CONFIG_DEFAULT_DEVICE_TREE="dragonboard410c" CONFIG_DISTRO_DEFAULTS=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyMSM0,115200n8" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="dragonboard410c => " diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index bde54b6bab..5a730bd97a 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -10,6 +10,8 @@ CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="armada-xp-synology-ds414" CONFIG_DEBUG_UART=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y diff --git a/configs/ecovec_defconfig b/configs/ecovec_defconfig index 7fb14ab9de..b06eb49130 100644 --- a/configs/ecovec_defconfig +++ b/configs/ecovec_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_ECOVEC=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/edb9315a_defconfig b/configs/edb9315a_defconfig index adc9a68de2..e723792d8d 100644 --- a/configs/edb9315a_defconfig +++ b/configs/edb9315a_defconfig @@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_TARGET_EDB93XX=y CONFIG_SYS_EXTRA_OPTIONS="MK_edb9315a" CONFIG_ENV_IS_IN_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/nfs console=ttyAM0,115200 ip=dhcp" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig index d28812ae13..d58d9eb31a 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_defconfig @@ -5,6 +5,8 @@ CONFIG_TARGET_EFI=y CONFIG_DEBUG_UART=y CONFIG_FIT=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_ARCH_EARLY_INIT_R is not set diff --git a/configs/espt_defconfig b/configs/espt_defconfig index a7f50efc45..730816d436 100644 --- a/configs/espt_defconfig +++ b/configs/espt_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_ESPT=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200 root=1f01" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index 2bf06ad878..8e407c12fa 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_ETHERNUT5=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index ae650fc5d7..95ddc9c13f 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -5,6 +5,8 @@ CONFIG_TARGET_EVB_AST2500=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEFAULT_DEVICE_TREE="ast2500-evb" CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw" CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_PRE_CON_BUF_ADDR=0x1e720000 # CONFIG_DISPLAY_CPUINFO is not set diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 6da437c07b..f002a6fd95 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -10,6 +10,8 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_CONSOLE_MUX=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_ARCH_MISC_INIT=y diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig index cdc059a156..bb4e67eff2 100644 --- a/configs/h2200_defconfig +++ b/configs/h2200_defconfig @@ -3,6 +3,8 @@ CONFIG_TARGET_H2200=y CONFIG_FIT=y # CONFIG_FIT_ENABLE_SHA256_SUPPORT is not set CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/ram0 ro console=ttyS0,115200n8" CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig index 6df04de281..6d51f1287a 100644 --- a/configs/hikey_defconfig +++ b/configs/hikey_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="hikey" CONFIG_DEFAULT_DEVICE_TREE="hi6220-hikey" CONFIG_DISTRO_DEFAULTS=y CONFIG_ENV_IS_IN_FAT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200n8 root=/dev/mmcblk0p9 rw" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/hsdk_defconfig b/configs/hsdk_defconfig index eb3dfbd570..49e2eeacfc 100644 --- a/configs/hsdk_defconfig +++ b/configs/hsdk_defconfig @@ -5,6 +5,8 @@ CONFIG_SYS_TEXT_BASE=0x81000000 CONFIG_SYS_CLK_FREQ=1000000000 CONFIG_DEFAULT_DEVICE_TREE="hsdk" CONFIG_ENV_IS_IN_FAT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200n8" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="hsdk# " # CONFIG_CMD_IMLS is not set diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig index e49407155f..83380e72c7 100644 --- a/configs/inetspace_v2_defconfig +++ b/configs/inetspace_v2_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" IS v2" CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig index 0685dca0de..1b1ba9ba83 100644 --- a/configs/integratorap_cm720t_defconfig +++ b/configs/integratorap_cm720t_defconfig @@ -3,6 +3,8 @@ CONFIG_ARCH_INTEGRATOR=y CONFIG_ARCH_INTEGRATOR_AP=y CONFIG_CM720T=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig index 9c27bdb848..d0da3df711 100644 --- a/configs/integratorap_cm920t_defconfig +++ b/configs/integratorap_cm920t_defconfig @@ -3,6 +3,8 @@ CONFIG_ARCH_INTEGRATOR=y CONFIG_ARCH_INTEGRATOR_AP=y CONFIG_CM920T=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig index 77aa6a8bd7..2f666f2563 100644 --- a/configs/integratorap_cm926ejs_defconfig +++ b/configs/integratorap_cm926ejs_defconfig @@ -3,6 +3,8 @@ CONFIG_ARCH_INTEGRATOR=y CONFIG_ARCH_INTEGRATOR_AP=y CONFIG_CM926EJ_S=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig index 55bfe3a2a3..65d1db44fc 100644 --- a/configs/integratorap_cm946es_defconfig +++ b/configs/integratorap_cm946es_defconfig @@ -3,6 +3,8 @@ CONFIG_ARCH_INTEGRATOR=y CONFIG_ARCH_INTEGRATOR_AP=y CONFIG_CM946ES=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig index 1536005ce5..8f315fb357 100644 --- a/configs/integratorcp_cm1136_defconfig +++ b/configs/integratorcp_cm1136_defconfig @@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y CONFIG_ARCH_INTEGRATOR_CP=y CONFIG_CM1136=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig index 4e43b4f04e..47b44f19fb 100644 --- a/configs/integratorcp_cm920t_defconfig +++ b/configs/integratorcp_cm920t_defconfig @@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y CONFIG_ARCH_INTEGRATOR_CP=y CONFIG_CM920T=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig index 037cd4dc61..f39f021d89 100644 --- a/configs/integratorcp_cm926ejs_defconfig +++ b/configs/integratorcp_cm926ejs_defconfig @@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y CONFIG_ARCH_INTEGRATOR_CP=y CONFIG_CM926EJ_S=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig index b19162f984..c9c4d98d1f 100644 --- a/configs/integratorcp_cm946es_defconfig +++ b/configs/integratorcp_cm946es_defconfig @@ -2,6 +2,8 @@ CONFIG_ARM=y CONFIG_ARCH_INTEGRATOR=y CONFIG_ARCH_INTEGRATOR_CP=y CONFIG_CM946ES=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig index 0ee7f4bb80..a68d012e8d 100644 --- a/configs/kzm9g_defconfig +++ b/configs/kzm9g_defconfig @@ -4,6 +4,8 @@ CONFIG_ARCH_RMOBILE=y CONFIG_TARGET_KZM9G=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/null console=ttySC4,115200" CONFIG_VERSION_VARIABLE=y CONFIG_SYS_PROMPT="KZM-A9-GT# " CONFIG_CMD_BOOTZ=y diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig index 09110f60b8..1c4571fd94 100644 --- a/configs/ls1012afrdm_qspi_defconfig +++ b/configs/ls1012afrdm_qspi_defconfig @@ -11,6 +11,8 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" CONFIG_QSPI_BOOT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig index 15a73fcb17..696527835a 100644 --- a/configs/ls1012aqds_qspi_defconfig +++ b/configs/ls1012aqds_qspi_defconfig @@ -11,6 +11,8 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" CONFIG_QSPI_BOOT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig index ec6ed377d4..754caeff12 100644 --- a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig @@ -10,6 +10,8 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000" CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_GREPENV=y diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig index 5eb35dfc4a..2d2b5b8b00 100644 --- a/configs/ls1012ardb_qspi_defconfig +++ b/configs/ls1012ardb_qspi_defconfig @@ -11,6 +11,8 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" CONFIG_QSPI_BOOT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y diff --git a/configs/ls1043aqds_defconfig b/configs/ls1043aqds_defconfig index 392ebf92cf..f02251bbe0 100644 --- a/configs/ls1043aqds_defconfig +++ b/configs/ls1043aqds_defconfig @@ -6,6 +6,8 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y diff --git a/configs/ls1043aqds_lpuart_defconfig b/configs/ls1043aqds_lpuart_defconfig index 40dd554835..323d6f2ba4 100644 --- a/configs/ls1043aqds_lpuart_defconfig +++ b/configs/ls1043aqds_lpuart_defconfig @@ -7,6 +7,8 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="LPUART" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y diff --git a/configs/ls1043aqds_nor_ddr3_defconfig b/configs/ls1043aqds_nor_ddr3_defconfig index d5628e765a..5f40ce1ccf 100644 --- a/configs/ls1043aqds_nor_ddr3_defconfig +++ b/configs/ls1043aqds_nor_ddr3_defconfig @@ -6,6 +6,8 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y diff --git a/configs/ls1043aqds_qspi_defconfig b/configs/ls1043aqds_qspi_defconfig index 4ffd150af2..0c5c54a052 100644 --- a/configs/ls1043aqds_qspi_defconfig +++ b/configs/ls1043aqds_qspi_defconfig @@ -8,6 +8,8 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" CONFIG_QSPI_BOOT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig index d914be2309..3b10f82fe0 100644 --- a/configs/ls1043ardb_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_SECURE_BOOT_defconfig @@ -6,6 +6,8 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb" CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" CONFIG_HUSH_PARSER=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/ls1043ardb_defconfig b/configs/ls1043ardb_defconfig index 4050737fec..27ad457000 100644 --- a/configs/ls1043ardb_defconfig +++ b/configs/ls1043ardb_defconfig @@ -6,6 +6,8 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:1m(nand_uboot),1m(nand_uboot_env),20m(nand_fit);spi0.0:1m(uboot),5m(kernel),1m(dtb),9m(file_system)" CONFIG_HUSH_PARSER=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/ls1046aqds_SECURE_BOOT_defconfig b/configs/ls1046aqds_SECURE_BOOT_defconfig index cead5afe03..bf5694c208 100644 --- a/configs/ls1046aqds_SECURE_BOOT_defconfig +++ b/configs/ls1046aqds_SECURE_BOOT_defconfig @@ -6,6 +6,8 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:4m(nand_uboot),36m(nand_kernel),472m(nand_free);spi0.0:2m(uboot),14m(free)" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig index ea006902f5..9767688e56 100644 --- a/configs/ls1046aqds_defconfig +++ b/configs/ls1046aqds_defconfig @@ -6,6 +6,8 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:4m(nand_uboot),36m(nand_kernel),472m(nand_free);spi0.0:2m(uboot),14m(free)" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig index 5498c01eb1..7b1c0d71b3 100644 --- a/configs/ls1046aqds_lpuart_defconfig +++ b/configs/ls1046aqds_lpuart_defconfig @@ -7,6 +7,8 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="LPUART" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=60000000.nor:2m@0x100000(nor_bank0_uboot),40m@0x1100000(nor_bank0_fit),7m(nor_bank0_user),2m@0x4100000(nor_bank4_uboot),40m@0x5100000(nor_bank4_fit),-(nor_bank4_user);7e800000.flash:4m(nand_uboot),36m(nand_kernel),472m(nand_free);spi0.0:2m(uboot),14m(free)" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y diff --git a/configs/ls1046aqds_qspi_defconfig b/configs/ls1046aqds_qspi_defconfig index 3a3cff6219..94456f6922 100644 --- a/configs/ls1046aqds_qspi_defconfig +++ b/configs/ls1046aqds_qspi_defconfig @@ -7,6 +7,8 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_QSPI_BOOT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:2m(uboot),14m(free)" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig index de14dc1a33..943c26de68 100644 --- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig @@ -8,6 +8,8 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)" CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_GPT=y diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig index f4ff5d6998..1e3539f4bc 100644 --- a/configs/ls1046ardb_qspi_defconfig +++ b/configs/ls1046ardb_qspi_defconfig @@ -8,6 +8,8 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_QSPI_BOOT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 mtdparts=1550000.quadspi:1m(rcw),15m(u-boot),48m(kernel.itb);7e800000.flash:16m(nand_uboot),48m(nand_kernel),448m(nand_free)" CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_GPT=y diff --git a/configs/ls2080a_emu_defconfig b/configs/ls2080a_emu_defconfig index 04e6433986..f09a046048 100644 --- a/configs/ls2080a_emu_defconfig +++ b/configs/ls2080a_emu_defconfig @@ -8,6 +8,8 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="EMU" CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/ls2080a_simu_defconfig b/configs/ls2080a_simu_defconfig index 6b2f3fbabf..dda77e0b21 100644 --- a/configs/ls2080a_simu_defconfig +++ b/configs/ls2080a_simu_defconfig @@ -8,6 +8,8 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SIMU" CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig index 617c522851..d4ad6095f1 100644 --- a/configs/ls2080aqds_SECURE_BOOT_defconfig +++ b/configs/ls2080aqds_SECURE_BOOT_defconfig @@ -8,6 +8,8 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y diff --git a/configs/ls2080aqds_defconfig b/configs/ls2080aqds_defconfig index c1765894e7..058ae86016 100644 --- a/configs/ls2080aqds_defconfig +++ b/configs/ls2080aqds_defconfig @@ -8,6 +8,8 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index b8c6e6acd8..583c53a383 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -14,6 +14,8 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_NAND_BOOT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" CONFIG_SPL=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y diff --git a/configs/ls2080aqds_qspi_defconfig b/configs/ls2080aqds_qspi_defconfig index 8277a3b910..cea8f2eff1 100644 --- a/configs/ls2080aqds_qspi_defconfig +++ b/configs/ls2080aqds_qspi_defconfig @@ -9,6 +9,8 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" CONFIG_QSPI_BOOT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y diff --git a/configs/ls2080aqds_sdcard_defconfig b/configs/ls2080aqds_sdcard_defconfig index 64682b0693..afd18bf0a9 100644 --- a/configs/ls2080aqds_sdcard_defconfig +++ b/configs/ls2080aqds_sdcard_defconfig @@ -14,6 +14,8 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4" CONFIG_SD_BOOT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x8b0 diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig index 70839e6f01..3d262ad4e3 100644 --- a/configs/ls2080ardb_SECURE_BOOT_defconfig +++ b/configs/ls2080ardb_SECURE_BOOT_defconfig @@ -8,6 +8,8 @@ CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS1,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0600 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig index 0689a40201..30764c7732 100644 --- a/configs/ls2080ardb_defconfig +++ b/configs/ls2080ardb_defconfig @@ -8,6 +8,8 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS1,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0600 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index c4a56be52d..58524b6afc 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -14,6 +14,8 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_NAND_BOOT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS1,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0600 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" CONFIG_SPL=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y diff --git a/configs/ls2081ardb_defconfig b/configs/ls2081ardb_defconfig index 7fcfdd4b6e..ad7c5b9b17 100644 --- a/configs/ls2081ardb_defconfig +++ b/configs/ls2081ardb_defconfig @@ -10,6 +10,8 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_QSPI_BOOT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS1,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0600 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" # CONFIG_CMD_IMLS is not set CONFIG_CMD_GREPENV=y CONFIG_CMD_GPT=y diff --git a/configs/ls2088ardb_qspi_defconfig b/configs/ls2088ardb_qspi_defconfig index 3a022330e2..4af69ac7cb 100644 --- a/configs/ls2088ardb_qspi_defconfig +++ b/configs/ls2088ardb_qspi_defconfig @@ -10,6 +10,8 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_QSPI_BOOT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS1,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0600 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256" # CONFIG_CMD_IMLS is not set CONFIG_CMD_GREPENV=y CONFIG_CMD_GPT=y diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig index 8a645a08a3..baa16ee0d6 100644 --- a/configs/lschlv2_defconfig +++ b/configs/lschlv2_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" LS-CHLv2" CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig index 1c9dc805b3..3736466557 100644 --- a/configs/lsxhl_defconfig +++ b/configs/lsxhl_defconfig @@ -7,6 +7,8 @@ CONFIG_SYS_EXTRA_OPTIONS="LSXHL" CONFIG_API=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig index 5fc5dd3b61..cfd952bf71 100644 --- a/configs/m28evk_defconfig +++ b/configs/m28evk_defconfig @@ -8,6 +8,8 @@ CONFIG_VIDEO=y CONFIG_FIT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200n8 " # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig index 4d35673c00..7e07ff235b 100644 --- a/configs/m53evk_defconfig +++ b/configs/m53evk_defconfig @@ -12,6 +12,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aries/m53evk/imximage.cfg" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttymxc1,115200" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig index c18f759ce3..782877544a 100644 --- a/configs/ma5d4evk_defconfig +++ b/configs/ma5d4evk_defconfig @@ -11,6 +11,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4" CONFIG_ENV_IS_IN_MMC=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS3,115200" CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 3d84cf24aa..b20b4f43ff 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -12,6 +12,8 @@ CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=romfs" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SPL=y CONFIG_SPL_BOARD_INIT=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 81e8253719..093761edbf 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -17,6 +17,8 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_ARCH_MISC_INIT=y # CONFIG_BOARD_EARLY_INIT_F is not set diff --git a/configs/mpr2_defconfig b/configs/mpr2_defconfig index ea33237003..6c24510d4f 100644 --- a/configs/mpr2_defconfig +++ b/configs/mpr2_defconfig @@ -1,5 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_MPR2=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200" CONFIG_VERSION_VARIABLE=y # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig index 30e52692d0..e9ed82fad4 100644 --- a/configs/ms7720se_defconfig +++ b/configs/ms7720se_defconfig @@ -1,5 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_MS7720SE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200" CONFIG_VERSION_VARIABLE=y # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set diff --git a/configs/ms7722se_defconfig b/configs/ms7722se_defconfig index 633a087616..7d4fa5c2ac 100644 --- a/configs/ms7722se_defconfig +++ b/configs/ms7722se_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_MS7722SE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200 root=1f01" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/ms7750se_defconfig b/configs/ms7750se_defconfig index 9fabcd9059..cd1d6556ad 100644 --- a/configs/ms7750se_defconfig +++ b/configs/ms7750se_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_MS7750SE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,38400" # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig index 8135b86ee7..fb083c1c4b 100644 --- a/configs/net2big_v2_defconfig +++ b/configs/net2big_v2_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" 2Big v2" CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig index 9020a36857..aae1aed737 100644 --- a/configs/netspace_lite_v2_defconfig +++ b/configs/netspace_lite_v2_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" NS v2 Lite" CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig index 741b4a5e42..842b5495a7 100644 --- a/configs/netspace_max_v2_defconfig +++ b/configs/netspace_max_v2_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" NS Max v2" CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig index 569e0167c1..052591f80a 100644 --- a/configs/netspace_mini_v2_defconfig +++ b/configs/netspace_mini_v2_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" NS v2 Mini" CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig index 64a83a4f73..e35c2731e9 100644 --- a/configs/netspace_v2_defconfig +++ b/configs/netspace_v2_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" NS v2" CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index 23c186b21a..17a4d79b47 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -16,6 +16,8 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" CONFIG_ENV_IS_IN_MMC=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttymxc1,115200 " CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y diff --git a/configs/nsim_700_defconfig b/configs/nsim_700_defconfig index fabae32ed5..59aabfb4a8 100644 --- a/configs/nsim_700_defconfig +++ b/configs/nsim_700_defconfig @@ -5,6 +5,8 @@ CONFIG_SYS_CLK_FREQ=70000000 CONFIG_DEFAULT_DEVICE_TREE="nsim" CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyARC0,115200n8" CONFIG_SYS_PROMPT="nsim# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/nsim_700be_defconfig b/configs/nsim_700be_defconfig index 021735f743..dc54a04d1f 100644 --- a/configs/nsim_700be_defconfig +++ b/configs/nsim_700be_defconfig @@ -6,6 +6,8 @@ CONFIG_SYS_CLK_FREQ=70000000 CONFIG_DEFAULT_DEVICE_TREE="nsim" CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyARC0,115200n8" CONFIG_SYS_PROMPT="nsim# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/nsim_hs38_defconfig b/configs/nsim_hs38_defconfig index db172394a3..5a9ef362ce 100644 --- a/configs/nsim_hs38_defconfig +++ b/configs/nsim_hs38_defconfig @@ -6,6 +6,8 @@ CONFIG_SYS_CLK_FREQ=70000000 CONFIG_DEFAULT_DEVICE_TREE="nsim" CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyARC0,115200n8" CONFIG_SYS_PROMPT="nsim# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/nsim_hs38be_defconfig b/configs/nsim_hs38be_defconfig index 8ffbb85a7a..7d62206898 100644 --- a/configs/nsim_hs38be_defconfig +++ b/configs/nsim_hs38be_defconfig @@ -7,6 +7,8 @@ CONFIG_SYS_CLK_FREQ=70000000 CONFIG_DEFAULT_DEVICE_TREE="nsim" CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyARC0,115200n8" CONFIG_SYS_PROMPT="nsim# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index 22e86e28c3..ea6523f49e 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -6,6 +6,8 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="Please use defined boot" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig index b9dab54efd..b9213675dd 100644 --- a/configs/opos6uldev_defconfig +++ b/configs/opos6uldev_defconfig @@ -12,6 +12,8 @@ CONFIG_VIDEO=y CONFIG_DEFAULT_DEVICE_TREE="imx6ul-opos6uldev" CONFIG_ENV_IS_IN_MMC=y CONFIG_BOOTDELAY=5 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttymxc0,115200" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_DEFAULT_FDT_FILE="imx6ul-opos6uldev.dtb" diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig index 326158d506..941ca8daeb 100644 --- a/configs/picosam9g45_defconfig +++ b/configs/picosam9g45_defconfig @@ -12,6 +12,8 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig index 4c35f41ac5..66a2db362a 100644 --- a/configs/pm9261_defconfig +++ b/configs/pm9261_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_PM9261=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock4 rootfstype=jffs2 fbcon=rotate:3 " # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_CPUINFO is not set diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig index 01baaa1215..25a1e0fffb 100644 --- a/configs/pm9263_defconfig +++ b/configs/pm9263_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_PM9263=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock4 rootfstype=jffs2 fbcon=rotate:3 " # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig index 4e52c7b96b..ca414c4394 100644 --- a/configs/pm9g45_defconfig +++ b/configs/pm9g45_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_PM9G45=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="fbcon=rotate:3 console=tty0 console=ttyS0,115200 root=/dev/mtdblock4 mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,1664k(env),2M(linux)ro,-(root) rw rootfstype=jffs2" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index fc1c70d833..3cf5a90953 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -20,6 +20,8 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_BOARD_EARLY_INIT_F is not set CONFIG_SPL_SYS_MALLOC_SIMPLE=y diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 26e56871f6..e7fb26e1c3 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -9,6 +9,8 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_BOARD_EARLY_INIT_F is not set CONFIG_HUSH_PARSER=y diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index ba5c0094dd..8c253b3f0b 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -6,6 +6,8 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_BOARD_EARLY_INIT_F is not set CONFIG_HUSH_PARSER=y diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig index 796c3c1a57..fdf18b8036 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -6,6 +6,8 @@ CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_BOARD_EARLY_INIT_F is not set CONFIG_HUSH_PARSER=y diff --git a/configs/r0p7734_defconfig b/configs/r0p7734_defconfig index a6f6a9324d..900c0506c6 100644 --- a/configs/r0p7734_defconfig +++ b/configs/r0p7734_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_R0P7734=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC3,115200" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig index 32a12720c9..2bdabe34cd 100644 --- a/configs/r2dplus_defconfig +++ b/configs/r2dplus_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_R2DPLUS=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200" CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PING=y diff --git a/configs/r7780mp_defconfig b/configs/r7780mp_defconfig index c5fa3f3b36..cd8542e995 100644 --- a/configs/r7780mp_defconfig +++ b/configs/r7780mp_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_R7780MP=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200" # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index c95dc4c9d2..3eee9d834a 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -4,6 +4,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index 53ad5a87ae..7e7b62e95c 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -5,6 +5,8 @@ CONFIG_RCAR_GEN3=y CONFIG_R8A7796=y CONFIG_TARGET_SALVATOR_X=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y diff --git a/configs/rsk7203_defconfig b/configs/rsk7203_defconfig index 1aeb78aad1..80c1998693 100644 --- a/configs/rsk7203_defconfig +++ b/configs/rsk7203_defconfig @@ -1,5 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_RSK7203=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200" CONFIG_VERSION_VARIABLE=y # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set diff --git a/configs/rsk7264_defconfig b/configs/rsk7264_defconfig index b07e48c68b..fdcdc312d3 100644 --- a/configs/rsk7264_defconfig +++ b/configs/rsk7264_defconfig @@ -1,6 +1,8 @@ CONFIG_SH=y CONFIG_TARGET_RSK7264=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC3,115200" # CONFIG_CMD_SETEXPR is not set CONFIG_MTD_NOR_FLASH=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/rsk7269_defconfig b/configs/rsk7269_defconfig index ed4fe21f94..1a2d3ca0b4 100644 --- a/configs/rsk7269_defconfig +++ b/configs/rsk7269_defconfig @@ -1,6 +1,8 @@ CONFIG_SH=y CONFIG_TARGET_RSK7269=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC7,115200" # CONFIG_CMD_SETEXPR is not set CONFIG_MTD_NOR_FLASH=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/s32v234evb_defconfig b/configs/s32v234evb_defconfig index be4b716e9e..e2271522d2 100644 --- a/configs/s32v234evb_defconfig +++ b/configs/s32v234evb_defconfig @@ -4,6 +4,8 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/s32v234evb/s32v234evb.cfg" CONFIG_ENV_IS_IN_MMC=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyLF0 root=/dev/ram rw" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_CMD_BOOTZ=y CONFIG_OF_LIBFDT=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 9c66a1826d..207764530b 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -3,6 +3,8 @@ CONFIG_ARCH_S5PC1XX=y CONFIG_TARGET_S5P_GONI=y CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni" CONFIG_ENV_IS_IN_MMC=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock8 rootfstype=ext4 ${console} ${meminfo} ${mtdparts}" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Goni # " diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 021e6c5102..464942b42a 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -3,6 +3,8 @@ CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_EXYNOS4=y CONFIG_TARGET_S5PC210_UNIVERSAL=y CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210" +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="Please use defined boot" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y diff --git a/configs/sama5d2_ptc_nandflash_defconfig b/configs/sama5d2_ptc_nandflash_defconfig index cb690224e5..f0492e0301 100644 --- a/configs/sama5d2_ptc_nandflash_defconfig +++ b/configs/sama5d2_ptc_nandflash_defconfig @@ -9,6 +9,8 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,57600 earlyprintk mtdparts=atmel_nand:6M(bootstrap)ro, 6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=2 root=ubi0:rootfs" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y # CONFIG_CMD_IMI is not set diff --git a/configs/sama5d2_ptc_spiflash_defconfig b/configs/sama5d2_ptc_spiflash_defconfig index c588e6bfb9..242e8edba7 100644 --- a/configs/sama5d2_ptc_spiflash_defconfig +++ b/configs/sama5d2_ptc_spiflash_defconfig @@ -10,6 +10,8 @@ CONFIG_SPL_SPI_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,57600 earlyprintk mtdparts=atmel_nand:6M(bootstrap)ro, 6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=2 root=ubi0:rootfs" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y # CONFIG_CMD_IMI is not set diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index e9a65ccb9d..995b510efd 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -16,6 +16,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_SPL_SEPARATE_BSS=y diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig index 8b9c0ccd2a..6a32302bf7 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -15,6 +15,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig index d99baad0f6..994a8249f8 100644 --- a/configs/sama5d36ek_cmp_mmc_defconfig +++ b/configs/sama5d36ek_cmp_mmc_defconfig @@ -8,6 +8,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig index 4307f3ac9c..9e835a6fb1 100644 --- a/configs/sama5d36ek_cmp_nandflash_defconfig +++ b/configs/sama5d36ek_cmp_nandflash_defconfig @@ -8,6 +8,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig index 53bab325b7..eb9f64916a 100644 --- a/configs/sama5d36ek_cmp_spiflash_defconfig +++ b/configs/sama5d36ek_cmp_spiflash_defconfig @@ -8,6 +8,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig index acd74994c4..9b45515e75 100644 --- a/configs/sama5d3_xplained_mmc_defconfig +++ b/configs/sama5d3_xplained_mmc_defconfig @@ -16,6 +16,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_SPL_SEPARATE_BSS=y diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index af8d1ef16d..b81acec727 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -14,6 +14,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig index 1836e5392f..24962d5b9a 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -16,6 +16,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index c1860bd36d..ea1c8e063f 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -14,6 +14,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index 41bf96c036..d5815b8b3a 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -15,6 +15,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig index 094e5e1c2d..c84cb74b7a 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -16,6 +16,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_SPL_SEPARATE_BSS=y diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index a096aa929c..d4813908fa 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -14,6 +14,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig index bd884b73c8..473263172b 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -15,6 +15,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index a3909a0639..57b972038e 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -16,6 +16,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC" CONFIG_ENV_IS_IN_FAT=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index c3d076e729..c4b3ace38b 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -14,6 +14,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index 7c6c8f27d6..f46b692ba5 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -15,6 +15,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y CONFIG_HUSH_PARSER=y diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig index 0da8d524e5..83fdca4a40 100644 --- a/configs/sansa_fuze_plus_defconfig +++ b/configs/sansa_fuze_plus_defconfig @@ -7,6 +7,8 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_VIDEO=y CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200n8 " # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig index 43204210f4..2f340c98b6 100644 --- a/configs/sc_sps_1_defconfig +++ b/configs/sc_sps_1_defconfig @@ -6,6 +6,8 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200" CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_MISC_INIT=y diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig index 1271ea0356..da8640b951 100644 --- a/configs/sh7752evb_defconfig +++ b/configs/sh7752evb_defconfig @@ -3,6 +3,8 @@ CONFIG_SH_32BIT=y CONFIG_TARGET_SH7752EVB=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC2,115200 root=/dev/nfs ip=dhcp" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig index 06a95bcde9..2fae8b9105 100644 --- a/configs/sh7753evb_defconfig +++ b/configs/sh7753evb_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_SH7753EVB=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC2,115200 root=/dev/nfs ip=dhcp" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig index 09ed1b3aff..f4d0f7f282 100644 --- a/configs/sh7757lcr_defconfig +++ b/configs/sh7757lcr_defconfig @@ -3,6 +3,8 @@ CONFIG_SH_32BIT=y CONFIG_TARGET_SH7757LCR=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC2,115200 root=/dev/nfs ip=dhcp" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/sh7763rdp_defconfig b/configs/sh7763rdp_defconfig index 9334f6bdec..504d0a9686 100644 --- a/configs/sh7763rdp_defconfig +++ b/configs/sh7763rdp_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_SH7763RDP=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC2,115200 root=1f01" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig index 59e6067209..7f4131e225 100644 --- a/configs/sh7785lcr_32bit_defconfig +++ b/configs/sh7785lcr_32bit_defconfig @@ -3,6 +3,8 @@ CONFIG_SH_32BIT=y CONFIG_TARGET_SH7785LCR=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC1,115200 root=/dev/nfs ip=dhcp" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/sh7785lcr_defconfig b/configs/sh7785lcr_defconfig index cf9c305bc3..eb87702815 100644 --- a/configs/sh7785lcr_defconfig +++ b/configs/sh7785lcr_defconfig @@ -2,6 +2,8 @@ CONFIG_SH=y CONFIG_TARGET_SH7785LCR=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC1,115200 root=/dev/nfs ip=dhcp" CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/shmin_defconfig b/configs/shmin_defconfig index dffff1187b..539f7e9552 100644 --- a/configs/shmin_defconfig +++ b/configs/shmin_defconfig @@ -1,5 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_SHMIN=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttySC0,115200" CONFIG_VERSION_VARIABLE=y # CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig index ef8510d47d..29a5f2e4ee 100644 --- a/configs/smdkc100_defconfig +++ b/configs/smdkc100_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" for SMDKC100" CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100" CONFIG_ENV_IS_IN_ONENAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/mtdblock5 ubi.mtd=4 rootfstype=cramfs console=ttySAC0,115200n8 mem=128M mtdparts=s3c-onenand:256k(bootloader),128k@0x40000(params),3m@0x60000(kernel),16m@0x360000(test),-(UBI)" CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="SMDKC100 # " # CONFIG_CMD_IMLS is not set diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index 468267e007..41e9419b8b 100644 --- a/configs/snapper9260_defconfig +++ b/configs/snapper9260_defconfig @@ -5,6 +5,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 ip=any" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Snapper> " diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig index c439933b17..eb4b607ef1 100644 --- a/configs/snapper9g20_defconfig +++ b/configs/snapper9g20_defconfig @@ -5,6 +5,8 @@ CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 ip=any" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_BDI is not set diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig index 3acdf44549..5d1a03edbb 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig @@ -5,6 +5,8 @@ CONFIG_TARGET_SOCFPGA_ARRIA10_SOCDK=y CONFIG_IDENT_STRING="socfpga_arria10" CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc" CONFIG_ENV_IS_IN_MMC=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_DEFAULT_FDT_FILE="socfpga_arria10_socdk_sdmmc.dtb" CONFIG_SPL=y CONFIG_CMD_BOOTZ=y diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index 371c6301e5..c98920f1aa 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -6,6 +6,8 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1" CONFIG_FIT=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index 932c976f10..f60d0ef723 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -6,6 +6,8 @@ CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk" CONFIG_FIT=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index 8a49b8bf2f..f12145b7b6 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -7,6 +7,8 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga" CONFIG_FIT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=5 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index 47daca0969..fa520484ae 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -15,6 +15,8 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_ARCH_MISC_INIT=y CONFIG_HUSH_PARSER=y diff --git a/configs/spear300_defconfig b/configs/spear300_defconfig index 3a303a2c55..83a8b3aec7 100644 --- a/configs/spear300_defconfig +++ b/configs/spear300_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR300" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear300_nand_defconfig b/configs/spear300_nand_defconfig index 48e37cd806..a24ae13b56 100644 --- a/configs/spear300_nand_defconfig +++ b/configs/spear300_nand_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,NAND" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear300_usbtty_defconfig b/configs/spear300_usbtty_defconfig index 9cef783284..962c7c1ab2 100644 --- a/configs/spear300_usbtty_defconfig +++ b/configs/spear300_usbtty_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear300_usbtty_nand_defconfig b/configs/spear300_usbtty_nand_defconfig index fa6cd8f2f7..78a7db5625 100644 --- a/configs/spear300_usbtty_nand_defconfig +++ b/configs/spear300_usbtty_nand_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR300,USBTTY,NAND" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig index 695ed2fd90..5f03a8cb95 100644 --- a/configs/spear310_defconfig +++ b/configs/spear310_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear310_nand_defconfig b/configs/spear310_nand_defconfig index e8827a8bed..0a8a69c31c 100644 --- a/configs/spear310_nand_defconfig +++ b/configs/spear310_nand_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,NAND" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear310_pnor_defconfig b/configs/spear310_pnor_defconfig index 326fa10a10..9778fb97d2 100644 --- a/configs/spear310_pnor_defconfig +++ b/configs/spear310_pnor_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,FLASH_PNOR" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig index eb3282bb7d..66e3291a60 100644 --- a/configs/spear310_usbtty_defconfig +++ b/configs/spear310_usbtty_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear310_usbtty_nand_defconfig b/configs/spear310_usbtty_nand_defconfig index 74653f8fe6..9bbbbed861 100644 --- a/configs/spear310_usbtty_nand_defconfig +++ b/configs/spear310_usbtty_nand_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY,NAND" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear310_usbtty_pnor_defconfig b/configs/spear310_usbtty_pnor_defconfig index 7c7dc69793..7af187239b 100644 --- a/configs/spear310_usbtty_pnor_defconfig +++ b/configs/spear310_usbtty_pnor_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY,FLASH_PNOR" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear320_defconfig b/configs/spear320_defconfig index c206f38839..055ba6dd56 100644 --- a/configs/spear320_defconfig +++ b/configs/spear320_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear320_nand_defconfig b/configs/spear320_nand_defconfig index b16ddd3116..c437c8eebd 100644 --- a/configs/spear320_nand_defconfig +++ b/configs/spear320_nand_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,NAND" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear320_pnor_defconfig b/configs/spear320_pnor_defconfig index 3d926f11cc..db4880fab6 100644 --- a/configs/spear320_pnor_defconfig +++ b/configs/spear320_pnor_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,FLASH_PNOR" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear320_usbtty_defconfig b/configs/spear320_usbtty_defconfig index 2becc829bb..f14fb44282 100644 --- a/configs/spear320_usbtty_defconfig +++ b/configs/spear320_usbtty_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear320_usbtty_nand_defconfig b/configs/spear320_usbtty_nand_defconfig index b055fce816..f4ec3c0603 100644 --- a/configs/spear320_usbtty_nand_defconfig +++ b/configs/spear320_usbtty_nand_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY,NAND" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear320_usbtty_pnor_defconfig b/configs/spear320_usbtty_pnor_defconfig index 2759f372de..69dbb33a67 100644 --- a/configs/spear320_usbtty_pnor_defconfig +++ b/configs/spear320_usbtty_pnor_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR320,USBTTY,FLASH_PNOR" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear600_defconfig b/configs/spear600_defconfig index 3c5c0e617f..b6800c2db0 100644 --- a/configs/spear600_defconfig +++ b/configs/spear600_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR600" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/spear600_nand_defconfig b/configs/spear600_nand_defconfig index 48e5ca8232..f5f26b5453 100644 --- a/configs/spear600_nand_defconfig +++ b/configs/spear600_nand_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,NAND" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear600_usbtty_defconfig b/configs/spear600_usbtty_defconfig index 34a308b8b7..5329957c03 100644 --- a/configs/spear600_usbtty_defconfig +++ b/configs/spear600_usbtty_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,USBTTY" CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/spear600_usbtty_nand_defconfig b/configs/spear600_usbtty_nand_defconfig index ff11c91394..596bc15d86 100644 --- a/configs/spear600_usbtty_nand_defconfig +++ b/configs/spear600_usbtty_nand_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="-SPEAr" CONFIG_SYS_EXTRA_OPTIONS="SPEAR600,USBTTY,NAND" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=-1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_I2C=y diff --git a/configs/stih410-b2260_defconfig b/configs/stih410-b2260_defconfig index e29c29bc6f..998602c3b2 100644 --- a/configs/stih410-b2260_defconfig +++ b/configs/stih410-b2260_defconfig @@ -5,6 +5,8 @@ CONFIG_DEFAULT_DEVICE_TREE="stih410-b2260" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_ENV_IS_NOWHERE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SYS_PROMPT="stih410-b2260 => " # CONFIG_CMD_IMLS is not set diff --git a/configs/stm32f429-discovery_defconfig b/configs/stm32f429-discovery_defconfig index f16ca3753f..bff1b1b529 100644 --- a/configs/stm32f429-discovery_defconfig +++ b/configs/stm32f429-discovery_defconfig @@ -4,6 +4,8 @@ CONFIG_STM32F4=y CONFIG_TARGET_STM32F429_DISCOVERY=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index 0daadde061..95cab3beb8 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -6,6 +6,8 @@ CONFIG_TARGET_STM32F746_DISCO=y CONFIG_DEFAULT_DEVICE_TREE="stm32f746-disco" CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 262237d75b..92687c620f 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -16,6 +16,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20-taurus" CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig index 011c8762c9..45c4d6c516 100644 --- a/configs/tb100_defconfig +++ b/configs/tb100_defconfig @@ -5,6 +5,8 @@ CONFIG_SYS_CLK_FREQ=500000000 CONFIG_DEFAULT_DEVICE_TREE="abilis_tb100" CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200n8" CONFIG_SYS_PROMPT="[tb100]:~# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 1703cee841..0c0b2daa46 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -14,6 +14,8 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sda1 ro quiet" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_ARCH_EARLY_INIT_R is not set CONFIG_HUSH_PARSER=y diff --git a/configs/thunderx_88xx_defconfig b/configs/thunderx_88xx_defconfig index 2c7a5a6d9e..7e7cd8e1ae 100644 --- a/configs/thunderx_88xx_defconfig +++ b/configs/thunderx_88xx_defconfig @@ -5,6 +5,8 @@ CONFIG_DEFAULT_DEVICE_TREE="thunderx-88xx" CONFIG_DEBUG_UART=y CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=5 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200n8 earlycon=pl011,0x87e024000000 debug maxcpus=48 rootwait rw root=/dev/sda2 coherent_pool=16M" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index 959f0799d4..596750e5a8 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -16,6 +16,8 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyO2,115200n8 noinitrd earlyprintk" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/tplink_wdr4300_defconfig b/configs/tplink_wdr4300_defconfig index 3caa1d4897..f205ea8e13 100644 --- a/configs/tplink_wdr4300_defconfig +++ b/configs/tplink_wdr4300_defconfig @@ -5,6 +5,8 @@ CONFIG_BOARD_TPLINK_WDR4300=y CONFIG_DEFAULT_DEVICE_TREE="tplink_wdr4300" CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs" CONFIG_VERSION_VARIABLE=y CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index 16ac27fb95..6682334c10 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -6,6 +6,8 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="Please use defined boot" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 0f2445bdf4..4476b382bd 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -5,6 +5,8 @@ CONFIG_TARGET_TRATS=y CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="Please use defined boot" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig index edadef38eb..0dc6a33c3a 100644 --- a/configs/usb_a9263_dataflash_defconfig +++ b/configs/usb_a9263_dataflash_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_USB_A9263=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock1 mtdparts=mtdparts=atmel_nand:16m(kernel)ro,120m(root1),-(root2) rw rootfstype=jffs2" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig index 60eea037b5..976d65c9bc 100644 --- a/configs/vexpress_aemv8a_dram_defconfig +++ b/configs/vexpress_aemv8a_dram_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" vexpress_aemv8a" CONFIG_DISTRO_DEFAULTS=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda2 rw rootwait loglevel=9" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="VExpress64# " diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig index d7414d44d8..c36b6c2a70 100644 --- a/configs/vexpress_aemv8a_juno_defconfig +++ b/configs/vexpress_aemv8a_juno_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" vexpress_aemv8a" CONFIG_DISTRO_DEFAULTS=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200n8 root=/dev/sda2 rw rootwait earlyprintk=pl011,0x7ff80000 debug user_debug=31 androidboot.hardware=juno loglevel=9" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="VExpress64# " diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig index b92e87fd2c..3f4ff02519 100644 --- a/configs/vexpress_aemv8a_semi_defconfig +++ b/configs/vexpress_aemv8a_semi_defconfig @@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" vexpress_aemv8a" CONFIG_DISTRO_DEFAULTS=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=1 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="VExpress64# " diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig index cb2040e50f..f61ad4a0dc 100644 --- a/configs/vinco_defconfig +++ b/configs/vinco_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_VINCO=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk rw root=/dev/mmcblk0p2 rootfstype=ext4 rootwait quiet lpj=1990656" # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index 816aec1120..219df195df 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -7,6 +7,8 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_CMD_HD44760=y CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS2,115200n8" CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig index 5a49db280b..7f6208e95f 100644 --- a/configs/xfi3_defconfig +++ b/configs/xfi3_defconfig @@ -7,6 +7,8 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_VIDEO=y CONFIG_ENV_IS_NOWHERE=y CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200n8 " # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig index 6da257c671..1567aab2da 100644 --- a/configs/zipitz2_defconfig +++ b/configs/zipitz2_defconfig @@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_TARGET_ZIPITZ2=y CONFIG_ENV_IS_IN_FLASH=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=tty0 console=ttyS2,115200 fbcon=rotate:3" # CONFIG_CONSOLE_MUX is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y diff --git a/doc/README.x86 b/doc/README.x86 index c69dc1c511..390c5b456c 100644 --- a/doc/README.x86 +++ b/doc/README.x86 @@ -753,11 +753,7 @@ command. You can also bake this behaviour into your build by hard-coding the environment variables if you add this to minnowmax.h:

-#undef CONFIG_BOOTARGS #undef CONFIG_BOOTCOMMAND - -#define CONFIG_BOOTARGS \ - "root=/dev/sda2 ro" #define CONFIG_BOOTCOMMAND \ "ext2load scsi 0:2 03000000 /boot/vmlinuz-3.13.0-58-generic; " \ "ext2load scsi 0:2 04000000 /boot/initrd.img-3.13.0-58-generic; " \ @@ -766,6 +762,10 @@ environment variables if you add this to minnowmax.h: #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS "boot=zboot 03000000 0 04000000 ${filesize}"

+and change CONFIG_BOOTARGS value in configs/minnowmax_defconfig to: + +CONFIG_BOOTARGS="root=/dev/sda2 ro" + Test with SeaBIOS ----------------- SeaBIOS [14] is an open source implementation of a 16-bit x86 BIOS. It can run diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index 6ec577bffa..4bbcd13158 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -28,7 +28,7 @@ * "41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b" */

-#ifdef CONFIG_BOOTARGS +#ifdef CONFIG_USE_BOOTARGS #define CONFIG_SET_BOOTARGS "setenv bootargs '" CONFIG_BOOTARGS" ';" #else #define CONFIG_SET_BOOTARGS "setenv bootargs 'root=/dev/ram " \ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index d50c874fe1..f7812468af 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -44,8 +44,6 @@ # define CONFIG_SYS_FEC1_MIIBASE CONFIG_SYS_FEC1_IOBASE # define MCFFEC_TOUT_LOOP 50000

-# define CONFIG_BOOTARGS "root=/dev/mtdblock3 rw rootfstype=jffs2" - /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */ # ifndef CONFIG_SYS_DISCOVER_PHY # define FECDUPLEX FULL diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index b4b1ba88d6..9a48895531 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -70,22 +70,6 @@ #define CONFIG_SYS_FEC0_PHYADDR 0 #define CONFIG_SYS_FEC1_PHYADDR 1

- -#ifdef CONFIG_SYS_NAND_BOOT -#define CONFIG_BOOTARGS "root=/dev/mtdblock2 rw rootfstype=jffs2 " \ - "mtdparts=NAND:1M(u-boot)ro,7M(kernel)ro," \ - "-(jffs2) console=ttyS0,115200" -#else -#define CONFIG_BOOTARGS "root=/dev/nfs rw nfsroot=" \ - __stringify(CONFIG_SERVERIP) ":/tftpboot/" \ - __stringify(CONFIG_IPADDR) " ip=" \ - __stringify(CONFIG_IPADDR) ":" \ - __stringify(CONFIG_SERVERIP)":" \ - __stringify(CONFIG_GATEWAYIP)": " \ - __stringify(CONFIG_NETMASK) \ - "::eth0:off:rw console=ttyS0,115200" -#endif - #define CONFIG_ETHPRIME "FEC0" #define CONFIG_IPADDR 192.168.1.2 #define CONFIG_NETMASK 255.255.255.0 diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 6eb8eaddf1..f6d92512be 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -48,7 +48,6 @@ # define CONFIG_SYS_FEC0_MIIBASE CONFIG_SYS_FEC0_IOBASE # define MCFFEC_TOUT_LOOP 50000

-# define CONFIG_BOOTARGS "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:2M(kernel)ro,-(jffs2)" # define CONFIG_ETHPRIME "FEC0" # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 8702b89174..5bd1236c75 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -54,7 +54,6 @@ # define MCFFEC_TOUT_LOOP 50000 # define CONFIG_HAS_ETH1

-# define CONFIG_BOOTARGS "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)" # define CONFIG_ETHPRIME "FEC0" # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 17090da796..31e1a42fe0 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -62,10 +62,6 @@ #define CONFIG_NETMASK 255.0.0.0

#define CONFIG_BOOTCOMMAND "run flashboot" -#define CONFIG_BOOTARGS "ubi.mtd=4 root=ubi0:rootfs rw " \ - "rootfstype=ubifs rootflags=sync " \ - "console=ttyCPM0,115200N8 " \ - "ip=${ipaddr}:::${netmask}:mcr3k:eth0:off"

#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #undef CONFIG_LOADS_BAUD_CHANGE /* don't allow baudrate change */ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index be1a6afff3..27574c2e6e 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -586,8 +586,6 @@

#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 428f3abf90..619bee88b7 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -561,8 +561,6 @@

#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 18f7523692..5992099d61 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -720,8 +720,6 @@

#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_PREBOOT "echo;" \ "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \ "echo" diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 221c35cf51..5f8ef3012e 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -692,12 +692,6 @@ boards, we say we have two, but don't display a message if we find only one. */

#define CONFIG_NETDEV "eth0"

-#ifdef CONFIG_MPC8349ITX -#define CONFIG_HOSTNAME "mpc8349emitx" -#else -#define CONFIG_HOSTNAME "mpc8349emitxgp" -#endif - /* Default path and filenames */ #define CONFIG_ROOTPATH "/nfsroot/rootfs" #define CONFIG_BOOTFILE "uImage" @@ -711,16 +705,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #endif

-#define CONFIG_BOOTARGS \ - "root=/dev/nfs rw" \ - " nfsroot=" __stringify(CONFIG_SERVERIP) ":" CONFIG_ROOTPATH \ - " ip=" __stringify(CONFIG_IPADDR) ":" \ - __stringify(CONFIG_SERVERIP) ":" \ - __stringify(CONFIG_GATEWAYIP) ":" \ - __stringify(CONFIG_NETMASK) ":" \ - CONFIG_HOSTNAME ":" CONFIG_NETDEV ":off" \ - " console=" __stringify(CONSOLE) "," __stringify(CONFIG_BAUDRATE) - #define CONFIG_EXTRA_ENV_SETTINGS \ "console=" __stringify(CONSOLE) "\0" \ "netdev=" CONFIG_NETDEV "\0" \ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 1a65c25c48..132ea78591 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -641,8 +641,6 @@ extern int board_pci_host_broken(void);

#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 0245fc68eb..8b09b3ff72 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -663,8 +663,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index ca4ccd8ad3..6f9caa5b72 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -373,8 +373,6 @@

#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 977454167d..5a653226a7 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -400,8 +400,6 @@ extern unsigned long get_clock_freq(void);

#define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index b4f4c4e32b..477dabd699 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -416,8 +416,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);

#define CONFIG_LOADADDR 1000000 /*default location for tftp and bootm*/

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index b41543688b..da59d53af3 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -519,8 +519,6 @@ extern unsigned long get_clock_freq(void);

#define CONFIG_LOADADDR 1000000 /*default location for tftp and bootm*/

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ - #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ecc=off\0" \ "netdev=eth0\0" \ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index d31395cf81..f5a3ab1eaf 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -396,8 +396,6 @@ extern unsigned long get_clock_freq(void);

#define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 2e13fb52df..5153db5728 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -415,8 +415,6 @@

#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyCPM\0" \ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index c0af7451b8..a113a8b2e8 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -414,8 +414,6 @@ extern unsigned long get_clock_freq(void);

#define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index a75ce0b93d..6e78a10921 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -504,8 +504,6 @@ extern unsigned long get_clock_freq(void);

#define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 0a2bcb2383..4aec3c4566 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -617,8 +617,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=bank,bank_intlv=cs0_cs1,ecc=off\0" \ "netdev=eth0\0" \ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 5e8211609a..f908dcfded 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -479,8 +479,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 0x10000000

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #if defined(CONFIG_PCI1) #define PCI_ENV \ "pcireg=md ${a}000 3; echo o;md ${a}c00 25; echo i; md ${a}da0 15;" \ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 7b9b2458b3..64f32d2b01 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -645,8 +645,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* default location for tftp and bootm */ #define CONFIG_LOADADDR 0x10000000

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 5ee83b9034..852caaf85f 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -14,8 +14,6 @@

#define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" - #define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 23fe9f9f7c..bd8dcddf74 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -772,8 +772,6 @@ extern unsigned long get_sdram_size(void); /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \ "netdev=eth0\0" \ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index c216ac2d47..d494958056 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -462,14 +462,10 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 400000

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_PREBOOT "echo;" \ "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \ "echo"

-#undef CONFIG_BOOTARGS - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=tqm834x\0" \ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 6fd3fa4712..6a8bbd93e3 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -519,8 +519,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000

-#define CONFIG_BOOTARGS /* the boot command will set bootargs */ - #if defined(CONFIG_DONGLE)

#define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ap121.h b/include/configs/ap121.h index 489b32e6d1..860f38509d 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -27,9 +27,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE \ {9600, 19200, 38400, 57600, 115200}

-#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock2 " \ - "rootfstype=squashfs" #define CONFIG_BOOTCOMMAND "sf probe;" \ "mtdparts default;" \ "bootm 0x9f650000" diff --git a/include/configs/ap143.h b/include/configs/ap143.h index 3e93a08fe3..068007eb35 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -31,9 +31,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE \ {9600, 19200, 38400, 57600, 115200}

-#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock2 " \ - "rootfstype=squashfs" #define CONFIG_BOOTCOMMAND "sf probe;" \ "mtdparts default;" \ "bootm 0x9f680000" diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 285041dbf8..5603375393 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -15,8 +15,6 @@

#define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC2,38400" - #define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS

diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index 078c77bf68..29c13776bd 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -18,8 +18,6 @@

#define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC4,115200" - #define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS

diff --git a/include/configs/apf27.h b/include/configs/apf27.h index b122fe617b..b98a38c6a3 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -130,9 +130,6 @@ #define CONFIG_INITRD_TAG /* send initrd params */

#define CONFIG_BOOTFILE __stringify(CONFIG_BOARD_NAME) "-linux.bin" -#define CONFIG_BOOTARGS "console=" __stringify(ACFG_CONSOLE_DEV) "," \ - __stringify(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \ - " ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "

#define ACFG_CONSOLE_DEV ttySMX0 #define CONFIG_BOOTCOMMAND "run ubifsboot" diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 492062abb3..a49f11dcb3 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -20,8 +20,6 @@

#define BOARD_LATE_INIT

-#define CONFIG_BOOTARGS "" - #undef CONFIG_SHOW_BOOT_PROGRESS

#define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h index f786ffae3e..2226b9802c 100644 --- a/include/configs/aspeed-common.h +++ b/include/configs/aspeed-common.h @@ -65,10 +65,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-#define CONFIG_BOOTARGS \ - "console=ttyS4,115200n8" \ - " root=/dev/ram rw" - #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 723bc154b3..98ebd13f80 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -173,10 +173,6 @@ #endif #endif

-/* default bootargs that are considered during boot */ -#define CONFIG_BOOTARGS " console=ttyS2,115200 rootfstype=romfs"\ - " loaderversion=$loaderversion" - /* default RAM address for user programs */ #define CONFIG_SYS_LOAD_ADDR 0x20000

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index b4135235d4..8ace1d9103 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -65,16 +65,8 @@ "fatload mmc 0:1 0x21000000 ${dtb_name}; " \ "fatload mmc 0:1 0x22000000 zImage; " \ "bootz 0x22000000 - 0x21000000" -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk " \ - "root=/dev/mmcblk0p2 rw rootwait" + #else -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk " \ - "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256K(env),256k(env_redundant),256k(spare)," \ - "512k(dtb),6M(kernel)ro,-(rootfs) " \ - "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"

#ifdef CONFIG_SYS_USE_NANDFLASH /* u-boot env in nand flash */ diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 51b6fab716..7df5903d5f 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -151,10 +151,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - "mtdparts=atmel_nand:-(root) " \ - "rw rootfstype=jffs2"

#elif CONFIG_SYS_USE_DATAFLASH_CS1

@@ -164,10 +160,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xD0084000 0x22000000 0x210000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - "mtdparts=atmel_nand:-(root) " \ - "rw rootfstype=jffs2"

#elif defined(CONFIG_SYS_USE_NANDFLASH)

@@ -176,12 +168,6 @@ #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk " \ - "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ - "512k(dtb),6M(kernel)ro,-(rootfs) " \ - "root=/dev/mtdblock7 rw rootfstype=jffs2"

#else /* CONFIG_SYS_USE_MMC */ /* bootstrap + u-boot + env + linux in mmc */ @@ -192,12 +178,6 @@

#define CONFIG_BOOTCOMMAND \ "fatload mmc 0:1 0x22000000 uImage; bootm" -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk " \ - "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ - "512k(dtb),6M(kernel)ro,-(rootfs) " \ - "root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait" #endif

#define CONFIG_SYS_CBSIZE 256 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 4e151cdd04..babcc8bb21 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -144,10 +144,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - "mtdparts=atmel_nand:-(root) " \ - "rw rootfstype=jffs2"

#elif CONFIG_SYS_USE_DATAFLASH_CS3

@@ -157,10 +153,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xD0084000 0x22000000 0x210000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - "mtdparts=atmel_nand:-(root) " \ - "rw rootfstype=jffs2"

#else /* CONFIG_SYS_USE_NANDFLASH */

@@ -169,12 +161,6 @@ #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk " \ - "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ - "512k(dtb),6M(kernel)ro,-(rootfs) " \ - "root=/dev/mtdblock7 rw rootfstype=jffs2" #endif

#define CONFIG_SYS_CBSIZE 256 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 62099c7024..793ef60ea1 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -254,10 +254,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - "mtdparts=atmel_nand:-(root) "\ - "rw rootfstype=jffs2"

#elif CONFIG_SYS_USE_NANDFLASH

@@ -266,12 +262,6 @@ #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk " \ - "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ - "512k(dtb),6M(kernel)ro,-(rootfs) " \ - "root=/dev/mtdblock7 rw rootfstype=jffs2" #endif

#define CONFIG_SYS_CBSIZE 256 diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 8b00370cdd..eb084f0a9c 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -97,12 +97,6 @@ #define CONFIG_BOOTCOMMAND \ "nand read 0x70000000 0x200000 0x300000;" \ "bootm 0x70000000" -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk " \ - "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ - "512k(dtb),6M(kernel)ro,-(rootfs) " \ - "root=/dev/mtdblock7 rw rootfstype=jffs2" #elif CONFIG_SYS_USE_MMC /* bootstrap + u-boot + env + linux in mmc */ #define FAT_ENV_INTERFACE "mmc" @@ -115,10 +109,6 @@ #define FAT_ENV_FILE "uboot.env" #define CONFIG_ENV_SIZE 0x4000

-#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "mtdparts=atmel_nand:" \ - "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \ - "root=/dev/mmcblk0p2 rw rootwait" #define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x71000000 dtb; " \ "fatload mmc 0:1 0x72000000 zImage; " \ "bootz 0x72000000 - 0x71000000" diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 6132076e82..c92c284729 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -100,10 +100,6 @@ #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - "mtdparts=atmel_nand:-(root) "\ - "rw rootfstype=jffs2"

#elif CONFIG_SYS_USE_NANDFLASH

@@ -114,12 +110,6 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x600000; " \ "nand read 0x21000000 0x180000 0x80000; " \ "bootz 0x22000000 - 0x21000000" -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk " \ - "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256K(env),256k(env_redundant),256k(spare)," \ - "512k(dtb),6M(kernel)ro,-(rootfs) " \ - "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"

#else /* CONFIG_SYS_USE_MMC */

@@ -131,10 +121,6 @@ #define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 at91sam9rlek.dtb; " \ "fatload mmc 0:1 0x22000000 zImage; " \ "bootz 0x22000000 - 0x21000000" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "mtdparts=atmel_nand:" \ - "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \ - "root=/dev/mmcblk0p2 rw rootwait" #endif

#define CONFIG_SYS_CBSIZE 256 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 7e8a9e921a..c80398f534 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -145,21 +145,6 @@ #define CONFIG_ENV_SIZE 0x4000 #endif

-#ifdef CONFIG_SYS_USE_MMC -#define CONFIG_BOOTARGS "mem=128M console=ttyS0,115200 " \ - "mtdparts=atmel_nand:" \ - "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \ - "root=/dev/mmcblk0p2 " \ - "rw rootfstype=ext4 rootwait" -#else -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk " \ - "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ - "512k(dtb),6M(kernel)ro,-(rootfs) " \ - "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw" -#endif - #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_LONGHELP diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index b583267b3e..5c1d5a7fa4 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -85,7 +85,6 @@ * Environment configuration */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyS3,115200n8" #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR

/* diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index c76053e49a..5e275b8008 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -52,7 +52,6 @@

/* Boot Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyAMA0,115200" #define CONFIG_BOOTCOMMAND "bootm" #define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/calimain.h b/include/configs/calimain.h index b6c8035fb5..e1cc2d0374 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -204,7 +204,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_REVISION_TAG #define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_BOOTARGS "" #define CONFIG_BOOTCOMMAND "run checkupdate; run checkbutton;" #define CONFIG_BOOT_RETRY_TIME 60 /* continue boot after 60 s inactivity */ #define CONFIG_RESET_TO_RETRY diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index a3b7b219b3..c44c6cae58 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -155,9 +155,6 @@ u-boot: 'set' command */ #define CONFIG_BOOTCOMMAND "bootm 0xffe80000" /*Autoboto command, please enter a valid image address in flash */

-#define CONFIG_BOOTARGS " " /* default bootargs that are -considered during boot */ - /* User network settings */

#define CONFIG_IPADDR 192.168.100.2 /* default board IP address */ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 4be06f1914..326fececd7 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -39,7 +39,6 @@ "bootm 0xa0000000; " \ "fi; " \ "bootm 0xc0000;" -#define CONFIG_BOOTARGS "console=tty0 console=ttyS0,115200" #define CONFIG_TIMESTAMP #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index b4ea184bcb..7c6bec58fa 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -29,11 +29,7 @@ #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0x006ef000

-#undef CONFIG_BOOTARGS #undef CONFIG_BOOTCOMMAND - -#define CONFIG_BOOTARGS \ - "root=/dev/sda2 ro quiet" #define CONFIG_BOOTCOMMAND \ "load scsi 0:2 03000000 /boot/vmlinuz-${kernel-ver}-generic;" \ "load scsi 0:2 04000000 /boot/initrd.img-${kernel-ver}-generic;" \ diff --git a/include/configs/corvus.h b/include/configs/corvus.h index ed1a2287ab..ff9de5f99e 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -114,12 +114,6 @@ #define CONFIG_BOOTCOMMAND \ "nand read 0x70000000 0x200000 0x300000;" \ "bootm 0x70000000" -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk " \ - "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ - "512k(dtb),6M(kernel)ro,-(rootfs) " \ - "root=/dev/mtdblock7 rw rootfstype=jffs2"

#define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index c610ff3f8f..8852d720ae 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -259,8 +259,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_REVISION_TAG #define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_BOOTARGS \ - "mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp" #define CONFIG_EXTRA_ENV_SETTINGS "hwconfig=dsp:wake=yes"

/* diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index 970e214e07..df12fa5314 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -38,7 +38,6 @@ /* valid baudrates */

#define CONFIG_TIMESTAMP /* Print image info with timestamp */ -#undef CONFIG_BOOTARGS

#define CONFIG_EXTRA_ENV_SETTINGS \ "addmisc=setenv bootargs ${bootargs} " \ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index dfe9935520..f299090a6d 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -168,7 +168,6 @@ #define CONFIG_SETUP_MEMORY_TAGS

#define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyS0,115200n8" #define CONFIG_LOADADDR 0x80008000

/* diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index 6748b9cb35..cb185f0c62 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -40,11 +40,7 @@ #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0x006ef000

-#undef CONFIG_BOOTARGS #undef CONFIG_BOOTCOMMAND - -#define CONFIG_BOOTARGS \ - "root=/dev/sda1 ro quiet" #define CONFIG_BOOTCOMMAND \ "load scsi 0:1 03000000 /boot/vmlinuz-${kernel-ver}-generic;" \ "load scsi 0:1 04000000 /boot/initrd.img-${kernel-ver}-generic;" \ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index d9dc639aeb..870d0617ae 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -59,9 +59,6 @@ /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE

-/* Environment - Boot*/ -#define CONFIG_BOOTARGS "console=ttyMSM0,115200n8" - #define BOOT_TARGET_DEVICES(func) \ func(USB, usb, 0) \ func(MMC, mmc, 1) \ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index a209e6f09c..c40ed2a3af 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -127,7 +127,6 @@

/* Default Environment */ #define CONFIG_BOOTCOMMAND "sf read ${loadaddr} 0xd0000 0x700000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200" #define CONFIG_LOADADDR 0x80000 #undef CONFIG_PREBOOT /* override preboot for USB and SPI flash init */ #define CONFIG_PREBOOT "usb start; sf probe" diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index cabbe160a3..195bf9f14e 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -30,8 +30,6 @@

#define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC0,115200" - #define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS

diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 92842e1e18..9170a94e36 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -29,7 +29,6 @@ #define CONFIG_CMDLINE_TAG 1 #define CONFIG_INITRD_TAG 1 #define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_BOOTARGS "root=/dev/nfs console=ttyAM0,115200 ip=dhcp" #define CONFIG_BOOTFILE "edb93xx.img"

#define CONFIG_SYS_LDSCRIPT "board/cirrus/edb93xx/u-boot.lds" diff --git a/include/configs/espt.h b/include/configs/espt.h index 1b3295346d..48d89323ac 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -19,7 +19,6 @@ */ #define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 4c0647bb69..58bf51cdee 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -189,12 +189,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_BOOTCOMMAND "cp.b 0xC00C6000 ${loadaddr} 0x294000; bootm" -#if defined(CONFIG_CMD_NAND) -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - MTDPARTS_DEFAULT \ - " rw rootfstype=jffs2" -#endif

/* Misc. u-boot settings */ #define CONFIG_SYS_CBSIZE 256 diff --git a/include/configs/h2200.h b/include/configs/h2200.h index fea4044769..def9e21cf0 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -121,8 +121,6 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16)

-#define CONFIG_BOOTARGS "root=/dev/ram0 ro console=ttyS0,115200n8" - #define CONFIG_USB_DEV_PULLUP_GPIO 33 /* USB VBUS GPIO 3 */

diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 8b2d012309..acceff5e24 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -86,9 +86,6 @@ * Defines where the kernel and FDT will be put in RAM */

-/* Assume we boot with root on the seventh partition of eMMC */ -#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 root=/dev/mmcblk0p9 rw" - #define BOOT_TARGET_DEVICES(func) \ func(USB, usb, 0) \ func(MMC, mmc, 1) \ diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 68900ac980..b18ce4486d 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -69,7 +69,6 @@ * Environment configuration */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyS0,115200n8" #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR

/* diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 02d5b2cf65..fd3c7477d5 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -467,7 +467,6 @@ #define CONFIG_PREBOOT "echo;" \ "echo Type \"run nfsboot\" " \ "to mount root filesystem over NFS;echo" -#undef CONFIG_BOOTARGS #define CONFIG_BOOTCOMMAND "run boot_cramfs" #undef CONFIG_SYS_LOADS_BAUD_CHANGE

diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index ae8399426f..ab897cb32a 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -31,7 +31,6 @@ /* * Command line configuration. */ -#define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyAM0 console=tty" #define CONFIG_BOOTCOMMAND ""

/* Flash settings */ diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 8c9ad6c183..b1f98ee050 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -31,7 +31,6 @@ /* * Command line configuration. */ -#define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" #define CONFIG_BOOTCOMMAND "tftpboot ; bootm" #define CONFIG_SERVERIP 192.168.1.100 #define CONFIG_IPADDR 192.168.1.104 diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 1e33328f41..8e827d006d 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -12,8 +12,6 @@

#undef CONFIG_WATCHDOG /* disable platform specific watchdog */

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index f434991314..2cb264d2a0 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -23,8 +23,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG

-#define CONFIG_BOOTARGS "root=/dev/null console=ttySC4,115200" - #undef CONFIG_SHOW_BOOT_PROGRESS

/* MEMORY */ diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index d5fe7dfa96..41b41077e2 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -144,8 +144,6 @@ /* * Default environment variables */ -#define CONFIG_BOOTARGS "console=ttyS0,115200" - #define CONFIG_BOOTCOMMAND \ "dhcp && run netconsole; " \ "if run usbload || run diskload; then bootm; fi" diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 74af0b9dc6..9d85341499 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -101,8 +101,6 @@ "kernel_load=0xa0000000\0" \ "kernel_size=0x2800000\0" \

-#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \ - "earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000" #define CONFIG_BOOTCOMMAND "sf probe 0:0; sf read $kernel_load "\ "$kernel_start $kernel_size && "\ "bootm $kernel_load" diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 32f7162bbc..48beb2c108 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -271,10 +271,6 @@ "console=ttyS0,115200\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0"

-#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \ - "earlycon=uart8250,mmio,0x21c0500 " \ - MTDPARTS_DEFAULT - #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_BOOTCOMMAND "sf probe && sf read $kernel_load " \ "e0000 f00000 && bootm $kernel_load" diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 1b91676c2d..3c234d85cd 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -215,10 +215,6 @@ "kernel_size=0x2800000\0" \ "console=ttyS0,115200\0" \ MTDPARTS_DEFAULT "\0" - -#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \ - "earlycon=uart8250,mmio,0x21c0500 " \ - MTDPARTS_DEFAULT #endif

/* Monitor Command Prompt */ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 6ae5586d64..d557e69dda 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -203,10 +203,6 @@ unsigned long long get_qixis_addr(void); "mcinitcmd=fsl_mc start mc 0x580a00000" \ " 0x580e00000 \0"

-#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \ - "earlycon=uart8250,mmio,0x21c0500 " \ - "ramdisk_size=0x2000000 default_hugepagesz=2m" \ - " hugepagesz=2m hugepages=256" #ifdef CONFIG_SD_BOOT #define CONFIG_BOOTCOMMAND "mmc read 0x80200000 0x6800 0x800;"\ " fsl_mc apply dpl 0x80200000 &&" \ diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 0be4c4fa0b..2654f69338 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -428,13 +428,6 @@ unsigned long get_board_sys_clk(void); #endif #endif

- -#undef CONFIG_BOOTARGS -#define CONFIG_BOOTARGS "console=ttyS1,115200 root=/dev/ram0 " \ - "earlycon=uart8250,mmio,0x21c0600 " \ - "ramdisk_size=0x2000000 default_hugepagesz=2m" \ - " hugepagesz=2m hugepages=256" - #undef CONFIG_BOOTCOMMAND #ifdef CONFIG_QSPI_BOOT /* Try to boot an on-QSPI kernel first, then do normal distro boot */ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 8b94412028..7cbbe876b2 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -71,7 +71,6 @@ */ #define CONFIG_LOADADDR 0x00800000 #define CONFIG_BOOTCOMMAND "run bootcmd_${bootsource}" -#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/sda2"

#if defined(CONFIG_LSXHL) #define CONFIG_FDTFILE "kirkwood-lsxhl.dtb" diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 14874a5ebc..8c4981dd82 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -106,7 +106,6 @@

/* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " #define CONFIG_BOOTCOMMAND "run mmc_mmc" #define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index f4fcbd315a..649eb9b8f4 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -198,7 +198,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_BOOTARGS "console=ttymxc1,115200" #define CONFIG_LOADADDR 0x70800000 #define CONFIG_BOOTCOMMAND "run mmc_mmc" #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index 2744efb922..ba66a322f1 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -11,7 +11,6 @@ #define CONFIG_TIMESTAMP /* Print image info with timestamp */

#include "at91-sama5_common.h" -#undef CONFIG_BOOTARGS #define CONFIG_SYS_USE_SERIALFLASH 1 #define CONFIG_BOARD_LATE_INIT

@@ -114,7 +113,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_BOOTARGS "console=ttyS3,115200" #define CONFIG_LOADADDR 0x20800000 #define CONFIG_BOOTCOMMAND "run mmc_mmc" #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index aa007e2819..936204e3af 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -210,7 +210,6 @@ /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0

-#define CONFIG_BOOTARGS "root=romfs" #define CONFIG_HOSTNAME XILINX_BOARD_NAME #define CONFIG_BOOTCOMMAND "base 0;tftp 11000000 image.img;bootm"

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index 5b37277cce..26c36755df 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -13,7 +13,6 @@ /* Supported commands */

/* Default environment variables */ -#define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_BOOTFILE "/boot/zImage" #define CONFIG_LOADADDR 0x8E000000

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 850a8cc222..93b76d53fc 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -15,7 +15,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_PCMCIA

-#define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_BOOTFILE "/boot/zImage" #define CONFIG_LOADADDR 0x8E000000

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index f456bf6293..da47163cd2 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -14,8 +14,6 @@

#define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" - #define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS

diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index 8ea431efdc..a700528005 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -23,7 +23,6 @@ #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_CONS_SCIF1 1

-#define CONFIG_BOOTARGS "console=ttySC0,38400" #define CONFIG_ENV_OVERWRITE 1

/* SDRAM */ diff --git a/include/configs/novena.h b/include/configs/novena.h index 2bba741ac3..c47acb646a 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -39,7 +39,6 @@

/* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_BOOTARGS "console=ttymxc1,115200 " #define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run net_nfs" #define CONFIG_HOSTNAME novena

diff --git a/include/configs/nsim.h b/include/configs/nsim.h index 4490663020..b51ac6e197 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -49,7 +49,6 @@ * Environment configuration */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyARC0,115200n8" #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR

/* diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 9552c967c8..8563a3b454 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -43,7 +43,6 @@

/* Console configuration */

-#define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"

diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index 9b96cd0be8..d01898465b 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -85,7 +85,6 @@ #define ACFG_CONSOLE_DEV ttymxc0 #define CONFIG_SYS_AUTOLOAD "no" #define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root" -#define CONFIG_BOOTARGS "console=" __stringify(ACFG_CONSOLE_DEV) "," __stringify(CONFIG_BAUDRATE) #define CONFIG_PREBOOT "run check_env" #define CONFIG_BOOTCOMMAND "run emmcboot"

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 6dbd9900f4..704da71dc1 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -868,8 +868,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000

-#define CONFIG_BOOTARGS /* the boot command will set bootargs */ - #ifdef __SW_BOOT_NOR #define __NOR_RST_CMD \ norboot=i2c dev 1; i2c mw 18 1 __SW_BOOT_NOR 1; \ diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index d5f5769463..3cb47305bd 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -435,8 +435,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000

-#define CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index 85cac5a7b4..369e82f621 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -30,7 +30,6 @@ #endif

#define CONFIG_TIMESTAMP /* Print image info with timestamp */ -#undef CONFIG_BOOTARGS

#define CONFIG_EXTRA_ENV_SETTINGS \ "addmisc=setenv bootargs ${bootargs} " \ diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 88f841dfd8..3698a33d0c 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -117,8 +117,6 @@ #define FAT_ENV_FILE "uboot.env" #define CONFIG_ENV_SIZE 0x4000

-#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mmcblk0p2 rw rootwait" #define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 dtb; " \ "fatload mmc 0:1 0x22000000 zImage; " \ "bootz 0x22000000 - 0x21000000" diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index f100a40f21..887852c2f3 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -247,10 +247,6 @@ (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - "mtdparts=atmel_nand:-(root) " \ - "rw rootfstype=jffs2"

#elif defined(CONFIG_SYS_USE_NANDFLASH) /* CONFIG_SYS_USE_NANDFLASH */

@@ -259,12 +255,6 @@ #define CONFIG_ENV_OFFSET_REDUND 0x80000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock5 " \ - "mtdparts=atmel_nand:128k(bootstrap)ro," \ - "256k(uboot)ro,128k(env1)ro," \ - "128k(env2)ro,2M(linux),-(root) " \ - "rw rootfstype=jffs2"

#elif defined (CONFIG_SYS_USE_FLASH)

@@ -292,7 +282,6 @@ "nand:-(nand)"

#define CONFIG_CON_ROT "fbcon=rotate:3 " -#define CONFIG_BOOTARGS "root=/dev/mtdblock4 rootfstype=jffs2 " CONFIG_CON_ROT

#define CONFIG_EXTRA_ENV_SETTINGS \ "mtdids=" MTDIDS_DEFAULT "\0" \ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index da0cd9d62b..0de74e4b70 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -273,10 +273,6 @@ #define CONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - "mtdparts=atmel_nand:-(root) "\ - "rw rootfstype=jffs2"

#elif defined(CONFIG_SYS_USE_NANDFLASH) /* CFG_USE_NANDFLASH */

@@ -285,16 +281,6 @@ #define CONFIG_ENV_OFFSET_REDUND 0x80000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock5 " \ - "mtdparts=atmel_nand:" \ - "128k(bootstrap)ro," \ - "256k(uboot)ro," \ - "128k(env1)ro," \ - "128k(env2)ro," \ - "2M(linux)," \ - "-(root) " \ - "rw rootfstype=jffs2"

#elif defined(CONFIG_SYS_USE_FLASH) /* CFG_USE_FLASH */

@@ -314,8 +300,6 @@ #define CONFIG_ROOTPATH "/ronetix/rootfs"

#define CONFIG_CON_ROT "fbcon=rotate:3 " -#define CONFIG_BOOTARGS "root=/dev/mtdblock4 rootfstype=jffs2 "\ - CONFIG_CON_ROT

#define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=nand" #define MTDPARTS_DEFAULT \ diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index dc4ebeab31..01918f5eb9 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -123,13 +123,6 @@ #define CONFIG_ENV_OFFSET_REDUND 0x80000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x72000000 0x200000 0x200000; bootm" -#define CONFIG_BOOTARGS "fbcon=rotate:3 console=tty0 " \ - "console=ttyS0,115200 " \ - "root=/dev/mtdblock4 " \ - "mtdparts=atmel_nand:128k(bootstrap)ro," \ - "256k(uboot)ro,1664k(env)," \ - "2M(linux)ro,-(root) rw " \ - "rootfstype=jffs2"

#define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index 89d1ad91e0..1151da5a78 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -17,7 +17,6 @@ #define CONFIG_MISC_INIT_R

#define CONFIG_TIMESTAMP /* Print image info with timestamp */ -#undef CONFIG_BOOTARGS

#define CONFIG_EXTRA_ENV_SETTINGS \ "addmisc=setenv bootargs ${bootargs} " \ diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index a78112d5bc..97fd24eb1f 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -17,7 +17,6 @@ #define CONFIG_MISC_INIT_R

#define CONFIG_TIMESTAMP /* Print image info with timestamp */ -#undef CONFIG_BOOTARGS

#define CONFIG_EXTRA_ENV_SETTINGS \ "addmisc=setenv bootargs ${bootargs} " \ diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index 5f74b2a0e0..117bcba3d9 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -18,8 +18,6 @@

#define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC3,115200" - #define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 64fd4b97a0..8c4c4ad59f 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -18,7 +18,6 @@ #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_CONS_SCIF1 1

-#define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_ENV_OVERWRITE 1

/* SDRAM */ diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index c5f577a3bf..420965b196 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -26,7 +26,6 @@ #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_CONS_SCIF0 1

-#define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_ENV_OVERWRITE 1

#define CONFIG_SYS_TEXT_BASE 0x0FFC0000 diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 16f45f2bea..839afd2990 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -23,8 +23,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_CMDLINE_EDITING

-#define CONFIG_BOOTARGS "" - #undef CONFIG_SHOW_BOOT_PROGRESS

#define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 8da3e7a235..5fb45c5eea 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -92,10 +92,6 @@ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0"

-#define CONFIG_BOOTARGS \ - "console=ttySC0,115200 rw root=/dev/nfs " \ - "nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" - #define CONFIG_BOOTCOMMAND \ "tftp 0x48080000 Image; " \ "tftp 0x48000000 Image-"CONFIG_DEFAULT_FDT_FILE"; " \ diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index 8f30aefc41..f88c93bb10 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -15,7 +15,6 @@

#define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_LOADADDR 0x0C100000 /* RSK7203_SDRAM_BASE + 1MB */

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h index 14e55c579d..f34d76c88c 100644 --- a/include/configs/rsk7264.h +++ b/include/configs/rsk7264.h @@ -16,7 +16,6 @@

#define CONFIG_DISPLAY_BOARDINFO

-#define CONFIG_BOOTARGS "console=ttySC3,115200" #define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE }

#define CONFIG_SYS_LONGHELP 1 /* undef to save memory */ diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h index 60844ab738..8a6b1298d2 100644 --- a/include/configs/rsk7269.h +++ b/include/configs/rsk7269.h @@ -15,7 +15,6 @@

#define CONFIG_DISPLAY_BOARDINFO

-#define CONFIG_BOOTARGS "console=ttySC7,115200" #define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE }

#define CONFIG_SYS_LONGHELP /* undef to save memory */ diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index c56125209d..5e5b5fd4f2 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -115,7 +115,6 @@ #endif

#define CONFIG_LOADADDR 0xC307FFC0 -#define CONFIG_BOOTARGS "console=ttyLF0 root=/dev/ram rw"

#define CONFIG_EXTRA_ENV_SETTINGS \ "boot_scripts=boot.scr.uimg boot.scr\0" \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 9c00138508..2a8880046d 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -114,9 +114,6 @@

#define CONFIG_COMMON_BOOT "${console} ${meminfo} ${mtdparts}"

-#define CONFIG_BOOTARGS "root=/dev/mtdblock8 rootfstype=ext4 " \ - CONFIG_COMMON_BOOT - #define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x100000;" \ " onenand write 0x32008000 0x0 0x100000\0"

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index b0bc69dab0..9859f30718 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -29,7 +29,6 @@

/* Console configuration */

-#define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run mmcboot" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"

diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index b25be974b6..8b8b4920fe 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -95,12 +95,6 @@ "bootz 0x22000000 - 0x21000000" #endif

-#undef CONFIG_BOOTARGS -#define CONFIG_BOOTARGS \ - "console=ttyS0,57600 earlyprintk " \ - "mtdparts=atmel_nand:6M(bootstrap)ro, 6M(kernel)ro,-(rootfs) " \ - "rootfstype=ubifs ubi.mtd=2 root=ubi0:rootfs" - /* SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x200000 diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 42fb1e11d0..f58ed5a445 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -64,9 +64,6 @@ #define CONFIG_BOOTCOMMAND "fatload mmc 1:1 0x21000000 at91-sama5d2_xplained.dtb; " \ "fatload mmc 1:1 0x22000000 zImage; " \ "bootz 0x22000000 - 0x21000000" -#undef CONFIG_BOOTARGS -#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait"

#endif

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index edb153f79e..6117a83a72 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -98,8 +98,6 @@

#define CONFIG_CMD_SANDBOX

-#define CONFIG_BOOTARGS "" - #ifndef SANDBOX_NO_SDL #define CONFIG_SANDBOX_SDL #endif diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h index e55addb99c..250917b1dc 100644 --- a/include/configs/sansa_fuze_plus.h +++ b/include/configs/sansa_fuze_plus.h @@ -23,7 +23,6 @@

/* Booting Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " #define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index c0faac3b79..4e23a33de6 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -632,8 +632,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 800000

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=sbc8349\0" \ diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index cf9809df49..53895a0920 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -566,8 +566,6 @@

#define CONFIG_LOADADDR 1000000 /*default location for tftp and bootm*/

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index c5f9fcb918..da1cb34ade 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -515,8 +515,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index f7aeb640f6..59be3f31ea 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -45,7 +45,6 @@

/* Booting Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyAMA0,115200" #define CONFIG_BOOTCOMMAND "bootm" #define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 46d0f2aede..694ce3fdae 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -16,8 +16,6 @@

#define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" - #define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index aa8d05c221..6ca4c567f8 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -16,8 +16,6 @@

#define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" - #define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index 1759a6f5d9..2ef88dbb63 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -17,8 +17,6 @@

#define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" - #define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS

diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 50a0e3e7d1..b869d0b502 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -19,7 +19,6 @@ */ #define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC2,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 59fcad0309..b4e8cff5e3 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -16,8 +16,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SH_ZIMAGEBOOT

-#define CONFIG_BOOTARGS "console=ttySC1,115200 root=/dev/nfs ip=dhcp" - #define CONFIG_EXTRA_ENV_SETTINGS \ "bootdevice=0:1\0" \ "usbload=usb reset;usbboot;usb stop;bootm\0" diff --git a/include/configs/shmin.h b/include/configs/shmin.h index c9718f9b36..c7ff095cfc 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -17,8 +17,6 @@

#define CONFIG_CMD_SDRAM

-#define CONFIG_BOOTARGS "console=ttySC0,115200" - /* * This board has original boot loader. If you write u-boot to 0x0, * you should set undef. diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 14b49c4faf..54c16fb007 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -85,9 +85,6 @@ " mem=128M " \ " " MTDPARTS_DEFAULT

-#define CONFIG_BOOTARGS "root=/dev/mtdblock5 ubi.mtd=4" \ - " rootfstype=cramfs " CONFIG_COMMON_BOOT - #define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \ " onenand write 0x32008000 0x0 0x40000\0"

diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 63bc769efe..c3d064ddeb 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -122,7 +122,6 @@ #define CONFIG_ENV_OFFSET (512 << 10) #define CONFIG_ENV_SIZE (256 << 10) #define CONFIG_ENV_OVERWRITE -#define CONFIG_BOOTARGS "console=ttyS0,115200 ip=any"

/* Console settings */ #define CONFIG_SYS_CBSIZE 256 diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h index 55850bd1b3..61ffd1503f 100644 --- a/include/configs/socfpga_arria10_socdk.h +++ b/include/configs/socfpga_arria10_socdk.h @@ -35,13 +35,6 @@ */

/* - * arguments passed to the bootz command. The value of - * CONFIG_BOOTARGS goes into the environment value "bootargs". - * Do note the value will overide also the chosen node in FDT blob. - */ -#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) - -/* * Serial / UART configurations */ #define CONFIG_SYS_NS16550_MEM32 diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index febb8f7fcc..b1b269ff9e 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -16,7 +16,6 @@

/* Booting Linux */ #define CONFIG_BOOTFILE "zImage" -#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR

diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index e9c7c71a73..404f064e94 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -15,7 +15,6 @@

/* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" -#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_PREBOOT "run try_bootscript" #define CONFIG_BOOTCOMMAND "run mmc_mmc" #define CONFIG_LOADADDR 0x01000000 diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index a86043f339..b8f6717760 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -15,7 +15,6 @@

/* Booting Linux */ #define CONFIG_BOOTFILE "openwrt-socfpga-socfpga_cyclone5_vining_fpga-fit-uImage.itb" -#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_BOOTCOMMAND "run selboot" #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 3864dfb09f..5d45301f81 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -321,8 +321,6 @@ "echo Welcome on the ABB Socrates Board;" \ "echo"

-#undef CONFIG_BOOTARGS /* the boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consdev=ttyS0\0" \ diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 86e14ffac8..e68f91b51f 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -146,11 +146,6 @@ "bootm 0x1600000" #endif

-#define CONFIG_BOOTARGS "console=ttyAMA0,115200 " \ - "mem=128M " \ - "root="CONFIG_FSMTDBLK \ - "rootfstype=jffs2" - #define CONFIG_NFSBOOTCOMMAND \ "bootp; " \ "setenv bootargs root=/dev/nfs rw " \ diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index eaa93a5830..c71413cc53 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -20,9 +20,6 @@

#define CONFIG_SYS_HZ_CLOCK 1000000000 /* 1 GHz */

-#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" - /* Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ "board= B2260" \ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index c47be514d8..518699047f 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -65,8 +65,6 @@

#define CONFIG_SYS_MALLOC_LEN (2 << 20)

-#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" #define CONFIG_BOOTCOMMAND \ "run bootcmd_romfs"

diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 46955b1f1f..a1e34ee90c 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -54,8 +54,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)

-#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel" #define CONFIG_BOOTCOMMAND \ "run bootcmd_romfs"

diff --git a/include/configs/taurus.h b/include/configs/taurus.h index cdea9ebf59..d6dfa856df 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -149,75 +149,6 @@ #define CONFIG_ENV_SIZE (SZ_128K) /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"

-#if defined(CONFIG_BOARD_TAURUS) -#define CONFIG_BOOTARGS_TAURUS \ - "console=ttyS0,115200 earlyprintk " \ - "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ - "512k(dtb),6M(kernel)ro,-(rootfs) " \ - "root=/dev/mtdblock7 rw rootfstype=jffs2" -#endif - -#if defined(CONFIG_BOARD_AXM) -#define CONFIG_BOOTARGS_AXM \ - "\0" \ - "addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \ - "${gatewayip}:${netmask}:${hostname}:${netdev}::off\0" \ - "addtest=setenv bootargs ${bootargs} loglevel=4 test\0" \ - "baudrate=115200\0" \ - "boot_file=setenv bootfile /${project_dir}/kernel/uImage\0" \ - "boot_retries=0\0" \ - "bootcmd=run flash_self\0" \ - "bootdelay=3\0" \ - "ethact=macb0\0" \ - "flash_nfs=run nand_kernel;run nfsargs;run addip;upgrade_available;"\ - "bootm ${kernel_ram};reset\0" \ - "flash_self=run nand_kernel;run setbootargs;upgrade_available;" \ - "bootm ${kernel_ram};reset\0" \ - "flash_self_test=run nand_kernel;run setbootargs addtest; " \ - "upgrade_available;bootm ${kernel_ram};reset\0" \ - "hostname=systemone\0" \ - "kernel_Off=0x00200000\0" \ - "kernel_Off_fallback=0x03800000\0" \ - "kernel_ram=0x21500000\0" \ - "kernel_size=0x00400000\0" \ - "kernel_size_fallback=0x00400000\0" \ - "loads_echo=1\0" \ - "nand_kernel=nand read.e ${kernel_ram} ${kernel_Off} " \ - "${kernel_size}\0" \ - "net_nfs=run boot_file;tftp ${kernel_ram} ${bootfile};" \ - "run nfsargs;run addip;upgrade_available;bootm " \ - "${kernel_ram};reset\0" \ - "netdev=eth0\0" \ - "nfsargs=run root_path;setenv bootargs ${bootargs} " \ - "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \ - "at91sam9_wdt.wdt_timeout=16\0" \ - "partitionset_active=A\0" \ - "preboot=echo;echo Type 'run flash_self' to use kernel and root "\ - "filesystem on memory;echo Type 'run flash_nfs' to use kernel " \ - "from memory and root filesystem over NFS;echo Type 'run net_nfs' "\ - "to get Kernel over TFTP and mount root filesystem over NFS;echo\0"\ - "project_dir=systemone\0" \ - "root_path=setenv rootpath /home/projects/${project_dir}/rootfs\0"\ - "rootfs=/dev/mtdblock5\0" \ - "rootfs_fallback=/dev/mtdblock7\0" \ - "setbootargs=setenv bootargs ${bootargs} console=ttyMTD,mtdoops "\ - "root=${rootfs} rootfstype=jffs2 panic=7 " \ - "at91sam9_wdt.wdt_timeout=16\0" \ - "stderr=serial\0" \ - "stdin=serial\0" \ - "stdout=serial\0" \ - "upgrade_available=0\0" -#endif - -#if defined(CONFIG_BOARD_TAURUS) -#define CONFIG_BOOTARGS CONFIG_BOOTARGS_TAURUS -#endif - -#if defined(CONFIG_BOARD_AXM) -#define CONFIG_BOOTARGS CONFIG_BOOTARGS_AXM -#endif - #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE \ diff --git a/include/configs/tb100.h b/include/configs/tb100.h index 67b5774a09..6106b85e97 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -72,7 +72,6 @@ * Environment configuration */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyS0,115200n8" #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR

/* diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 514590a270..f2d0d22ad3 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -69,12 +69,6 @@ "fdt_addr=0x94C00000\0" \ "fdt_high=0x9fffffff\0"

-#define CONFIG_BOOTARGS \ - "console=ttyAMA0,115200n8 " \ - "earlycon=pl011,0x87e024000000 " \ - "debug maxcpus=48 rootwait rw "\ - "root=/dev/sda2 coherent_pool=16M" - /* Do not preserve environment */ #define CONFIG_ENV_SIZE 0x1000

diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index bba10ec001..b9da2f5468 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -26,8 +26,6 @@ "fatload mmc 0 ${loadaddr} uImage;" \ "bootm ${loadaddr}" \

-#define CONFIG_BOOTARGS "console=ttyO2,115200n8 noinitrd earlyprintk" - /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index c6122a0f74..87e8456014 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -322,8 +322,6 @@ #endif #endif

-#define CONFIG_BOOTARGS \ - /* Now for the remaining common defines */ #include <configs/ti_armv7_common.h>

diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index a03ad67af0..b5defd4de9 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -32,8 +32,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE \ {9600, 19200, 38400, 57600, 115200}

-#define CONFIG_BOOTARGS \ - "console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs" #define CONFIG_BOOTCOMMAND \ "dhcp 192.168.1.1:wdr4300.fit && bootm $loadaddr"

diff --git a/include/configs/trats.h b/include/configs/trats.h index 3059d89ac9..eb656feba0 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -41,7 +41,6 @@

#define CONFIG_MACH_TYPE MACH_TYPE_TRATS

-#define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"

diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 1f3ce9d941..7f6a61a1db 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -38,7 +38,6 @@

/* Console configuration */

-#define CONFIG_BOOTARGS "Please use defined boot" #define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"

diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 335ce4e12e..f43030f090 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -118,10 +118,6 @@ CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_BOOTCOMMAND "nboot 21000000 0" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock1 " \ - "mtdparts=" MTDPARTS_DEFAULT " " \ - "rw rootfstype=jffs2" #define CONFIG_EXTRA_ENV_SETTINGS \ "mtdparts=" MTDPARTS_DEFAULT "\0" \

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 5bacc9d834..95e232429f 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -87,7 +87,6 @@ BOOTENV

#ifndef CONFIG_CMDLINE -#define CONFIG_BOOTARGS "console=ttymxc0,115200 root=/dev/mmcblk0p1 rootwait rw" #define USBARMORY_FIT_PATH "/boot/usbarmory.itb" #define USBARMORY_FIT_ADDR "0x70800000" #endif diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 3b1233f615..c06f19d5a5 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -173,15 +173,6 @@ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \

-/* Assume we boot with root on the first partition of a USB stick */ -#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " \ - "root=/dev/sda2 rw " \ - "rootwait "\ - "earlyprintk=pl011,0x7ff80000 debug "\ - "user_debug=31 "\ - "androidboot.hardware=juno "\ - "loglevel=9" - /* Copy the kernel and FDT to DRAM memory and boot */ #define CONFIG_BOOTCOMMAND "afs load ${kernel_name} ${kernel_addr} ; " \ "if test $? -eq 1; then "\ @@ -215,10 +206,6 @@ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0"

-#define CONFIG_BOOTARGS "console=ttyAMA0 earlyprintk=pl011,"\ - "0x1c090000 debug user_debug=31 "\ - "loglevel=9" - #define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \ "smhload ${fdtfile} ${fdt_addr}; " \ "smhload ${initrd_name} ${initrd_addr} "\ @@ -236,13 +223,6 @@ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0"

-#define CONFIG_BOOTARGS "console=ttyAMA0 earlyprintk=pl011,"\ - "0x1c090000 debug user_debug=31 "\ - "androidboot.hardware=fvpbase "\ - "root=/dev/vda2 rw "\ - "rootwait "\ - "loglevel=9" - #define CONFIG_BOOTCOMMAND "booti $kernel_addr $initrd_addr $fdt_addr"

diff --git a/include/configs/vinco.h b/include/configs/vinco.h index dc35b289d4..11b129a6d9 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -103,9 +103,6 @@ "mmc read ${oftaddr} ${dtb_offset} ${dtb_blksize};" \ "bootz ${loadaddr} - ${oftaddr}"

-#undef CONFIG_BOOTARGS -#define CONFIG_BOOTARGS "console=ttyS0,115200 earlyprintk rw root=/dev/mmcblk0p2 rootfstype=ext4 rootwait quiet lpj=1990656" - #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_start=0x20000\0" \ "kernel_size=0x800000\0" \ diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 13ebafeac8..b7d0656842 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -530,8 +530,6 @@

#define CONFIG_LOADADDR 800000 /* def location for tftp and bootm */

-#undef CONFIG_BOOTARGS /* boot command will set bootargs */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "hostname=vme8349\0" \ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 807cb99c81..52606d875d 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -151,7 +151,6 @@ #define CONFIG_INITRD_TAG

#define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyS2,115200n8" #define CONFIG_LOADADDR 0x80008000

/* diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 1be69748b7..99b914644e 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -73,8 +73,6 @@

#define CONFIG_CMD_ZBOOT

-#define CONFIG_BOOTARGS \ - "root=/dev/sdb3 init=/sbin/init rootwait ro" #define CONFIG_BOOTCOMMAND \ "ext2load scsi 0:3 01000000 /boot/vmlinuz; zboot 01000000"

diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h index bd829a9495..73f431681d 100644 --- a/include/configs/xfi3.h +++ b/include/configs/xfi3.h @@ -23,7 +23,6 @@

/* Booting Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " #define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR

diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index e730824146..5279f54a92 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -35,8 +35,6 @@ "else " \ "bootm 0x50000; " \ "fi; " -#define CONFIG_BOOTARGS \ - "console=tty0 console=ttyS2,115200 fbcon=rotate:3" #define CONFIG_TIMESTAMP #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/env_default.h b/include/env_default.h index ea6704a972..e48d42b240 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -28,7 +28,7 @@ const uchar default_environment[] = { #ifdef CONFIG_ENV_FLAGS_LIST_DEFAULT ENV_FLAGS_VAR "=" CONFIG_ENV_FLAGS_LIST_DEFAULT "\0" #endif -#ifdef CONFIG_BOOTARGS +#ifdef CONFIG_USE_BOOTARGS "bootargs=" CONFIG_BOOTARGS "\0" #endif #ifdef CONFIG_BOOTCOMMAND diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 93f0bf47c6..5b5e2a327c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -188,9 +188,6 @@ CONFIG_BOARD_TAURUS CONFIG_BOARD_TYPES CONFIG_BOOGER CONFIG_BOOM -CONFIG_BOOTARGS -CONFIG_BOOTARGS_AXM -CONFIG_BOOTARGS_TAURUS CONFIG_BOOTBLOCK CONFIG_BOOTCOMMAND CONFIG_BOOTCOUNT_ALEN