Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 002c3234e63303062fdc7511ef69be1fdda3093c

Authored by Alex Kiernan
Committed by Tom Rini
1 parent 83a1f933d1
Exists in smarc_8mq_lf_v2020.04 and in 14 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_8m-imx_v2019.04_4.19.35_1.1.0, 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

Migrate IMAGE_FORMAT_LEGACY to Kconfig 

This converts IMAGE_FORMAT_LEGACY to Kconfig

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 32 changed files with 34 additions and 35 deletions Side-by-side Diff

... ... @@ -361,6 +361,16 @@
361 361  
362 362 endif # FIT
363 363  
  364 +config IMAGE_FORMAT_LEGACY
  365 + bool "Enable support for the legacy image format"
  366 + default y if !FIT_SIGNATURE
  367 + help
  368 + This option enables the legacy image format. It is enabled by
  369 + default for backward compatibility, unless FIT_SIGNATURE is
  370 + set where it is disabled so that unsigned images cannot be
  371 + loaded. If a board needs the legacy image format support in this
  372 + case, enable it here.
  373 +
364 374 config OF_BOARD_SETUP
365 375 bool "Set up board-specific details in device tree before boot"
366 376 depends on OF_LIBFDT
... ... @@ -2413,19 +2413,6 @@
2413 2413 -150 common/cmd_nand.c Incorrect FIT image format
2414 2414 151 common/cmd_nand.c FIT image format OK
2415 2415  
2416   -- legacy image format:
2417   - CONFIG_IMAGE_FORMAT_LEGACY
2418   - enables the legacy image format support in U-Boot.
2419   -
2420   - Default:
2421   - enabled if CONFIG_FIT_SIGNATURE is not defined.
2422   -
2423   - CONFIG_DISABLE_IMAGE_LEGACY
2424   - disable the legacy image format
2425   -
2426   - This define is introduced, as the legacy image format is
2427   - enabled per default for backward compatibility.
2428   -
2429 2416 - Standalone program support:
2430 2417 CONFIG_STANDALONE_LOAD_ADDR
2431 2418  
configs/ids8313_defconfig
Diff comments   View file @ 002c323
... ... @@ -4,6 +4,7 @@
4 4 CONFIG_TARGET_IDS8313=y
5 5 CONFIG_FIT=y
6 6 CONFIG_FIT_SIGNATURE=y
  7 +CONFIG_IMAGE_FORMAT_LEGACY=y
7 8 CONFIG_OF_BOARD_SETUP=y
8 9 CONFIG_OF_STDOUT_VIA_ALIAS=y
9 10 CONFIG_BOOTDELAY=1
configs/imx6dl_icore_nand_defconfig
Diff comments   View file @ 002c323
... ... @@ -13,6 +13,7 @@
13 13 CONFIG_FIT=y
14 14 CONFIG_FIT_SIGNATURE=y
15 15 CONFIG_FIT_VERBOSE=y
  16 +CONFIG_IMAGE_FORMAT_LEGACY=y
16 17 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
17 18 CONFIG_BOOTDELAY=3
18 19 CONFIG_SPL_DMA_SUPPORT=y
configs/imx6q_icore_nand_defconfig
Diff comments   View file @ 002c323
... ... @@ -13,6 +13,7 @@
13 13 CONFIG_FIT=y
14 14 CONFIG_FIT_SIGNATURE=y
15 15 CONFIG_FIT_VERBOSE=y
  16 +CONFIG_IMAGE_FORMAT_LEGACY=y
16 17 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
17 18 CONFIG_BOOTDELAY=3
18 19 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6qdl_icore_mipi_defconfig
Diff comments   View file @ 002c323
... ... @@ -17,6 +17,7 @@
17 17 CONFIG_FIT_SIGNATURE=y
18 18 CONFIG_FIT_VERBOSE=y
19 19 CONFIG_SPL_LOAD_FIT=y
  20 +CONFIG_IMAGE_FORMAT_LEGACY=y
