spl: Rename Kconfig SPL_LEGACY_IMAGE_SUPPORT to SPL_LEGACY_IMAGE_FORMAT
This matches what this support is called in the non-SPL case. The postfix
_SUPPORT is redundant as enabling Kconfig options implies support.
With this we can use CONFIG_IS_ENABLED() as needed.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 84f2847..43485af 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -225,7 +225,7 @@
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_LEGACY_IMAGE_FORMAT
bool "Support SPL loading and booting of Legacy images"
default y if !TI_SECURE_DEVICE && !SPL_LOAD_FIT
help
@@ -235,7 +235,7 @@
config SPL_LEGACY_IMAGE_CRC_CHECK
bool "Check CRC of Legacy images"
- depends on SPL_LEGACY_IMAGE_SUPPORT
+ depends on SPL_LEGACY_IMAGE_FORMAT
select SPL_CRC32
help
Enable this to check the CRC of Legacy images. While this increases
@@ -451,7 +451,7 @@
config SPL_CRC32
bool "Support CRC32"
- default y if SPL_LEGACY_IMAGE_SUPPORT || SPL_EFI_PARTITION
+ default y if SPL_LEGACY_IMAGE_FORMAT || SPL_EFI_PARTITION
default y if SPL_ENV_SUPPORT || TPL_BLOBLIST
help
Enable this to support CRC32 in uImages or FIT images within SPL.
diff --git a/common/spl/Makefile b/common/spl/Makefile
index e71e7be..13db3df 100644
--- a/common/spl/Makefile
+++ b/common/spl/Makefile
@@ -10,7 +10,7 @@
obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o
obj-$(CONFIG_$(SPL_TPL_)BOOTROM_SUPPORT) += spl_bootrom.o
obj-$(CONFIG_$(SPL_TPL_)LOAD_FIT) += spl_fit.o
-obj-$(CONFIG_$(SPL_TPL_)LEGACY_IMAGE_SUPPORT) += spl_legacy.o
+obj-$(CONFIG_$(SPL_TPL_)LEGACY_IMAGE_FORMAT) += spl_legacy.o
obj-$(CONFIG_$(SPL_TPL_)NOR_SUPPORT) += spl_nor.o
obj-$(CONFIG_$(SPL_TPL_)XIP_SUPPORT) += spl_xip.o
obj-$(CONFIG_$(SPL_TPL_)YMODEM_SUPPORT) += spl_ymodem.o
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 0f4fff8..067a2d4 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -110,7 +110,7 @@
}
/* Legacy image handling */
- if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_SUPPORT)) {
+ if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_FORMAT)) {
load.bl_len = 1;
load.read = spl_nor_load_read;
return spl_load_legacy_img(spl_image, bootdev, &load,