configs: Rename CONFIG_IMAGE_FORMAT_LEGACY to CONFIG_LEGACY_IMAGE_FORMAT
Subsystems (6)
PATCH v2 1/2 configs: Rename CONFIG_IMAGE_FORMAT_LEGACY to CONFIG_LEGACY_IMAGE_FORMAT
The name CONFIG_LEGACY_IMAGE_FORMAT reads slightly better along with allowing us to avoid a rather nasty Kbuild/Kconfig issue down the line with CONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY). In a few places outside of cmd/ switch to using CONFIG_IS_ENABLED() to test what is set.
--- Kconfig | 4 ++-- arch/arm/mach-imx/hab.c | 2 +- cmd/bootm.c | 6 +++--- cmd/disk.c | 4 ++-- cmd/fdc.c | 4 ++-- cmd/fpga.c | 2 +- cmd/nand.c | 4 ++-- cmd/source.c | 4 ++-- cmd/ximg.c | 6 +++--- common/bootm.c | 8 ++++---- common/image-fdt.c | 6 +++--- common/image.c | 10 +++++----- configs/bcm963158_ram_defconfig | 2 +- configs/bcm968580xref_ram_defconfig | 2 +- configs/gardena-smart-gateway-mt7688-ram_defconfig | 2 +- configs/gardena-smart-gateway-mt7688_defconfig | 2 +- configs/ids8313_defconfig | 2 +- configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/imx6qdl_icore_mipi_defconfig | 2 +- configs/imx6qdl_icore_mmc_defconfig | 2 +- configs/imx6qdl_icore_nand_defconfig | 2 +- configs/imx6qdl_icore_rqs_defconfig | 2 +- configs/imx6ul_geam_mmc_defconfig | 2 +- configs/imx6ul_geam_nand_defconfig | 2 +- configs/imx6ul_isiot_emmc_defconfig | 2 +- configs/imx6ul_isiot_nand_defconfig | 2 +- configs/linkit-smart-7688-ram_defconfig | 2 +- configs/linkit-smart-7688_defconfig | 2 +- configs/syzygy_hub_defconfig | 2 +- configs/xilinx_versal_mini_defconfig | 2 +- configs/xilinx_zynqmp_mini_defconfig | 2 +- configs/xilinx_zynqmp_mini_qspi_defconfig | 2 +- configs/zynq_cc108_defconfig | 2 +- configs/zynq_dlc20_rev1_0_defconfig | 2 +- configs/zynq_microzed_defconfig | 2 +- configs/zynq_z_turn_defconfig | 2 +- configs/zynq_zc702_defconfig | 2 +- configs/zynq_zc706_defconfig | 2 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zc770_xm011_defconfig | 2 +- configs/zynq_zc770_xm011_x16_defconfig | 2 +- configs/zynq_zc770_xm012_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- configs/zynq_zybo_defconfig | 2 +- configs/zynq_zybo_z7_defconfig | 2 +- doc/uImage.FIT/signature.txt | 2 +- include/image.h | 2 +- 49 files changed, 67 insertions(+), 67 deletions(-)
Kconfig +2 -2
@@ -317,7 +317,7 @@ config FIT_SIGNATURE check the legacy image format is disabled by default, so that unsigned images cannot be loaded. If a board needs the legacy image format support in this case, enable it using - CONFIG_IMAGE_FORMAT_LEGACY. + CONFIG_LEGACY_IMAGE_FORMAT. config FIT_SIGNATURE_MAX_SIZE hex "Max size of signed FIT structures"
@@ -446,7 +446,7 @@ endif # SPL endif # FIT -config IMAGE_FORMAT_LEGACY +config LEGACY_IMAGE_FORMAT bool "Enable support for the legacy image format" default y if !FIT_SIGNATURE help
arch/arm/mach-imx/hab.c +1 -1
@@ -310,7 +310,7 @@ static ulong get_image_ivt_offset(ulong img_addr) buf =map_sysmem (img_addr,0 );switch (genimg_get_format (buf)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY :return (image_get_image_size ((image_header_t *)img_addr) +0x1000 -1 ) & ~(0x1000 -1 );
cmd/bootm.c +3 -3
@@ -249,7 +249,7 @@ static int image_info(ulong addr)printf ("\n## Checking Image at %08lx ...\n" , addr);switch (genimg_get_format (hdr)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY :puts (" Legacy image found\n" );if (!image_check_magic (hdr)) {
@@ -337,7 +337,7 @@ static int do_imls_nor(void) goto next_sector;switch (genimg_get_format (hdr)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY :if (!image_check_hcrc (hdr)) goto next_sector;
@@ -485,7 +485,7 @@ static int do_imls_nand(void) }switch (genimg_get_format (buffer)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY : header = (const image_header_t *)buffer;
cmd/disk.c +2 -2
@@ -15,7 +15,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,ulong addr =CONFIG_SYS_LOAD_ADDR ;ulong cnt;disk_partition_t info; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )image_header_t *hdr;#endif struct blk_desc *dev_desc;
@@ -62,7 +62,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,bootstage_mark (BOOTSTAGE_ID_IDE_PART_READ );switch (genimg_get_format ((void *) addr)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY : hdr = (image_header_t *) addr;
cmd/fdc.c +2 -2
@@ -634,7 +634,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])FD_GEO_STRUCT *pFG = (FD_GEO_STRUCT *)floppy_type;FDC_COMMAND_STRUCT *pCMD = &cmd;unsigned long addr,imsize; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )image_header_t *hdr;/* used for fdc boot */ #endif unsigned char boot_drive;
@@ -690,7 +690,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }switch (genimg_get_format ((void *)addr)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY : hdr = (image_header_t *)addr;image_print_contents (hdr);
cmd/fpga.c +1 -1
@@ -280,7 +280,7 @@ static int do_fpga_loadmk(cmd_tbl_t *cmdtp, int flag, int argc, }switch (genimg_get_format (fpga_data)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY : {image_header_t *hdr = (image_header_t *)fpga_data;
cmd/nand.c +2 -2
@@ -846,7 +846,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, struct mtd_info *mtd,int r;char *s;size_t cnt; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )image_header_t *hdr;#endif #if defined(CONFIG_FIT )
@@ -874,7 +874,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, struct mtd_info *mtd,bootstage_mark (BOOTSTAGE_ID_NAND_HDR_READ );switch (genimg_get_format ((void *)addr)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY : hdr = (image_header_t *)addr;
cmd/source.c +2 -2
@@ -44,7 +44,7 @@ int source (ulong addr, const char *fit_uname) { ulong len; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )const image_header_t *hdr;#endif u32 *data;
@@ -61,7 +61,7 @@ source (ulong addr, const char *fit_uname) buf =map_sysmem (addr,0 );switch (genimg_get_format (buf)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY : hdr = buf;
cmd/ximg.c +3 -3
@@ -35,7 +35,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])ulong data, len;int verify;int part =0 ; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )ulong count;image_header_t *hdr =NULL ;#endif
@@ -67,7 +67,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) }switch (genimg_get_format ((void *)addr)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY : printf("## Copying part %d from legacy image "
@@ -217,7 +217,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) }break ;#endif -#if defined(CONFIG_BZIP2 ) && defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_BZIP2 ) && defined(CONFIG_LEGACY_IMAGE_FORMAT )case IH_COMP_BZIP2 : {int i;
common/bootm.c +4 -4
@@ -98,7 +98,7 @@ static int bootm_find_os(cmd_tbl_t *cmdtp, int flag, int argc,/* get image parameters */ switch (genimg_get_format (os_hdr)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY : images.os.type =image_get_type (os_hdr); images.os.comp =image_get_comp (os_hdr);
@@ -738,7 +738,7 @@ err:return ret; } -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )/** * image_get_kernel - verify legacy format kernel image * @img_addr: in RAM address of the legacy format image to be verified
@@ -807,7 +807,7 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], bootm_headers_t *images, ulong *os_data, ulong *os_len) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY) +#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT) image_header_t *hdr;#endif ulong img_addr;
@@ -828,7 +828,7 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, *os_data = *os_len =0 ; buf =map_sysmem (img_addr,0 );switch (genimg_get_format (buf)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY :printf ("## Booting kernel from Legacy Image at %08lx ...\n" , img_addr);
common/image-fdt.c +3 -3
@@ -33,7 +33,7 @@ static void fdt_error(const char *msg)puts (" - must RESET the board to recover.\n" ); } -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )static const image_header_t *image_get_fdt (ulong fdt_addr) {const image_header_t *fdt_hdr =map_sysmem (fdt_addr,0 );
@@ -263,7 +263,7 @@ error:int boot_get_fdt (int flag,int argc,char *const argv[],uint8_t arch,bootm_headers_t *images,char **of_flat_tree,ulong *of_size) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )const image_header_t *fdt_hdr;ulong load, load_end;ulong image_start, image_data, image_end;
@@ -344,7 +344,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,*/ buf =map_sysmem (fdt_addr,0 );switch (genimg_get_format (buf)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY :/* verify fdt_addr points to a valid image header */ printf("## Flattened Device Tree from Legacy Image at %08lx\n",
common/image.c +5 -5
@@ -38,7 +38,7 @@ extern int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);DECLARE_GLOBAL_DATA_PTR ; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )static const image_header_t *image_get_ramdisk (ulong rd_addr,uint8_t arch,int verify);#endif
@@ -377,7 +377,7 @@ void image_print_contents(const void *ptr)#ifndef USE_HOSTCC -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )/** * image_get_ramdisk - get and verify ramdisk image * @rd_addr: ramdisk image start address
@@ -867,7 +867,7 @@ ulong genimg_get_kernel_addr(char * const img_addr)*/ int genimg_get_format (const void *img_addr) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )const image_header_t *hdr; hdr = (const image_header_t *)img_addr;
@@ -933,7 +933,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, {ulong rd_addr, rd_load;ulong rd_data, rd_len; -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )const image_header_t *rd_hdr;#endif void *buf;
@@ -1025,7 +1025,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,*/ buf =map_sysmem (rd_addr,0 );switch (genimg_get_format (buf)) { -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if CONFIG_IS_ENABLED (LEGACY_IMAGE_FORMAT )case IMAGE_FORMAT_LEGACY :printf ("## Loading init Ramdisk from Legacy " "Image at %08lx ...\n" , rd_addr);
configs/bcm963158_ram_defconfig +1 -1
@@ -12,7 +12,7 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y
configs/bcm968580xref_ram_defconfig +1 -1
@@ -10,7 +10,7 @@ CONFIG_TPL_SYS_MALLOC_F_LEN=0x400 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y
configs/gardena-smart-gateway-mt7688-ram_defconfig +1 -1
@@ -8,7 +8,7 @@ CONFIG_ENV_VARS_UBOOT_CONFIG=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="cp.b 83000000 84000000 10000 && dhcp uEnv.txt && env import -t ${fileaddr} ${filesize} && run do_u_boot_init; reset"
configs/gardena-smart-gateway-mt7688_defconfig +1 -1
@@ -11,7 +11,7 @@ CONFIG_ENV_VARS_UBOOT_CONFIG=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="cp.b 83000000 84000000 10000 && dhcp uEnv.txt && env import -t ${fileaddr} ${filesize} && run do_u_boot_init; reset"
configs/ids8313_defconfig +1 -1
@@ -78,7 +78,7 @@ CONFIG_ACR_PIPE_DEP_4=y CONFIG_ACR_RPTCNT_4=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=1
configs/imx6dl_icore_nand_defconfig +1 -1
@@ -13,7 +13,7 @@ CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_BOUNCE_BUFFER=y
configs/imx6q_icore_nand_defconfig +1 -1
@@ -13,7 +13,7 @@ CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6qdl_icore_mipi_defconfig +1 -1
@@ -18,7 +18,7 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6qdl_icore_mmc_defconfig +1 -1
@@ -18,7 +18,7 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6qdl_icore_nand_defconfig +1 -1
@@ -12,7 +12,7 @@ CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6qdl_icore_rqs_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6ul_geam_mmc_defconfig +1 -1
@@ -14,7 +14,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6ul_geam_nand_defconfig +1 -1
@@ -12,7 +12,7 @@ CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6ul_isiot_emmc_defconfig +1 -1
@@ -14,7 +14,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y
configs/imx6ul_isiot_nand_defconfig +1 -1
@@ -12,7 +12,7 @@ CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y
configs/linkit-smart-7688-ram_defconfig +1 -1
@@ -8,7 +8,7 @@ CONFIG_MIPS_BOOT_FDT=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_BOARD_EARLY_INIT_F=y
configs/linkit-smart-7688_defconfig +1 -1
@@ -11,7 +11,7 @@ CONFIG_MIPS_BOOT_FDT=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_BOARD_EARLY_INIT_F=y
configs/syzygy_hub_defconfig +1 -1
@@ -13,7 +13,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="Zynq> "
configs/xilinx_versal_mini_defconfig +1 -1
@@ -8,7 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MALLOC_LEN=0x2000 CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_COUNTER_FREQUENCY=2720000 -# CONFIG_IMAGE_FORMAT_LEGACY is not set +# CONFIG_LEGACY_IMAGE_FORMAT is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y
configs/xilinx_zynqmp_mini_defconfig +1 -1
@@ -7,7 +7,7 @@ CONFIG_ENV_SIZE=0x80 CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_ZYNQMP_PSU_INIT_ENABLED=y # CONFIG_CMD_ZYNQMP is not set -# CONFIG_IMAGE_FORMAT_LEGACY is not set +# CONFIG_LEGACY_IMAGE_FORMAT is not set # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/xilinx_zynqmp_mini_qspi_defconfig +1 -1
@@ -11,7 +11,7 @@ CONFIG_ZYNQMP_NO_DDR=y # CONFIG_PSCI_RESET is not set # CONFIG_CMD_ZYNQMP is not set # CONFIG_EXPERT is not set -# CONFIG_IMAGE_FORMAT_LEGACY is not set +# CONFIG_LEGACY_IMAGE_FORMAT is not set # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_TEXT_BASE=0xfffc0000
configs/zynq_cc108_defconfig +1 -1
@@ -11,7 +11,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_PROMPT="Zynq> "
configs/zynq_dlc20_rev1_0_defconfig +1 -1
@@ -12,7 +12,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y
configs/zynq_microzed_defconfig +1 -1
@@ -8,7 +8,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y
configs/zynq_z_turn_defconfig +1 -1
@@ -11,7 +11,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y
configs/zynq_zc702_defconfig +1 -1
@@ -12,7 +12,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y
configs/zynq_zc706_defconfig +1 -1
@@ -14,7 +14,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_FIT_PRINT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_FPGA_SUPPORT=y CONFIG_SPL_OS_BOOT=y
configs/zynq_zc770_xm010_defconfig +1 -1
@@ -12,7 +12,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y
configs/zynq_zc770_xm011_defconfig +1 -1
@@ -13,7 +13,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="Zynq> "
configs/zynq_zc770_xm011_x16_defconfig +1 -1
@@ -13,7 +13,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="Zynq> "
configs/zynq_zc770_xm012_defconfig +1 -1
@@ -10,7 +10,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="Zynq> "
configs/zynq_zc770_xm013_defconfig +1 -1
@@ -10,7 +10,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y
configs/zynq_zed_defconfig +1 -1
@@ -11,7 +11,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y
configs/zynq_zybo_defconfig +1 -1
@@ -11,7 +11,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y
configs/zynq_zybo_z7_defconfig +1 -1
@@ -11,7 +11,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_IMAGE_FORMAT_LEGACY=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y
doc/uImage.FIT/signature.txt +1 -1
@@ -335,7 +335,7 @@ CONFIG_RSA - enable RSA algorithm for signing WARNING: When relying on signed FIT images with required signature check the legacy image format is default disabled by not defining -CONFIG_IMAGE_FORMAT_LEGACY +CONFIG_LEGACY_IMAGE_FORMAT Testing -------
include/image.h +1 -1
@@ -561,7 +561,7 @@ int boot_get_setup(bootm_headers_t *images, uint8_t arch, ulong *setup_start,#ifndef USE_HOSTCC /* Image format types, returned by _get_format() routine */ #define IMAGE_FORMAT_INVALID 0x00 -#if defined(CONFIG_IMAGE_FORMAT_LEGACY ) +#if defined(CONFIG_LEGACY_IMAGE_FORMAT )#define IMAGE_FORMAT_LEGACY 0x01/* legacy image_header based format */ #endif #define IMAGE_FORMAT_FIT 0x02/* new, libfdt based format */
Signature · 1 line
2.7.4
PATCH v2 1/2 configs: Rename CONFIG_IMAGE_FORMAT_LEGACY to CONFIG_LEGACY_IMAGE_FORMAT
Quoted 6 lines · Tom Rini
The name
CONFIG_LEGACY_IMAGE_FORMATreads slightly better along with allowing us to avoid a rather nasty Kbuild/Kconfig issue down the line withCONFIG_IS_ENABLED(IMAGE_FORMAT_LEGACY). In a few places outside of cmd/ switch to usingCONFIG_IS_ENABLED()to test what is set.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190711/c77e5870/attachment.sig>
PATCH v2 2/2 SPL: Default to disabling legacy image support when using FIT
In reply to Tom RiniWhen we have a FIT image being used by SPL by default that means the most common case is that we'll never run into a legacy image. Disable legacy image support by default in that case to reclaim space.
--- common/spl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
common/spl/Kconfig +1 -1
@@ -101,7 +101,7 @@ config SPL_RAW_IMAGE_SUPPORT config SPL_LEGACY_IMAGE_SUPPORT bool "Support SPL loading and booting of Legacy images" - default y if !TI_SECURE_DEVICE + default y if !TI_SECURE_DEVICE && !SPL_LOAD_FIT help SPL will support loading and booting Legacy images when this option is y. If this is not set, SPL will move on to other available
Signature · 1 line
2.7.4
PATCH v2 2/2 SPL: Default to disabling legacy image support when using FIT
Quoted 14 lines · Tom Rini
When we have a FIT image being used by SPL by default that means the most common case is that we'll never run into a legacy image. Disable legacy image support by default in that case to reclaim space.
Signed-off-by Tom Rini <[email protected]>--- common/spl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)common/spl/Kconfig +0
-0
common/spl/Kconfig config SPL_RAW_IMAGE_SUPPORT · line 107
Quoted 8 lines
common/spl/Kconfig +1
-1@@ -101,7 +101,7 @@ config SPL_RAW_IMAGE_SUPPORT config SPL_LEGACY_IMAGE_SUPPORT bool "Support SPL loading and booting of Legacy images" - default y if !TI_SECURE_DEVICE + default y if !TI_SECURE_DEVICE && !SPL_LOAD_FIT help SPL will support loading and booting Legacy images when this option is y. If this is not set, SPL will move on to other available
reviewed-by and tested-by : Jean-Jacques Hiblot <[email protected]>
Building for arm, the reduction in size is around 50 bytes
JJ
PATCH v2 2/2 SPL: Default to disabling legacy image support when using FIT
Quoted 11 lines · Jean-Jacques Hiblot
Quoted 9 lines · Tom Rini
When we have a FIT image being used by SPL by default that means the most common case is that we'll never run into a legacy image. Disable legacy image support by default in that case to reclaim space.
Signed-off-by Tom Rini <[email protected]>--- common/spl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines
common/spl/Kconfig config SPL_RAW_IMAGE_SUPPORT · line 106
Quoted 12 lines
common/spl/Kconfig +1
-1@@ -101,7 +101,7 @@ config SPL_RAW_IMAGE_SUPPORT config SPL_LEGACY_IMAGE_SUPPORT bool "Support SPL loading and booting of Legacy images" - default y if !TI_SECURE_DEVICE + default y if !TI_SECURE_DEVICE && !SPL_LOAD_FIT help SPL will support loading and booting Legacy images when this option is y. If this is not set, SPL will move on to other availablereviewed-by and tested-by : Jean-Jacques Hiblot <[email protected]>
Thanks!
Quoted 1 line
Building for arm, the reduction in size is around 50 bytes
Yup, with gcc-7.3, on the platforms that set SPL_LOAD_FIT it's generally an 84 bytes savings on aarch64 and 40 bytes on arm32.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190523/6447768b/attachment.sig>
PATCH v2 2/2 SPL: Default to disabling legacy image support when using FIT
In reply to Tom RiniQuoted 5 lines · Tom Rini
When we have a FIT image being used by SPL by default that means the most common case is that we'll never run into a legacy image. Disable legacy image support by default in that case to reclaim space.
Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190711/59e1229d/attachment.sig>