Eric Lee / smarc-uboot

54
Download as
Browse Code ยป

Commit b6251db8c3f0de605b4cd6f15a00fc7dd19cda63

Authored by Tom Rini
1 parent 232ed3ca53
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

Kconfig: Introduce USE_BOOTCOMMAND and migrate BOOTCOMMAND 

We first introduce CONFIG_USE_BOOTCOMMAND, similar to
CONFIG_USE_BOOTARGS.  We then migrate CONFIG_BOOTCOMMAND for most
CONFIG_DISTRO_DEFAULT users.  In some cases platforms have a complex
scheme around this usage, and these have been defered for the moment so
that platform maintainers can work on a migration plan.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>

Showing 60 changed files with 63 additions and 55 deletions Side-by-side Diff

... ... @@ -66,6 +66,7 @@
66 66 default y if ARCH_MESON
67 67 default y if ARCH_ROCKCHIP
68 68 default n
  69 + imply USE_BOOTCOMMAND
69 70 select CMD_BOOTZ if ARM && !ARM64
70 71 select CMD_BOOTI if ARM64
71 72 select CMD_DHCP
... ... @@ -200,6 +200,23 @@
200 200 CONFIG_BOOTARGS goes into the environment value "bootargs". Note that
201 201 this value will also override the "chosen" node in FDT blob.
202 202  
  203 +config USE_BOOTCOMMAND
  204 + bool "Enable a default value for bootcmd"
  205 + help
  206 + Provide a default value for the bootcmd entry in the environment. If
  207 + autoboot is enabled this is what will be run automatically. Enable
  208 + this option to be able to specify CONFIG_BOOTCOMMAND as a string. If
  209 + this option is disabled, CONFIG_BOOTCOMMAND will be undefined and
  210 + won't take any space in U-Boot image.
  211 +
  212 +config BOOTCOMMAND
  213 + string "bootcmd value"
  214 + depends on USE_BOOTCOMMAND
  215 + default "run distro_bootcmd" if DISTRO_DEFAULTS
  216 + help
  217 + This is the string of commands that will be used as bootcmd and if
  218 + AUTOBOOT is set, automatically run.
  219 +
203 220 menu "Console"
204 221  
205 222 config MENU
configs/am335x_evm_defconfig
Diff comments   View file @ b6251db
... ... @@ -4,6 +4,7 @@
4 4 CONFIG_AM33XX=y
5 5 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
6 6 CONFIG_DISTRO_DEFAULTS=y
  7 +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
7 8 CONFIG_SPL_LOAD_FIT=y
8 9 CONFIG_SYS_CONSOLE_INFO_QUIET=y
9 10 CONFIG_VERSION_VARIABLE=y
configs/am335x_evm_nor_defconfig
Diff comments   View file @ b6251db
... ... @@ -4,6 +4,7 @@
4 4 CONFIG_AM33XX=y
5 5 CONFIG_NOR=y
6 6 CONFIG_DISTRO_DEFAULTS=y
  7 +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
7 8 CONFIG_SYS_CONSOLE_INFO_QUIET=y
8 9 CONFIG_VERSION_VARIABLE=y
9 10 CONFIG_ARCH_MISC_INIT=y
configs/am335x_evm_norboot_defconfig
Diff comments   View file @ b6251db
... ... @@ -6,6 +6,7 @@
6 6 CONFIG_AM33XX=y
7 7 CONFIG_NOR=y
8 8 CONFIG_DISTRO_DEFAULTS=y
  9 +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
9 10 CONFIG_NOR_BOOT=y
10 11 CONFIG_SYS_CONSOLE_INFO_QUIET=y
11 12 CONFIG_VERSION_VARIABLE=y
configs/am335x_evm_spiboot_defconfig
Diff comments   View file @ b6251db
... ... @@ -6,6 +6,7 @@
6 6 CONFIG_SPL_SPI_FLASH_SUPPORT=y
7 7 CONFIG_SPL_SPI_SUPPORT=y
8 8 CONFIG_DISTRO_DEFAULTS=y
  9 +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
