@@ -92,7 +92,7 @@ config SPL_RAW_IMAGE_SUPPORT
is y. If this is not set, SPL will move on to other available
boot media to find a suitable image.
-config SPL_LEGACY_IMAGE_SUPPORT
+config SPL_IMAGE_FORMAT_LEGACY
bool "Support SPL loading and booting of Legacy images"
default y if !TI_SECURE_DEVICE
help
@@ -102,7 +102,7 @@ config SPL_LEGACY_IMAGE_SUPPORT
config SPL_LEGACY_IMAGE_CRC_CHECK
bool "Check CRC of Legacy images"
- depends on SPL_LEGACY_IMAGE_SUPPORT
+ depends on SPL_IMAGE_FORMAT_LEGACY
select SPL_CRC32_SUPPORT
help
Enable this to check the CRC of Legacy images. While this increases
@@ -246,7 +246,7 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE
config SPL_CRC32_SUPPORT
bool "Support CRC32"
- default y if SPL_LEGACY_IMAGE_SUPPORT
+ default y if SPL_IMAGE_FORMAT_LEGACY
help
Enable this to support CRC32 in uImages or FIT images within SPL.
This is a 32-bit checksum value that can be used to verify images.
@@ -236,7 +236,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image,
return ret;
#endif
if (image_get_magic(header) == IH_MAGIC) {
-#ifdef CONFIG_SPL_LEGACY_IMAGE_SUPPORT
+#ifdef CONFIG_SPL_IMAGE_FORMAT_LEGACY
u32 header_size = sizeof(struct image_header);
#ifdef CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK
@@ -33,7 +33,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_ARCH_EARLY_INIT_R=y
CONFIG_SPL_BOOTROM_SUPPORT=y
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+# CONFIG_SPL_IMAGE_FORMAT_LEGACY is not set
CONFIG_TPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_STACK_R=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
@@ -24,7 +24,7 @@ CONFIG_MISC_INIT_R=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_BOARD_INIT=y
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+# CONFIG_SPL_IMAGE_FORMAT_LEGACY is not set
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
We have a symbol named CONFIG_IMAGE_FORMAT_LEGACY already for non-SPL, so rename the SPL symbol so we can make more use of those checks. Signed-off-by: Tom Rini <trini@konsulko.com> --- common/spl/Kconfig | 6 +++--- common/spl/spl.c | 2 +- configs/lion-rk3368_defconfig | 2 +- configs/puma-rk3399_defconfig | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)