20 21 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
21 22 CONFIG_BOOTDELAY=3
22 23 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6qdl_icore_mmc_defconfig
Diff comments   View file @ 002c323
... ... @@ -17,6 +17,7 @@
17 17 CONFIG_FIT_SIGNATURE=y
18 18 CONFIG_FIT_VERBOSE=y
19 19 CONFIG_SPL_LOAD_FIT=y
  20 +CONFIG_IMAGE_FORMAT_LEGACY=y
20 21 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
21 22 CONFIG_BOOTDELAY=3
22 23 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6qdl_icore_nand_defconfig
Diff comments   View file @ 002c323
... ... @@ -13,6 +13,7 @@
13 13 CONFIG_FIT=y
14 14 CONFIG_FIT_SIGNATURE=y
15 15 CONFIG_FIT_VERBOSE=y
  16 +CONFIG_IMAGE_FORMAT_LEGACY=y
16 17 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
17 18 CONFIG_BOOTDELAY=3
18 19 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6qdl_icore_rqs_defconfig
Diff comments   View file @ 002c323
... ... @@ -16,6 +16,7 @@
16 16 CONFIG_FIT_SIGNATURE=y
17 17 CONFIG_FIT_VERBOSE=y
18 18 CONFIG_SPL_LOAD_FIT=y
  19 +CONFIG_IMAGE_FORMAT_LEGACY=y
19 20 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
20 21 CONFIG_BOOTDELAY=3
21 22 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6ul_geam_mmc_defconfig
Diff comments   View file @ 002c323
... ... @@ -15,6 +15,7 @@
15 15 CONFIG_FIT=y
16 16 CONFIG_FIT_SIGNATURE=y
17 17 CONFIG_FIT_VERBOSE=y
  18 +CONFIG_IMAGE_FORMAT_LEGACY=y
18 19 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
19 20 CONFIG_BOOTDELAY=3
20 21 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6ul_geam_nand_defconfig
Diff comments   View file @ 002c323
... ... @@ -13,6 +13,7 @@
13 13 CONFIG_FIT=y
14 14 CONFIG_FIT_SIGNATURE=y
15 15 CONFIG_FIT_VERBOSE=y
  16 +CONFIG_IMAGE_FORMAT_LEGACY=y
16 17 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
17 18 CONFIG_BOOTDELAY=3
18 19 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6ul_isiot_emmc_defconfig
Diff comments   View file @ 002c323
... ... @@ -15,6 +15,7 @@
15 15 CONFIG_FIT=y
16 16 CONFIG_FIT_SIGNATURE=y
17 17 CONFIG_FIT_VERBOSE=y
  18 +CONFIG_IMAGE_FORMAT_LEGACY=y
18 19 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
19 20 CONFIG_BOOTDELAY=3
20 21 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6ul_isiot_nand_defconfig
Diff comments   View file @ 002c323
... ... @@ -13,6 +13,7 @@
13 13 CONFIG_FIT=y
14 14 CONFIG_FIT_SIGNATURE=y
15 15 CONFIG_FIT_VERBOSE=y
  16 +CONFIG_IMAGE_FORMAT_LEGACY=y
16 17 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
17 18 CONFIG_BOOTDELAY=3
18 19 CONFIG_SUPPORT_RAW_INITRD=y
configs/syzygy_hub_defconfig
Diff comments   View file @ 002c323
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_FIT=y
12 12 CONFIG_FIT_SIGNATURE=y
13 13 CONFIG_FIT_VERBOSE=y
  14 +CONFIG_IMAGE_FORMAT_LEGACY=y
14 15 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
15 16 # CONFIG_DISPLAY_CPUINFO is not set
16 17 CONFIG_SPL_STACK_R=y
configs/zynq_cc108_defconfig
Diff comments   View file @ 002c323
... ... @@ -9,6 +9,7 @@
9 9 CONFIG_FIT=y
10 10 CONFIG_FIT_SIGNATURE=y
11 11 CONFIG_FIT_VERBOSE=y
  12 +CONFIG_IMAGE_FORMAT_LEGACY=y
12 13 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
13 14 # CONFIG_DISPLAY_CPUINFO is not set
14 15 CONFIG_SPL_STACK_R=y
configs/zynq_microzed_defconfig
Diff comments   View file @ 002c323
... ... @@ -8,6 +8,7 @@
8 8 CONFIG_FIT=y
9 9 CONFIG_FIT_SIGNATURE=y
10 10 CONFIG_FIT_VERBOSE=y
  11 +CONFIG_IMAGE_FORMAT_LEGACY=y