9 10 CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT"
10 11 CONFIG_SPI_BOOT=y
11 12 CONFIG_SYS_CONSOLE_INFO_QUIET=y
configs/am335x_evm_usbspl_defconfig
Diff comments   View file @ b6251db
... ... @@ -4,6 +4,7 @@
4 4 CONFIG_AM33XX=y
5 5 # CONFIG_SPL_NAND_SUPPORT is not set
6 6 CONFIG_DISTRO_DEFAULTS=y
  7 +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
7 8 # CONFIG_ANDROID_BOOT_IMAGE is not set
8 9 CONFIG_SYS_CONSOLE_INFO_QUIET=y
9 10 CONFIG_VERSION_VARIABLE=y
configs/apalis-tk1_defconfig
Diff comments   View file @ b6251db
... ... @@ -6,6 +6,7 @@
6 6 CONFIG_FIT=y
7 7 CONFIG_OF_SYSTEM_SETUP=y
8 8 CONFIG_BOOTDELAY=1
  9 +CONFIG_BOOTCOMMAND="run emmcboot; setenv fdtfile ${soc}-apalis-${fdt_board}.dtb && run distro_bootcmd"
9 10 CONFIG_CONSOLE_MUX=y
10 11 CONFIG_SYS_STDIO_DEREGISTER=y
11 12 CONFIG_VERSION_VARIABLE=y
configs/duovero_defconfig
Diff comments   View file @ b6251db
... ... @@ -4,6 +4,7 @@
4 4 CONFIG_TARGET_DUOVERO=y
5 5 # CONFIG_SPL_NAND_SUPPORT is not set
6 6 CONFIG_DISTRO_DEFAULTS=y
  7 +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
7 8 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
8 9 CONFIG_SYS_CONSOLE_INFO_QUIET=y
9 10 CONFIG_VERSION_VARIABLE=y
configs/evb-rv1108_defconfig
Diff comments   View file @ b6251db
... ... @@ -4,6 +4,7 @@
4 4 CONFIG_TARGET_EVB_RV1108=y
5 5 CONFIG_DEFAULT_DEVICE_TREE="rv1108-evb"
6 6 CONFIG_DEBUG_UART=y
  7 +# CONFIG_USE_BOOTCOMMAND is not set
7 8 # CONFIG_DISPLAY_CPUINFO is not set
8 9 CONFIG_FASTBOOT_BUF_ADDR=0x62000000
9 10 CONFIG_FASTBOOT_BUF_SIZE=0x08000000
configs/igep0032_defconfig
Diff comments   View file @ b6251db
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_OMAP2PLUS=y
3 3 CONFIG_TARGET_OMAP3_IGEP00X0=y
4 4 CONFIG_DISTRO_DEFAULTS=y
  5 +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
5 6 CONFIG_OF_BOARD_SETUP=y
6 7 CONFIG_BOOTDELAY=3
7 8 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/igep00x0_defconfig
Diff comments   View file @ b6251db
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_OMAP2PLUS=y
3 3 CONFIG_TARGET_OMAP3_IGEP00X0=y
4 4 CONFIG_DISTRO_DEFAULTS=y
  5 +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
