Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 72c3033fd1da878aec6b23eb9086a83f57d54eee

Authored by Simon Glass
Committed by Tom Rini
1 parent 2a728f3a1e
Exists in smarc_8mq_lf_v2020.04 and in 20 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.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

Convert CONFIG_CMD_SPL to Kconfig 

This converts the following to Kconfig:
   CONFIG_CMD_SPL

Note that trats does not actually use SPL, so this option can no-longer be
set.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

Showing 43 changed files with 41 additions and 13 deletions Side-by-side Diff

... ... @@ -732,6 +732,7 @@
732 732 select CLK_ZYNQ
733 733 imply CMD_CLK
734 734 imply FAT_WRITE
  735 + imply CMD_SPL
735 736  
736 737 config ARCH_ZYNQMP
737 738 bool "Support Xilinx ZynqMP Platform"
arch/arm/mach-imx/mx6/Kconfig
Diff comments   View file @ 72c3033
... ... @@ -145,6 +145,7 @@
145 145 bool "gw_ventana"
146 146 select SUPPORT_SPL
147 147 imply CMD_SATA
  148 + imply CMD_SPL
148 149  
149 150 config TARGET_KOSAGI_NOVENA
150 151 bool "Kosagi Novena"
arch/arm/mach-omap2/am33xx/Kconfig
Diff comments   View file @ 72c3033
... ... @@ -81,6 +81,7 @@
81 81 select DM
82 82 select DM_SERIAL
83 83 select DM_GPIO
  84 + imply CMD_SPL
84 85  
85 86 config TARGET_AM335X_SL50
86 87 bool "Support am335x_sl50"
... ... @@ -276,6 +276,15 @@
276 276 help
277 277 Poweroff/Shutdown the system
278 278  
  279 +config CMD_SPL
  280 + bool "spl export - Export boot information for Falcon boot"
  281 + depends on SPL
  282 + help
  283 + Falcon mode allows booting directly from SPL into an Operating
  284 + System such as Linux, thus skipping U-Boot proper. See
  285 + doc/README.falcon for full information about how to use this
  286 + command.
  287 +
279 288 endmenu
280 289  
281 290 menu "Environment commands"
configs/am335x_boneblack_defconfig
Diff comments   View file @ 72c3033
... ... @@ -24,6 +24,7 @@
24 24 CONFIG_FASTBOOT_BUF_ADDR=0x81000000
25 25 CONFIG_FASTBOOT_BUF_SIZE=0x07000000
26 26 # CONFIG_CMD_IMLS is not set
  27 +CONFIG_CMD_SPL=y
27 28 # CONFIG_CMD_FLASH is not set
28 29 # CONFIG_CMD_SETEXPR is not set
29 30 CONFIG_DFU_TFTP=y
configs/am335x_boneblack_vboot_defconfig
Diff comments   View file @ 72c3033
... ... @@ -27,6 +27,7 @@
27 27 CONFIG_FASTBOOT_BUF_ADDR=0x81000000
28 28 CONFIG_FASTBOOT_BUF_SIZE=0x07000000
29 29 # CONFIG_CMD_IMLS is not set
  30 +CONFIG_CMD_SPL=y
30 31 # CONFIG_CMD_FLASH is not set
31 32 # CONFIG_CMD_SETEXPR is not set
32 33 CONFIG_OF_CONTROL=y
configs/am335x_evm_defconfig
Diff comments   View file @ 72c3033
... ... @@ -20,6 +20,7 @@
20 20 CONFIG_FASTBOOT_BUF_ADDR=0x81000000
21 21 CONFIG_FASTBOOT_BUF_SIZE=0x07000000
22 22 # CONFIG_CMD_IMLS is not set
  23 +CONFIG_CMD_SPL=y
23 24 # CONFIG_CMD_FLASH is not set
24 25 CONFIG_CMD_NAND=y
25 26 # CONFIG_CMD_SETEXPR is not set
configs/am335x_evm_nor_defconfig
Diff comments   View file @ 72c3033
... ... @@ -19,6 +19,7 @@
19 19 CONFIG_FASTBOOT_BUF_ADDR=0x81000000
20 20 CONFIG_FASTBOOT_BUF_SIZE=0x07000000
21 21 # CONFIG_CMD_IMLS is not set
  22 +CONFIG_CMD_SPL=y