11 12 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
12 13 # CONFIG_DISPLAY_CPUINFO is not set
13 14 CONFIG_SPL_STACK_R=y
configs/zynq_z_turn_defconfig
Diff comments   View file @ 002c323
... ... @@ -9,6 +9,7 @@
9 9 CONFIG_FIT=y
10 10 CONFIG_FIT_SIGNATURE=y
11 11 CONFIG_FIT_VERBOSE=y
  12 +CONFIG_IMAGE_FORMAT_LEGACY=y
12 13 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
13 14 # CONFIG_DISPLAY_CPUINFO is not set
14 15 CONFIG_SPL_STACK_R=y
configs/zynq_zc702_defconfig
Diff comments   View file @ 002c323
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_FIT=y
12 12 CONFIG_FIT_SIGNATURE=y
13 13 CONFIG_FIT_VERBOSE=y
  14 +CONFIG_IMAGE_FORMAT_LEGACY=y
14 15 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
15 16 # CONFIG_DISPLAY_CPUINFO is not set
16 17 CONFIG_SPL_STACK_R=y
configs/zynq_zc706_defconfig
Diff comments   View file @ 002c323
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_FIT=y
12 12 CONFIG_FIT_SIGNATURE=y
13 13 CONFIG_FIT_VERBOSE=y
  14 +CONFIG_IMAGE_FORMAT_LEGACY=y
14 15 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
15 16 # CONFIG_DISPLAY_CPUINFO is not set
16 17 CONFIG_SPL_STACK_R=y
configs/zynq_zc770_xm010_defconfig
Diff comments   View file @ 002c323
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_FIT=y
11 11 CONFIG_FIT_SIGNATURE=y
12 12 CONFIG_FIT_VERBOSE=y
  13 +CONFIG_IMAGE_FORMAT_LEGACY=y
13 14 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
14 15 # CONFIG_DISPLAY_CPUINFO is not set
15 16 CONFIG_SPL_STACK_R=y
configs/zynq_zc770_xm011_defconfig
Diff comments   View file @ 002c323
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_FIT=y
12 12 CONFIG_FIT_SIGNATURE=y
13 13 CONFIG_FIT_VERBOSE=y
  14 +CONFIG_IMAGE_FORMAT_LEGACY=y
14 15 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
15 16 # CONFIG_DISPLAY_CPUINFO is not set
16 17 CONFIG_SPL_STACK_R=y
configs/zynq_zc770_xm011_x16_defconfig
Diff comments   View file @ 002c323
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_FIT=y
12 12 CONFIG_FIT_SIGNATURE=y
13 13 CONFIG_FIT_VERBOSE=y
  14 +CONFIG_IMAGE_FORMAT_LEGACY=y
14 15 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
15 16 # CONFIG_DISPLAY_CPUINFO is not set
16 17 CONFIG_SPL_STACK_R=y
configs/zynq_zc770_xm012_defconfig
Diff comments   View file @ 002c323
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_FIT=y
11 11 CONFIG_FIT_SIGNATURE=y
12 12 CONFIG_FIT_VERBOSE=y
  13 +CONFIG_IMAGE_FORMAT_LEGACY=y
13 14 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
14 15 # CONFIG_DISPLAY_CPUINFO is not set
15 16 CONFIG_SPL_STACK_R=y
configs/zynq_zc770_xm013_defconfig
Diff comments   View file @ 002c323
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_FIT=y
11 11 CONFIG_FIT_SIGNATURE=y
12 12 CONFIG_FIT_VERBOSE=y
  13 +CONFIG_IMAGE_FORMAT_LEGACY=y
13 14 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
14 15 # CONFIG_DISPLAY_CPUINFO is not set
15 16 CONFIG_SPL_STACK_R=y
configs/zynq_zed_defconfig
Diff comments   View file @ 002c323
... ... @@ -9,6 +9,7 @@
9 9 CONFIG_FIT=y
10 10 CONFIG_FIT_SIGNATURE=y
11 11 CONFIG_FIT_VERBOSE=y
  12 +CONFIG_IMAGE_FORMAT_LEGACY=y