5 6 CONFIG_OF_BOARD_SETUP=y
6 7 CONFIG_BOOTDELAY=3
7 8 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/ls2080a_emu_defconfig
Diff comments   View file @ b6251db
... ... @@ -9,6 +9,7 @@
9 9 CONFIG_BOOTDELAY=10
10 10 CONFIG_USE_BOOTARGS=y
11 11 CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  12 +# CONFIG_USE_BOOTCOMMAND is not set
12 13 # CONFIG_DISPLAY_BOARDINFO is not set
13 14 # CONFIG_CMD_CONSOLE is not set
14 15 # CONFIG_CMD_XIMG is not set
configs/ls2080a_simu_defconfig
Diff comments   View file @ b6251db
... ... @@ -9,6 +9,7 @@
9 9 CONFIG_BOOTDELAY=10
10 10 CONFIG_USE_BOOTARGS=y
11 11 CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  12 +# CONFIG_USE_BOOTCOMMAND is not set
12 13 # CONFIG_DISPLAY_BOARDINFO is not set
13 14 # CONFIG_CMD_CONSOLE is not set
14 15 # CONFIG_CMD_XIMG is not set
configs/ls2080aqds_SECURE_BOOT_defconfig
Diff comments   View file @ b6251db
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_BOOTDELAY=10
11 11 CONFIG_USE_BOOTARGS=y
12 12 CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  13 +# CONFIG_USE_BOOTCOMMAND is not set
13 14 CONFIG_CMD_IMLS=y
14 15 CONFIG_CMD_GREPENV=y
15 16 CONFIG_CMD_EEPROM=y
configs/ls2080aqds_defconfig
Diff comments   View file @ b6251db
... ... @@ -9,6 +9,7 @@
9 9 CONFIG_BOOTDELAY=10
10 10 CONFIG_USE_BOOTARGS=y
11 11 CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  12 +# CONFIG_USE_BOOTCOMMAND is not set
12 13 CONFIG_CMD_IMLS=y
13 14 CONFIG_CMD_GREPENV=y
14 15 CONFIG_CMD_EEPROM=y
configs/ls2080aqds_nand_defconfig
Diff comments   View file @ b6251db
... ... @@ -14,6 +14,7 @@
14 14 CONFIG_BOOTDELAY=10
15 15 CONFIG_USE_BOOTARGS=y
16 16 CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  17 +# CONFIG_USE_BOOTCOMMAND is not set
17 18 CONFIG_SPL=y
18 19 CONFIG_SPL_ENV_SUPPORT=y
19 20 CONFIG_SPL_I2C_SUPPORT=y
configs/ls2080aqds_qspi_defconfig
Diff comments   View file @ b6251db
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_BOOTDELAY=10
11 11 CONFIG_USE_BOOTARGS=y
12 12 CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  13 +# CONFIG_USE_BOOTCOMMAND is not set
13 14 CONFIG_CMD_GREPENV=y
14 15 CONFIG_CMD_EEPROM=y
15 16 CONFIG_CMD_GPT=y
configs/ls2080aqds_sdcard_defconfig
Diff comments   View file @ b6251db
... ... @@ -15,6 +15,7 @@
15 15 CONFIG_BOOTDELAY=10
16 16 CONFIG_USE_BOOTARGS=y
17 17 CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  18 +# CONFIG_USE_BOOTCOMMAND is not set
18 19 CONFIG_SPL=y
19 20 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
20 21 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x8b0
configs/ls2080ardb_SECURE_BOOT_defconfig
Diff comments   View file @ b6251db
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_BOOTDELAY=10
11 11 CONFIG_USE_BOOTARGS=y
12 12 CONFIG_BOOTARGS="console=ttyS1,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0600 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  13 +# CONFIG_USE_BOOTCOMMAND is not set
13 14 CONFIG_CMD_IMLS=y
14 15 CONFIG_CMD_GREPENV=y
15 16 CONFIG_CMD_EEPROM=y
configs/ls2080ardb_defconfig
Diff comments   View file @ b6251db
... ... @@ -9,6 +9,7 @@
9 9 CONFIG_BOOTDELAY=10
10 10 CONFIG_USE_BOOTARGS=y
11 11 CONFIG_BOOTARGS="console=ttyS1,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0600 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  12 +# CONFIG_USE_BOOTCOMMAND is not set
12 13 CONFIG_CMD_IMLS=y
13 14 CONFIG_CMD_GREPENV=y
14 15 CONFIG_CMD_EEPROM=y
configs/ls2080ardb_nand_defconfig
Diff comments   View file @ b6251db
... ... @@ -14,6 +14,7 @@
14 14 CONFIG_BOOTDELAY=10
15 15 CONFIG_USE_BOOTARGS=y
16 16 CONFIG_BOOTARGS="console=ttyS1,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0600 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  17 +# CONFIG_USE_BOOTCOMMAND is not set
17 18 CONFIG_SPL=y
18 19 CONFIG_SPL_ENV_SUPPORT=y
19 20 CONFIG_SPL_I2C_SUPPORT=y
configs/ls2081ardb_defconfig
Diff comments   View file @ b6251db
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_BOOTDELAY=10
12 12 CONFIG_USE_BOOTARGS=y
13 13 CONFIG_BOOTARGS="console=ttyS1,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0600 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  14 +# CONFIG_USE_BOOTCOMMAND is not set
14 15 CONFIG_CMD_GREPENV=y
15 16 CONFIG_CMD_GPT=y
16 17 CONFIG_CMD_I2C=y
configs/ls2088ardb_qspi_SECURE_BOOT_defconfig
Diff comments   View file @ b6251db
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_OF_STDOUT_VIA_ALIAS=y
11 11 CONFIG_QSPI_BOOT=y
12 12 CONFIG_BOOTDELAY=10
  13 +# CONFIG_USE_BOOTCOMMAND is not set