22 23 CONFIG_CMD_NAND=y
23 24 # CONFIG_CMD_SETEXPR is not set
24 25 CONFIG_CMD_MTDPARTS=y
configs/am335x_evm_usbspl_defconfig
Diff comments   View file @ 72c3033
... ... @@ -22,6 +22,7 @@
22 22 CONFIG_FASTBOOT_BUF_ADDR=0x81000000
23 23 CONFIG_FASTBOOT_BUF_SIZE=0x07000000
24 24 # CONFIG_CMD_IMLS is not set
  25 +CONFIG_CMD_SPL=y
25 26 # CONFIG_CMD_FLASH is not set
26 27 CONFIG_CMD_NAND=y
27 28 # CONFIG_CMD_SETEXPR is not set
configs/am335x_igep003x_defconfig
Diff comments   View file @ 72c3033
... ... @@ -29,6 +29,7 @@
29 29 CONFIG_HUSH_PARSER=y
30 30 CONFIG_CMD_BOOTZ=y
31 31 # CONFIG_CMD_IMLS is not set
  32 +CONFIG_CMD_SPL=y
32 33 CONFIG_CMD_ASKENV=y
33 34 # CONFIG_CMD_FLASH is not set
34 35 CONFIG_CMD_MMC=y
configs/am335x_sl50_defconfig
Diff comments   View file @ 72c3033
... ... @@ -29,6 +29,7 @@
29 29 CONFIG_AUTOBOOT_DELAY_STR="d"
30 30 CONFIG_AUTOBOOT_STOP_STR=" "
31 31 # CONFIG_CMD_IMLS is not set
  32 +CONFIG_CMD_SPL=y
32 33 CONFIG_CMD_ASKENV=y
33 34 CONFIG_CMD_EEPROM=y
34 35 # CONFIG_CMD_FLASH is not set
configs/am43xx_evm_defconfig
Diff comments   View file @ 72c3033
... ... @@ -15,6 +15,7 @@
15 15 CONFIG_SPL_OS_BOOT=y
16 16 CONFIG_HUSH_PARSER=y
17 17 # CONFIG_CMD_IMLS is not set
  18 +CONFIG_CMD_SPL=y
18 19 # CONFIG_CMD_FLASH is not set
19 20 CONFIG_CMD_NAND=y
20 21 # CONFIG_CMD_SETEXPR is not set
configs/am43xx_evm_ethboot_defconfig
Diff comments   View file @ 72c3033
... ... @@ -15,6 +15,7 @@
15 15 CONFIG_HUSH_PARSER=y
16 16 CONFIG_CMD_BOOTZ=y
17 17 # CONFIG_CMD_IMLS is not set
  18 +CONFIG_CMD_SPL=y
18 19 CONFIG_CMD_ASKENV=y
19 20 CONFIG_CMD_EEPROM=y
20 21 # CONFIG_CMD_FLASH is not set
configs/am43xx_evm_usbhost_boot_defconfig
Diff comments   View file @ 72c3033
... ... @@ -19,6 +19,7 @@
19 19 CONFIG_HUSH_PARSER=y
20 20 CONFIG_CMD_BOOTZ=y
21 21 # CONFIG_CMD_IMLS is not set
  22 +CONFIG_CMD_SPL=y
22 23 CONFIG_CMD_ASKENV=y
23 24 CONFIG_CMD_EEPROM=y
24 25 # CONFIG_CMD_FLASH is not set
configs/am57xx_evm_defconfig
Diff comments   View file @ 72c3033
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_FASTBOOT_FLASH=y
34 34 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
35 35 # CONFIG_CMD_IMLS is not set
  36 +CONFIG_CMD_SPL=y
36 37 # CONFIG_CMD_FLASH is not set
37 38 # CONFIG_CMD_SETEXPR is not set
38 39 # CONFIG_CMD_PMIC is not set
configs/am57xx_evm_nodt_defconfig
Diff comments   View file @ 72c3033
... ... @@ -24,6 +24,7 @@
24 24 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
25 25 CONFIG_CMD_BOOTZ=y
26 26 # CONFIG_CMD_IMLS is not set
  27 +CONFIG_CMD_SPL=y