12 13 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
13 14 # CONFIG_DISPLAY_CPUINFO is not set
14 15 CONFIG_SPL_STACK_R=y
configs/zynq_zybo_defconfig
Diff comments   View file @ 002c323
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_FIT=y
11 11 CONFIG_FIT_SIGNATURE=y
12 12 CONFIG_FIT_VERBOSE=y
  13 +CONFIG_IMAGE_FORMAT_LEGACY=y
13 14 CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd"
14 15 # CONFIG_DISPLAY_CPUINFO is not set
15 16 CONFIG_SPL_STACK_R=y
include/config_fallbacks.h
Diff comments   View file @ 002c323
... ... @@ -46,14 +46,6 @@
46 46 #define CONFIG_SYS_MAXARGS 16
47 47 #endif
48 48  
49   -#ifndef CONFIG_FIT_SIGNATURE
50   -#define CONFIG_IMAGE_FORMAT_LEGACY
51   -#endif
52   -
53   -#ifdef CONFIG_DISABLE_IMAGE_LEGACY
54   -#undef CONFIG_IMAGE_FORMAT_LEGACY
55   -#endif
56   -
57 49 #ifdef CONFIG_DM_I2C
58 50 # ifdef CONFIG_SYS_I2C
59 51 # error "Cannot define CONFIG_SYS_I2C when CONFIG_DM_I2C is used"
include/configs/ids8313.h
Diff comments   View file @ 002c323
... ... @@ -506,7 +506,5 @@
506 506 /* UBI Support */
507 507 #define CONFIG_MTD_PARTITIONS
508 508  
509   -#define CONFIG_IMAGE_FORMAT_LEGACY
510   -
511 509 #endif /* __CONFIG_H */
include/configs/imx6-engicam.h
Diff comments   View file @ 002c323
... ... @@ -130,11 +130,6 @@
130 130 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \
131 131 CONFIG_SYS_INIT_SP_OFFSET)
132 132  
133   -/* FIT */
134   -#ifdef CONFIG_FIT
135   -# define CONFIG_IMAGE_FORMAT_LEGACY
136   -#endif
137   -
138 133 /* UART */
139 134 #ifdef CONFIG_MXC_UART
140 135 # ifdef CONFIG_MX6UL
include/configs/wb50n.h
Diff comments   View file @ 002c323
... ... @@ -23,8 +23,6 @@
23 23 #define CONFIG_SKIP_LOWLEVEL_INIT
24 24 #endif
25 25  
26   -#define CONFIG_IMAGE_FORMAT_LEGACY
27   -
28 26 /* general purpose I/O */
29 27 #define CONFIG_AT91_GPIO
30 28  
include/configs/zynq-common.h
Diff comments   View file @ 002c323
... ... @@ -263,9 +263,6 @@
263 263 GENERATED_GBL_DATA_SIZE)
264 264  
265 265  
266   -/* FIT support */
267   -#define CONFIG_IMAGE_FORMAT_LEGACY /* enable also legacy image format */
268   -
269 266 /* Extend size of kernel image for uncompression */
270 267 #define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024)
271 268  
scripts/config_whitelist.txt
Diff comments   View file @ 002c323
... ... @@ -373,7 +373,6 @@
373 373 CONFIG_DIMM_SLOTS_PER_CTLR
374 374 CONFIG_DIRECT_NOR_BOOT
375 375 CONFIG_DISABLE_CONSOLE
376   -CONFIG_DISABLE_IMAGE_LEGACY
377 376 CONFIG_DISCONTIGMEM
378 377 CONFIG_DISCOVER_PHY
379 378 CONFIG_DISPLAY_AER_xxxx
... ... @@ -973,7 +972,6 @@
973 972 CONFIG_IDT8T49N222A
974 973 CONFIG_ID_EEPROM
975 974 CONFIG_IMA
976   -CONFIG_IMAGE_FORMAT_LEGACY
977 975 CONFIG_IMX
978 976 CONFIG_IMX6_PWM_PER_CLK
979 977 CONFIG_IMX_HDMI