13 14 CONFIG_CMD_GREPENV=y
14 15 CONFIG_CMD_GPT=y
15 16 CONFIG_CMD_I2C=y
configs/ls2088ardb_qspi_defconfig
Diff comments   View file @ b6251db
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_BOOTDELAY=10
12 12 CONFIG_USE_BOOTARGS=y
13 13 CONFIG_BOOTARGS="console=ttyS1,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0600 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
  14 +# CONFIG_USE_BOOTCOMMAND is not set
14 15 CONFIG_CMD_GREPENV=y
15 16 CONFIG_CMD_GPT=y
16 17 CONFIG_CMD_I2C=y
configs/lsxhl_defconfig
Diff comments   View file @ b6251db
... ... @@ -8,6 +8,7 @@
8 8 CONFIG_BOOTDELAY=3
9 9 CONFIG_USE_BOOTARGS=y
10 10 CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2"
  11 +CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}"
11 12 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
12 13 CONFIG_SYS_CONSOLE_INFO_QUIET=y
13 14 # CONFIG_DISPLAY_BOARDINFO is not set
configs/marsboard_defconfig
Diff comments   View file @ b6251db
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_MX6=y
3 3 CONFIG_TARGET_EMBESTMX6BOARDS=y
4 4 CONFIG_DISTRO_DEFAULTS=y
  5 +CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
5 6 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
6 7 # CONFIG_CONSOLE_MUX is not set
7 8 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6cuboxi_defconfig
Diff comments   View file @ b6251db
... ... @@ -11,6 +11,7 @@
11 11 # CONFIG_CMD_BMODE is not set
12 12 CONFIG_CMD_HDMIDETECT=y
13 13 CONFIG_DISTRO_DEFAULTS=y
  14 +CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
14 15 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
15 16 # CONFIG_SYS_STDIO_DEREGISTER is not set
16 17 CONFIG_BOARD_EARLY_INIT_F=y
configs/novena_defconfig
Diff comments   View file @ b6251db
... ... @@ -12,6 +12,7 @@
12 12 CONFIG_SPL_FAT_SUPPORT=y
13 13 CONFIG_CMD_HDMIDETECT=y
14 14 CONFIG_DISTRO_DEFAULTS=y
  15 +CONFIG_BOOTCOMMAND="run distro_bootcmd ; run net_nfs"
15 16 CONFIG_FIT=y
16 17 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
17 18 CONFIG_USE_BOOTARGS=y
configs/omap3_beagle_defconfig
Diff comments   View file @ b6251db
... ... @@ -3,6 +3,7 @@
3 3 CONFIG_SYS_TEXT_BASE=0x80100000
4 4 CONFIG_TARGET_OMAP3_BEAGLE=y
5 5 CONFIG_DISTRO_DEFAULTS=y
  6 +# CONFIG_USE_BOOTCOMMAND is not set