27 28 CONFIG_CMD_ASKENV=y
28 29 # CONFIG_CMD_FLASH is not set
29 30 CONFIG_CMD_GPT=y
configs/birdland_bav335a_defconfig
Diff comments   View file @ 72c3033
... ... @@ -26,6 +26,7 @@
26 26 CONFIG_HUSH_PARSER=y
27 27 CONFIG_CMD_BOOTZ=y
28 28 # CONFIG_CMD_IMLS is not set
  29 +CONFIG_CMD_SPL=y
29 30 CONFIG_CMD_ASKENV=y
30 31 CONFIG_CMD_EEPROM=y
31 32 # CONFIG_CMD_FLASH is not set
configs/birdland_bav335b_defconfig
Diff comments   View file @ 72c3033
... ... @@ -26,6 +26,7 @@
26 26 CONFIG_HUSH_PARSER=y
27 27 CONFIG_CMD_BOOTZ=y
28 28 # CONFIG_CMD_IMLS is not set
  29 +CONFIG_CMD_SPL=y
29 30 CONFIG_CMD_ASKENV=y
30 31 CONFIG_CMD_EEPROM=y
31 32 # CONFIG_CMD_FLASH is not set
configs/cairo_defconfig
Diff comments   View file @ 72c3033
... ... @@ -14,6 +14,7 @@
14 14 CONFIG_CMD_BOOTZ=y
15 15 # CONFIG_CMD_IMI is not set
16 16 # CONFIG_CMD_IMLS is not set
  17 +CONFIG_CMD_SPL=y
17 18 CONFIG_CMD_ASKENV=y
18 19 # CONFIG_CMD_FLASH is not set
19 20 CONFIG_CMD_MMC=y
configs/devkit8000_defconfig
Diff comments   View file @ 72c3033
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_HUSH_PARSER=y
11 11 # CONFIG_CMD_IMI is not set
12 12 # CONFIG_CMD_IMLS is not set
  13 +CONFIG_CMD_SPL=y
13 14 # CONFIG_CMD_FLASH is not set
14 15 CONFIG_CMD_MMC=y
15 16 CONFIG_CMD_NAND=y
configs/dra7xx_evm_defconfig
Diff comments   View file @ 72c3033
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_FASTBOOT_FLASH=y
33 33 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
34 34 # CONFIG_CMD_IMLS is not set
  35 +CONFIG_CMD_SPL=y
35 36 # CONFIG_CMD_FLASH is not set
36 37 # CONFIG_CMD_SETEXPR is not set
37 38 CONFIG_ISO_PARTITION=y
configs/ipam390_defconfig
Diff comments   View file @ 72c3033
... ... @@ -17,6 +17,7 @@
17 17 CONFIG_HUSH_PARSER=y
18 18 CONFIG_SYS_PROMPT="U-Boot > "
19 19 # CONFIG_CMD_IMLS is not set
  20 +CONFIG_CMD_SPL=y
20 21 CONFIG_CMD_ASKENV=y
21 22 CONFIG_CRC32_VERIFY=y
22 23 # CONFIG_CMD_FLASH is not set
configs/microblaze-generic_defconfig
Diff comments   View file @ 72c3033
... ... @@ -21,6 +21,7 @@
21 21 CONFIG_SYS_OS_BASE=0x2c060000
22 22 CONFIG_HUSH_PARSER=y
23 23 CONFIG_SYS_PROMPT="U-Boot-mONStR> "
  24 +CONFIG_CMD_SPL=y
24 25 CONFIG_CMD_ASKENV=y
25 26 CONFIG_CMD_GPIO=y
26 27 CONFIG_CMD_MFSL=y
configs/mx6sabresd_defconfig
Diff comments   View file @ 72c3033
... ... @@ -22,6 +22,7 @@
22 22 CONFIG_HUSH_PARSER=y
23 23 CONFIG_CMD_BOOTZ=y
24 24 # CONFIG_CMD_IMLS is not set
  25 +CONFIG_CMD_SPL=y
25 26 # CONFIG_CMD_FLASH is not set
26 27 CONFIG_CMD_MMC=y
27 28 CONFIG_CMD_PART=y
configs/omap3_beagle_defconfig
Diff comments   View file @ 72c3033
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_SPL_MTD_SUPPORT=y
12 12 CONFIG_SPL_OS_BOOT=y
13 13 # CONFIG_CMD_IMLS is not set
  14 +CONFIG_CMD_SPL=y
