[PATCH v2 27/50] Kconfig: Rename SPL_CRC32_SUPPORT to SPL_CRC32
Alex G.
mr.nuke.me at gmail.com
Fri May 14 23:31:02 CEST 2021
On 5/6/21 9:24 AM, Simon Glass wrote:
> Drop the _SUPPORT suffix so we can use CONFIG_IS_ENABLED() with this
> option.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
> ---
>
> (no changes since v1)
>
> common/spl/Kconfig | 4 ++--
> configs/axm_defconfig | 2 +-
> configs/chromebit_mickey_defconfig | 2 +-
> configs/chromebook_jerry_defconfig | 2 +-
> configs/chromebook_minnie_defconfig | 2 +-
> configs/chromebook_speedy_defconfig | 2 +-
> configs/evb-px30_defconfig | 2 +-
> configs/firefly-px30_defconfig | 2 +-
> configs/imxrt1020-evk_defconfig | 2 +-
> configs/imxrt1050-evk_defconfig | 2 +-
> configs/odroid-go2_defconfig | 2 +-
> configs/px30-core-ctouch2-px30_defconfig | 2 +-
> configs/px30-core-edimm2.2-px30_defconfig | 2 +-
> configs/socfpga_agilex_atf_defconfig | 2 +-
> configs/socfpga_agilex_vab_defconfig | 2 +-
> configs/socfpga_stratix10_atf_defconfig | 2 +-
> configs/taurus_defconfig | 2 +-
> include/image.h | 2 +-
> 18 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> index 2570b220891..39fc260566b 100644
> --- a/common/spl/Kconfig
> +++ b/common/spl/Kconfig
> @@ -204,7 +204,7 @@ config SPL_LEGACY_IMAGE_SUPPORT
> config SPL_LEGACY_IMAGE_CRC_CHECK
> bool "Check CRC of Legacy images"
> depends on SPL_LEGACY_IMAGE_SUPPORT
> - select SPL_CRC32_SUPPORT
> + select SPL_CRC32
> help
> Enable this to check the CRC of Legacy images. While this increases
> reliability, it affects both code size and boot duration.
> @@ -407,7 +407,7 @@ config SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION
> the eMMC EXT_CSC_PART_CONFIG selection should be overridden in SPL
> by user defined partition number.
>
> -config SPL_CRC32_SUPPORT
> +config SPL_CRC32
> bool "Support CRC32"
> default y if SPL_LEGACY_IMAGE_SUPPORT
> help
> diff --git a/configs/axm_defconfig b/configs/axm_defconfig
> index 0bfd7548b09..4e776fd6953 100644
> --- a/configs/axm_defconfig
> +++ b/configs/axm_defconfig
> @@ -32,7 +32,7 @@ CONFIG_BOOTCOMMAND="run flash_self"
> CONFIG_BOARD_EARLY_INIT_F=y
> # CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
> CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> -CONFIG_SPL_CRC32_SUPPORT=y
> +CONFIG_SPL_CRC32=y
> CONFIG_SPL_NAND_SUPPORT=y
> CONFIG_SPL_NAND_DRIVERS=y
> CONFIG_SPL_NAND_ECC=y
> diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
> index c09b63b9462..2b664e118cf 100644
> --- a/configs/chromebit_mickey_defconfig
> +++ b/configs/chromebit_mickey_defconfig
> @@ -25,7 +25,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
> # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
> -# CONFIG_SPL_CRC32_SUPPORT is not set
> +# CONFIG_SPL_CRC32 is not set
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
> index 692b630174d..a757d259f58 100644
> --- a/configs/chromebook_jerry_defconfig
> +++ b/configs/chromebook_jerry_defconfig
> @@ -26,7 +26,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
> # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
> -# CONFIG_SPL_CRC32_SUPPORT is not set
> +# CONFIG_SPL_CRC32 is not set
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
> index ae55842e3bf..353aa01ea9e 100644
> --- a/configs/chromebook_minnie_defconfig
> +++ b/configs/chromebook_minnie_defconfig
> @@ -26,7 +26,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
> # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
> -# CONFIG_SPL_CRC32_SUPPORT is not set
> +# CONFIG_SPL_CRC32 is not set
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/chromebook_speedy_defconfig b/configs/chromebook_speedy_defconfig
> index 4b460ee6a9e..c5be5597b10 100644
> --- a/configs/chromebook_speedy_defconfig
> +++ b/configs/chromebook_speedy_defconfig
> @@ -26,7 +26,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> CONFIG_SPL_STACK_R=y
> CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
> # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
> -# CONFIG_SPL_CRC32_SUPPORT is not set
> +# CONFIG_SPL_CRC32 is not set
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/evb-px30_defconfig b/configs/evb-px30_defconfig
> index d2fdfef2938..55e2702a172 100644
> --- a/configs/evb-px30_defconfig
> +++ b/configs/evb-px30_defconfig
> @@ -29,7 +29,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> CONFIG_SPL_STACK_R=y
> # CONFIG_TPL_BANNER_PRINT is not set
> -CONFIG_SPL_CRC32_SUPPORT=y
> +CONFIG_SPL_CRC32=y
> CONFIG_SPL_ATF=y
> # CONFIG_TPL_FRAMEWORK is not set
> # CONFIG_CMD_BOOTD is not set
> diff --git a/configs/firefly-px30_defconfig b/configs/firefly-px30_defconfig
> index 6487615fe08..978a3604053 100644
> --- a/configs/firefly-px30_defconfig
> +++ b/configs/firefly-px30_defconfig
> @@ -30,7 +30,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> CONFIG_SPL_STACK_R=y
> # CONFIG_TPL_BANNER_PRINT is not set
> -CONFIG_SPL_CRC32_SUPPORT=y
> +CONFIG_SPL_CRC32=y
> CONFIG_SPL_ATF=y
> # CONFIG_TPL_FRAMEWORK is not set
> # CONFIG_CMD_BOOTD is not set
> diff --git a/configs/imxrt1020-evk_defconfig b/configs/imxrt1020-evk_defconfig
> index 9bddb69cd41..ca7c1c90799 100644
> --- a/configs/imxrt1020-evk_defconfig
> +++ b/configs/imxrt1020-evk_defconfig
> @@ -24,7 +24,7 @@ CONFIG_SPL_BOARD_INIT=y
> CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
> -# CONFIG_SPL_CRC32_SUPPORT is not set
> +# CONFIG_SPL_CRC32 is not set
> # CONFIG_BOOTM_NETBSD is not set
> # CONFIG_BOOTM_PLAN9 is not set
> # CONFIG_BOOTM_RTEMS is not set
> diff --git a/configs/imxrt1050-evk_defconfig b/configs/imxrt1050-evk_defconfig
> index f639ea76230..ca53bccb5fd 100644
> --- a/configs/imxrt1050-evk_defconfig
> +++ b/configs/imxrt1050-evk_defconfig
> @@ -27,7 +27,7 @@ CONFIG_SPL_BOARD_INIT=y
> CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
> -# CONFIG_SPL_CRC32_SUPPORT is not set
> +# CONFIG_SPL_CRC32 is not set
> # CONFIG_BOOTM_NETBSD is not set
> # CONFIG_BOOTM_PLAN9 is not set
> # CONFIG_BOOTM_RTEMS is not set
> diff --git a/configs/odroid-go2_defconfig b/configs/odroid-go2_defconfig
> index 6aa41e37557..82e340a16ee 100644
> --- a/configs/odroid-go2_defconfig
> +++ b/configs/odroid-go2_defconfig
> @@ -33,7 +33,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> CONFIG_SPL_STACK_R=y
> # CONFIG_TPL_BANNER_PRINT is not set
> -CONFIG_SPL_CRC32_SUPPORT=y
> +CONFIG_SPL_CRC32=y
> CONFIG_SPL_I2C_SUPPORT=y
> CONFIG_SPL_POWER_SUPPORT=y
> CONFIG_SPL_ATF=y
> diff --git a/configs/px30-core-ctouch2-px30_defconfig b/configs/px30-core-ctouch2-px30_defconfig
> index 1afc146bbf2..3ac0ea4ccc9 100644
> --- a/configs/px30-core-ctouch2-px30_defconfig
> +++ b/configs/px30-core-ctouch2-px30_defconfig
> @@ -30,7 +30,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> CONFIG_SPL_STACK_R=y
> # CONFIG_TPL_BANNER_PRINT is not set
> -CONFIG_SPL_CRC32_SUPPORT=y
> +CONFIG_SPL_CRC32=y
> CONFIG_SPL_ATF=y
> # CONFIG_TPL_FRAMEWORK is not set
> # CONFIG_CMD_BOOTD is not set
> diff --git a/configs/px30-core-edimm2.2-px30_defconfig b/configs/px30-core-edimm2.2-px30_defconfig
> index 9d78eee84d7..f208297de5e 100644
> --- a/configs/px30-core-edimm2.2-px30_defconfig
> +++ b/configs/px30-core-edimm2.2-px30_defconfig
> @@ -30,7 +30,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> CONFIG_SPL_STACK_R=y
> # CONFIG_TPL_BANNER_PRINT is not set
> -CONFIG_SPL_CRC32_SUPPORT=y
> +CONFIG_SPL_CRC32=y
> CONFIG_SPL_ATF=y
> # CONFIG_TPL_FRAMEWORK is not set
> # CONFIG_CMD_BOOTD is not set
> diff --git a/configs/socfpga_agilex_atf_defconfig b/configs/socfpga_agilex_atf_defconfig
> index 0de65a22a0c..c265e57e6ce 100644
> --- a/configs/socfpga_agilex_atf_defconfig
> +++ b/configs/socfpga_agilex_atf_defconfig
> @@ -23,7 +23,7 @@ CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="earlycon"
> CONFIG_USE_BOOTCOMMAND=y
> CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run linux_qspi_enable; run mmcfitboot"
> -CONFIG_SPL_CRC32_SUPPORT=y
> +CONFIG_SPL_CRC32=y
> CONFIG_SPL_CACHE=y
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_SPL_ATF=y
> diff --git a/configs/socfpga_agilex_vab_defconfig b/configs/socfpga_agilex_vab_defconfig
> index d575dadcfbf..68b6b5e0b4a 100644
> --- a/configs/socfpga_agilex_vab_defconfig
> +++ b/configs/socfpga_agilex_vab_defconfig
> @@ -24,7 +24,7 @@ CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="earlycon"
> CONFIG_USE_BOOTCOMMAND=y
> CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run mmcfitboot"
> -CONFIG_SPL_CRC32_SUPPORT=y
> +CONFIG_SPL_CRC32=y
> CONFIG_SPL_CACHE=y
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_SPL_ATF=y
> diff --git a/configs/socfpga_stratix10_atf_defconfig b/configs/socfpga_stratix10_atf_defconfig
> index c187987dd83..8fcabe1f868 100644
> --- a/configs/socfpga_stratix10_atf_defconfig
> +++ b/configs/socfpga_stratix10_atf_defconfig
> @@ -23,7 +23,7 @@ CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="earlycon"
> CONFIG_USE_BOOTCOMMAND=y
> CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run linux_qspi_enable; run mmcfitboot"
> -CONFIG_SPL_CRC32_SUPPORT=y
> +CONFIG_SPL_CRC32=y
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_SPL_ATF=y
> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
> index a79cdf3fa7c..5caf9ab30d6 100644
> --- a/configs/taurus_defconfig
> +++ b/configs/taurus_defconfig
> @@ -36,7 +36,7 @@ CONFIG_BOOTCOMMAND="nand read 0x22000000 0x200000 0x300000; bootm"
> CONFIG_BOARD_EARLY_INIT_F=y
> # CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
> CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> -CONFIG_SPL_CRC32_SUPPORT=y
> +CONFIG_SPL_CRC32=y
> CONFIG_SPL_NAND_SUPPORT=y
> CONFIG_SPL_NAND_DRIVERS=y
> CONFIG_SPL_NAND_ECC=y
> diff --git a/include/image.h b/include/image.h
> index 3bb12ee3821..5aedc1bb23b 100644
> --- a/include/image.h
> +++ b/include/image.h
> @@ -47,7 +47,7 @@ struct fdt_region;
> #include <linux/libfdt.h>
> #include <fdt_support.h>
> # ifdef CONFIG_SPL_BUILD
> -# ifdef CONFIG_SPL_CRC32_SUPPORT
> +# ifdef CONFIG_SPL_CRC32
> # define IMAGE_ENABLE_CRC32 1
> # endif
> # ifdef CONFIG_SPL_MD5_SUPPORT
>
More information about the U-Boot
mailing list