6 7 CONFIG_SYS_CONSOLE_INFO_QUIET=y
7 8 CONFIG_VERSION_VARIABLE=y
8 9 CONFIG_SPL=y
configs/omap3_evm_defconfig
Diff comments   View file @ b6251db
... ... @@ -6,6 +6,7 @@
6 6 CONFIG_SYS_MPUCLK=720
7 7 CONFIG_TARGET_OMAP3_EVM=y
8 8 CONFIG_DISTRO_DEFAULTS=y
  9 +# CONFIG_USE_BOOTCOMMAND is not set
9 10 CONFIG_BOOTDELAY=3
10 11 CONFIG_SYS_CONSOLE_INFO_QUIET=y
11 12 CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb"
configs/omap3_pandora_defconfig
Diff comments   View file @ b6251db
... ... @@ -3,6 +3,7 @@
3 3 CONFIG_SYS_TEXT_BASE=0x80008000
4 4 CONFIG_TARGET_OMAP3_PANDORA=y
5 5 CONFIG_DISTRO_DEFAULTS=y
  6 +# CONFIG_USE_BOOTCOMMAND is not set
6 7 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
7 8 CONFIG_SYS_CONSOLE_INFO_QUIET=y
8 9 CONFIG_VERSION_VARIABLE=y
configs/omap4_panda_defconfig
Diff comments   View file @ b6251db
... ... @@ -4,6 +4,7 @@
4 4 CONFIG_TARGET_OMAP4_PANDA=y
5 5 # CONFIG_SPL_NAND_SUPPORT is not set
6 6 CONFIG_DISTRO_DEFAULTS=y
  7 +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
7 8 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
8 9 CONFIG_SYS_CONSOLE_INFO_QUIET=y
9 10 CONFIG_VERSION_VARIABLE=y
configs/omap4_sdp4430_defconfig
Diff comments   View file @ b6251db
... ... @@ -7,6 +7,7 @@
7 7 CONFIG_CMD_BAT=y
8 8 # CONFIG_SPL_NAND_SUPPORT is not set
9 9 CONFIG_DISTRO_DEFAULTS=y
  10 +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
10 11 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
11 12 CONFIG_SYS_CONSOLE_INFO_QUIET=y
12 13 CONFIG_VERSION_VARIABLE=y
configs/riotboard_defconfig
Diff comments   View file @ b6251db
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_MX6=y
3 3 CONFIG_TARGET_EMBESTMX6BOARDS=y
4 4 CONFIG_DISTRO_DEFAULTS=y
  5 +CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
5 6 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
6 7 # CONFIG_CONSOLE_MUX is not set
7 8 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/ti816x_evm_defconfig
Diff comments   View file @ b6251db
... ... @@ -15,6 +15,7 @@
15 15 CONFIG_BOOTDELAY=3
16 16 CONFIG_USE_BOOTARGS=y
17 17 CONFIG_BOOTARGS="console=ttyO2,115200n8 noinitrd earlyprintk"
  18 +# CONFIG_USE_BOOTCOMMAND is not set
18 19 CONFIG_SYS_CONSOLE_INFO_QUIET=y
19 20 CONFIG_VERSION_VARIABLE=y
20 21 # CONFIG_DISPLAY_BOARDINFO is not set
configs/udoo_neo_defconfig
Diff comments   View file @ b6251db
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_SPL_WATCHDOG_SUPPORT=y
11 11 # CONFIG_CMD_BMODE is not set
12 12 CONFIG_DISTRO_DEFAULTS=y
  13 +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
13 14 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
14 15 CONFIG_BOARD_EARLY_INIT_F=y
15 16 CONFIG_SPL=y
configs/usbarmory_defconfig
Diff comments   View file @ b6251db
... ... @@ -3,6 +3,7 @@
3 3 CONFIG_TARGET_USBARMORY=y
4 4 # CONFIG_CMD_BMODE is not set
5 5 CONFIG_DISTRO_DEFAULTS=y
  6 +# CONFIG_USE_BOOTCOMMAND is not set