14 15 CONFIG_CMD_ASKENV=y
15 16 # CONFIG_CMD_FLASH is not set
16 17 CONFIG_CMD_MMC=y
configs/omap3_logic_defconfig
Diff comments   View file @ 72c3033
... ... @@ -19,6 +19,7 @@
19 19 CONFIG_SYS_PROMPT="OMAP Logic # "
20 20 # CONFIG_CMD_IMI is not set
21 21 # CONFIG_CMD_IMLS is not set
  22 +CONFIG_CMD_SPL=y
22 23 # CONFIG_CMD_EEPROM is not set
23 24 # CONFIG_CMD_FLASH is not set
24 25 CONFIG_CMD_NAND=y
configs/omap3_overo_defconfig
Diff comments   View file @ 72c3033
... ... @@ -16,6 +16,7 @@
16 16 CONFIG_CMD_BOOTZ=y
17 17 # CONFIG_CMD_IMI is not set
18 18 # CONFIG_CMD_IMLS is not set
  19 +CONFIG_CMD_SPL=y
19 20 CONFIG_CMD_ASKENV=y
20 21 # CONFIG_CMD_FLASH is not set
21 22 CONFIG_CMD_MMC=y
configs/omap4_panda_defconfig
Diff comments   View file @ 72c3033
... ... @@ -15,6 +15,7 @@
15 15 # CONFIG_SPL_I2C_SUPPORT is not set
16 16 CONFIG_SPL_OS_BOOT=y
17 17 # CONFIG_CMD_IMLS is not set
  18 +CONFIG_CMD_SPL=y
18 19 CONFIG_CMD_ASKENV=y
19 20 # CONFIG_CMD_FLASH is not set
20 21 CONFIG_CMD_MMC=y
configs/omap5_uevm_defconfig
Diff comments   View file @ 72c3033
... ... @@ -13,6 +13,7 @@
13 13 CONFIG_HUSH_PARSER=y
14 14 CONFIG_CMD_BOOTZ=y
15 15 # CONFIG_CMD_IMLS is not set
  16 +CONFIG_CMD_SPL=y
16 17 CONFIG_CMD_ASKENV=y
17 18 # CONFIG_CMD_FLASH is not set
18 19 CONFIG_CMD_GPT=y
configs/pcm051_rev1_defconfig
Diff comments   View file @ 72c3033
... ... @@ -28,6 +28,7 @@
28 28 CONFIG_HUSH_PARSER=y
29 29 CONFIG_CMD_BOOTZ=y
30 30 # CONFIG_CMD_IMLS is not set
  31 +CONFIG_CMD_SPL=y
31 32 CONFIG_CMD_ASKENV=y
32 33 CONFIG_CMD_EEPROM=y
33 34 # CONFIG_CMD_FLASH is not set
configs/pcm051_rev3_defconfig
Diff comments   View file @ 72c3033
... ... @@ -28,6 +28,7 @@
28 28 CONFIG_HUSH_PARSER=y
29 29 CONFIG_CMD_BOOTZ=y
30 30 # CONFIG_CMD_IMLS is not set
  31 +CONFIG_CMD_SPL=y
31 32 CONFIG_CMD_ASKENV=y
32 33 CONFIG_CMD_EEPROM=y
33 34 # CONFIG_CMD_FLASH is not set
configs/pengwyn_defconfig
Diff comments   View file @ 72c3033
... ... @@ -29,6 +29,7 @@
29 29 CONFIG_HUSH_PARSER=y
30 30 CONFIG_CMD_BOOTZ=y
31 31 # CONFIG_CMD_IMLS is not set
  32 +CONFIG_CMD_SPL=y
32 33 CONFIG_CMD_ASKENV=y
33 34 CONFIG_CMD_EEPROM=y
34 35 # CONFIG_CMD_FLASH is not set
configs/twister_defconfig
Diff comments   View file @ 72c3033
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_HUSH_PARSER=y
12 12 CONFIG_SYS_PROMPT="twister => "
13 13 # CONFIG_CMD_IMLS is not set
  14 +CONFIG_CMD_SPL=y
