From patchwork Tue Jun 16 23:06:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 242532 List-Id: U-Boot discussion From: trini at konsulko.com (Tom Rini) Date: Tue, 16 Jun 2020 19:06:15 -0400 Subject: [PATCHv2 15/31] arm: capricorn: Convert CONFIG_BOOTCOUNT_ENV et al to Kconfig In-Reply-To: <20200616230631.29189-1-trini@konsulko.com> References: <20200616230631.29189-1-trini@konsulko.com> Message-ID: <20200616230631.29189-15-trini@konsulko.com> This converts the following to Kconfig: CONFIG_BOOTCOUNT_ENV CONFIG_BOOTCOUNT_LIMIT Cc: Anatolij Gustschin Signed-off-by: Tom Rini --- configs/deneb_defconfig | 2 ++ configs/giedi_defconfig | 2 ++ include/configs/capricorn-common.h | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig index 31a68f824025..5377b4fed513 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -62,6 +62,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y CONFIG_CPU=y diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index 5dd34227af01..dfac924bbb08 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -62,6 +62,8 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y CONFIG_CPU=y diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index c2e9d0f11f9c..b107e0ce3f96 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -138,9 +138,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 -#define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_BOOTCOUNT_ENV - /* Environment organisation */ #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1, eMMC */