6 7 CONFIG_CMD_MEMTEST=y
7 8 CONFIG_CMD_FUSE=y
8 9 CONFIG_CMD_I2C=y
configs/vexpress_aemv8a_dram_defconfig
Diff comments   View file @ b6251db
... ... @@ -6,6 +6,7 @@
6 6 CONFIG_BOOTDELAY=1
7 7 CONFIG_USE_BOOTARGS=y
8 8 CONFIG_BOOTARGS="console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda2 rw rootwait loglevel=9"
  9 +# CONFIG_USE_BOOTCOMMAND is not set
9 10 # CONFIG_DISPLAY_CPUINFO is not set
10 11 # CONFIG_DISPLAY_BOARDINFO is not set
11 12 CONFIG_SYS_PROMPT="VExpress64# "
configs/vexpress_aemv8a_juno_defconfig
Diff comments   View file @ b6251db
... ... @@ -6,6 +6,7 @@
6 6 CONFIG_BOOTDELAY=1
7 7 CONFIG_USE_BOOTARGS=y
8 8 CONFIG_BOOTARGS="console=ttyAMA0,115200n8 root=/dev/sda2 rw rootwait earlyprintk=pl011,0x7ff80000 debug user_debug=31 androidboot.hardware=juno loglevel=9"
  9 +# CONFIG_USE_BOOTCOMMAND is not set
9 10 # CONFIG_DISPLAY_CPUINFO is not set
10 11 # CONFIG_DISPLAY_BOARDINFO is not set
11 12 CONFIG_SYS_PROMPT="VExpress64# "
configs/vexpress_aemv8a_semi_defconfig
Diff comments   View file @ b6251db
... ... @@ -6,6 +6,7 @@
6 6 CONFIG_BOOTDELAY=1
7 7 CONFIG_USE_BOOTARGS=y
8 8 CONFIG_BOOTARGS="console=ttyAMA0 earlyprintk=pl011,0x1c090000 debug user_debug=31 loglevel=9"
  9 +# CONFIG_USE_BOOTCOMMAND is not set
9 10 # CONFIG_DISPLAY_CPUINFO is not set
10 11 # CONFIG_DISPLAY_BOARDINFO is not set
11 12 CONFIG_SYS_PROMPT="VExpress64# "
configs/vexpress_ca15_tc2_defconfig
Diff comments   View file @ b6251db
1 1 CONFIG_ARM=y
2 2 CONFIG_TARGET_VEXPRESS_CA15_TC2=y
3 3 CONFIG_DISTRO_DEFAULTS=y
  4 +CONFIG_BOOTCOMMAND="run distro_bootcmd; run bootflash"
4 5 CONFIG_OF_BOARD_SETUP=y
5 6 # CONFIG_DISPLAY_CPUINFO is not set
6 7 # CONFIG_DISPLAY_BOARDINFO is not set
configs/vexpress_ca5x2_defconfig
Diff comments   View file @ b6251db
1 1 CONFIG_ARM=y
2 2 CONFIG_TARGET_VEXPRESS_CA5X2=y
3 3 CONFIG_DISTRO_DEFAULTS=y
  4 +CONFIG_BOOTCOMMAND="run distro_bootcmd; run bootflash"
4 5 # CONFIG_DISPLAY_CPUINFO is not set
5 6 # CONFIG_DISPLAY_BOARDINFO is not set
6 7 # CONFIG_CMD_CONSOLE is not set
configs/vexpress_ca9x4_defconfig
Diff comments   View file @ b6251db
1 1 CONFIG_ARM=y
2 2 CONFIG_TARGET_VEXPRESS_CA9X4=y
3 3 CONFIG_DISTRO_DEFAULTS=y
  4 +CONFIG_BOOTCOMMAND="run distro_bootcmd; run bootflash"
4 5 # CONFIG_DISPLAY_CPUINFO is not set
5 6 # CONFIG_DISPLAY_BOARDINFO is not set
6 7 # CONFIG_CMD_CONSOLE is not set
configs/wandboard_defconfig
Diff comments   View file @ b6251db
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_SPL_WATCHDOG_SUPPORT=y
11 11 CONFIG_CMD_HDMIDETECT=y
12 12 CONFIG_DISTRO_DEFAULTS=y
  13 +CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