14 15 CONFIG_CMD_EEPROM=y
15 16 # CONFIG_CMD_FLASH is not set
16 17 CONFIG_CMD_MMC=y
include/configs/gw_ventana.h
Diff comments   View file @ 72c3033
... ... @@ -12,7 +12,6 @@
12 12 #define CONFIG_SYS_NAND_U_BOOT_OFFS (14 * SZ_1M)
13 13  
14 14 /* Falcon Mode */
15   -#define CONFIG_CMD_SPL
16 15 #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
17 16 #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)
18 17  
include/configs/ipam390.h
Diff comments   View file @ 72c3033
... ... @@ -274,7 +274,6 @@
274 274 GENERATED_GBL_DATA_SIZE)
275 275  
276 276 /* add FALCON boot mode */
277   -#define CONFIG_CMD_SPL
278 277 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000
279 278 #define CONFIG_SYS_SPL_ARGS_ADDR LINUX_BOOT_PARAM_ADDR
280 279 #define CONFIG_CMD_SPL_NAND_OFS 0x00180000
include/configs/microblaze-generic.h
Diff comments   View file @ 72c3033
... ... @@ -233,7 +233,6 @@
233 233 #endif
234 234  
235 235 /* SPL part */
236   -#define CONFIG_CMD_SPL
237 236 #define CONFIG_SPL_FRAMEWORK
238 237  
239 238 #define CONFIG_SPL_LDSCRIPT "arch/microblaze/cpu/u-boot-spl.lds"
include/configs/mx6sabreauto.h
Diff comments   View file @ 72c3033
... ... @@ -34,7 +34,6 @@
34 34 #ifdef CONFIG_SPL_OS_BOOT
35 35 #define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
36 36 #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
37   -#define CONFIG_CMD_SPL
38 37 #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
39 38 #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)
40 39  
include/configs/mx6sabresd.h
Diff comments   View file @ 72c3033
... ... @@ -24,7 +24,6 @@
24 24 /* Falcon Mode */
25 25 #define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
26 26 #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
27   -#define CONFIG_CMD_SPL
28 27 #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
29 28 #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)
30 29  
include/configs/ti_armv7_common.h
Diff comments   View file @ 72c3033
... ... @@ -201,10 +201,6 @@
201 201 #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1700 /* address 0x2E0000 */
202 202 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x1500 /* address 0x2A0000 */
203 203 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x200 /* 256KiB */
204   -
205   -
206   -/* spl export command */
207   -#define CONFIG_CMD_SPL
208 204 #endif
209 205  
210 206 /* General parts of the framework, required. */
include/configs/trats.h
Diff comments   View file @ 72c3033
... ... @@ -166,7 +166,6 @@
166 166 "fdtaddr=40800000\0" \
167 167  
168 168 /* Falcon mode definitions */
169   -#define CONFIG_CMD_SPL
170 169 #define CONFIG_SYS_SPL_ARGS_ADDR CONFIG_SYS_SDRAM_BASE + 0x100
171 170  
172 171 /* GPT */
include/configs/twister.h
Diff comments   View file @ 72c3033
... ... @@ -36,7 +36,6 @@
36 36 "bootcmd=run nandboot\0"
37 37  
38 38 /* SPL OS boot options */
39   -#define CONFIG_CMD_SPL
40 39 #define CONFIG_CMD_SPL_WRITE_SIZE 0x400 /* 1024 byte */
41 40 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000
42 41 #define CONFIG_CMD_SPL_NAND_OFS (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\
include/configs/zynq-common.h
Diff comments   View file @ 72c3033
... ... @@ -318,7 +318,6 @@
318 318 /* Commands */
319 319  
320 320 /* SPL part */
321   -#define CONFIG_CMD_SPL
322 321 #define CONFIG_SPL_FRAMEWORK
323 322  
324 323 #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-zynq/u-boot-spl.lds"
scripts/config_whitelist.txt
Diff comments   View file @ 72c3033
... ... @@ -293,7 +293,6 @@
293 293 CONFIG_CMDLINE_EDITING
294 294 CONFIG_CMDLINE_PS_SUPPORT
295 295 CONFIG_CMDLINE_TAG
296   -CONFIG_CMD_SPL
297 296 CONFIG_CMD_SPL_NAND_OFS
298 297 CONFIG_CMD_SPL_WRITE_SIZE
299 298 CONFIG_CMD_STRINGS