13 14 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
14 15 # CONFIG_CONSOLE_MUX is not set
15 16 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/zc5202_defconfig
Diff comments   View file @ b6251db
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_SPL_SPI_SUPPORT=y
12 12 CONFIG_SPL_WATCHDOG_SUPPORT=y
13 13 CONFIG_DISTRO_DEFAULTS=y
  14 +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
14 15 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
15 16 CONFIG_BOOTDELAY=3
16 17 CONFIG_DEFAULT_FDT_FILE="imx6q-zc5202.dtb"
configs/zc5601_defconfig
Diff comments   View file @ b6251db
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_SPL_SPI_SUPPORT=y
12 12 CONFIG_SPL_WATCHDOG_SUPPORT=y
13 13 CONFIG_DISTRO_DEFAULTS=y
  14 +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
14 15 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
15 16 CONFIG_BOOTDELAY=3
16 17 CONFIG_DEFAULT_FDT_FILE="imx6q-zc5601.dtb"
include/configs/am335x_evm.h
Diff comments   View file @ b6251db
... ... @@ -82,15 +82,6 @@
82 82 func(PXE, pxe, na) \
83 83 func(DHCP, dhcp, na)
84 84  
85   -#define CONFIG_BOOTCOMMAND \
86   - "if test ${boot_fit} -eq 1; then " \
87   - "run update_to_fit;" \
88   - "fi;" \
89   - "run findfdt; " \
90   - "run init_console; " \
91   - "run envboot; " \
92   - "run distro_bootcmd"
93   -
94 85 #include <config_distro_bootcmd.h>
95 86  
96 87 #ifndef CONFIG_SPL_BUILD
include/configs/apalis-tk1.h
Diff comments   View file @ b6251db
... ... @@ -54,10 +54,6 @@
54 54 #undef CONFIG_SERVERIP
55 55 #define CONFIG_SERVERIP 192.168.10.1
56 56  
57   -#define CONFIG_BOOTCOMMAND \
58   - "run emmcboot; setenv fdtfile ${soc}-apalis-${fdt_board}.dtb && " \
59   - "run distro_bootcmd"
60   -
61 57 #define DFU_ALT_EMMC_INFO "apalis-tk1.img raw 0x0 0x500 mmcpart 1; " \
62 58 "boot part 0 1 mmcpart 0; " \
63 59 "rootfs part 0 2 mmcpart 0; " \
include/configs/el6x_common.h
Diff comments   View file @ b6251db
... ... @@ -80,10 +80,6 @@
80 80 func(PXE, PXE, na) \
81 81 func(DHCP, dhcp, na)
82 82  
83   -#define CONFIG_BOOTCOMMAND \
84   - "run findfdt; " \
85   - "run distro_bootcmd"
86   -
87 83 #include <config_distro_bootcmd.h>
88 84  
89 85 #define CONFIG_ARP_TIMEOUT 200UL
include/configs/embestmx6boards.h
Diff comments   View file @ b6251db
... ... @@ -132,10 +132,6 @@
132 132 func(PXE, pxe, na) \
133 133 func(DHCP, dhcp, na)
134 134  
135   -#define CONFIG_BOOTCOMMAND \
136   - "run finduuid; " \
137   - "run distro_bootcmd"
138   -
139 135 #include <config_distro_bootcmd.h>
140 136  
141 137 #define CONSOLE_STDIN_SETTINGS \
include/configs/lsxl.h
Diff comments   View file @ b6251db
... ... @@ -70,7 +70,6 @@
70 70 * Default environment variables
71 71 */
72 72 #define CONFIG_LOADADDR 0x00800000
73   -#define CONFIG_BOOTCOMMAND "run bootcmd_${bootsource}"
74 73  
75 74 #if defined(CONFIG_LSXHL)
76 75 #define CONFIG_FDTFILE "kirkwood-lsxhl.dtb"
include/configs/mx6cuboxi.h
Diff comments   View file @ b6251db
... ... @@ -122,11 +122,6 @@
122 122 "echo WARNING: Could not determine dtb to use; fi; \0" \
123 123 BOOTENV
124 124  
125   -#define CONFIG_BOOTCOMMAND \
126   - "run findfdt; " \
127   - "run finduuid; " \
128   - "run distro_bootcmd"
129   -
130 125 #define BOOT_TARGET_DEVICES(func) \
131 126 func(MMC, mmc, 0) \
132 127 func(SATA, sata, 0) \
include/configs/novena.h
Diff comments   View file @ b6251db
... ... @@ -38,7 +38,6 @@
38 38  
39 39 /* Booting Linux */
40 40 #define CONFIG_BOOTFILE "fitImage"
41   -#define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run net_nfs"
42 41 #define CONFIG_HOSTNAME novena
43 42  
44 43 /* Physical Memory Map */
include/configs/omap3_igep00x0.h
Diff comments   View file @ b6251db
... ... @@ -72,10 +72,6 @@
72 72 #define BOOT_TARGET_DEVICES(func) \
73 73 func(MMC, mmc, 0)
74 74  
75   -#define CONFIG_BOOTCOMMAND \
76   - "run findfdt; " \
77   - "run distro_bootcmd"
78   -
79 75 #include <config_distro_bootcmd.h>
80 76  
81 77 #define ENV_FINDFDT \
include/configs/sandbox.h
Diff comments   View file @ b6251db
... ... @@ -74,8 +74,6 @@
74 74 func(HOST, host, 1) \
75 75 func(HOST, host, 0)
76 76  
77   -#define CONFIG_BOOTCOMMAND ""
78   -
79 77 #include <config_distro_bootcmd.h>
80 78  
81 79 #define CONFIG_KEEP_SERVERADDR
include/configs/ti_omap4_common.h
Diff comments   View file @ b6251db
... ... @@ -91,14 +91,6 @@
91 91 func(PXE, pxe, na) \
92 92 func(DHCP, dhcp, na)
93 93  
94   -#define CONFIG_BOOTCOMMAND \
95   - "if test ${boot_fit} -eq 1; then " \
96   - "run update_to_fit;" \
97   - "fi;" \
98   - "run findfdt; " \
99   - "run envboot; " \
100   - "run distro_bootcmd"
101   -
102 94 #include <config_distro_bootcmd.h>
103 95 #include <environment/ti/mmc.h>
104 96  
include/configs/udoo_neo.h
Diff comments   View file @ b6251db
... ... @@ -60,10 +60,6 @@
60 60 func(MMC, mmc, 0) \
61 61 func(DHCP, dhcp, na)
62 62  
63   -#define CONFIG_BOOTCOMMAND \
64   - "run findfdt; " \
65   - "run distro_bootcmd"
66   -
67 63 #include <config_distro_bootcmd.h>
68 64  
69 65 /* Miscellaneous configurable options */
include/configs/vexpress_common.h
Diff comments   View file @ b6251db
... ... @@ -177,10 +177,6 @@
177 177 #include <config_distro_defaults.h>
178 178  
179 179 /* Basic environment settings */
180   -#define CONFIG_BOOTCOMMAND \
181   - "run distro_bootcmd; " \
182   - "run bootflash; "
183   -
184 180 #define BOOT_TARGET_DEVICES(func) \
185 181 func(MMC, mmc, 1) \
186 182 func(MMC, mmc, 0) \
include/configs/wandboard.h
Diff comments   View file @ b6251db
... ... @@ -140,11 +140,6 @@
140 140 func(PXE, pxe, na) \
141 141 func(DHCP, dhcp, na)
142 142  
143   -#define CONFIG_BOOTCOMMAND \
144   - "run findfdt; " \
145   - "run finduuid; " \
146   - "run distro_bootcmd"
147   -
148 143 #include <config_distro_bootcmd.h>
149 144  
150 145 /* Physical Memory Map */