Message ID | 20200616230631.29189-15-trini@konsulko.com |
---|---|
State | Accepted |
Commit | 53355d53a48f9b91ec6f45b727cb25b13671e7da |
Headers | show |
Series | [PATCHv2,01/31] Convert CONFIG_AM335X_LCD to Kconfig | expand |
On Tue, Jun 16, 2020 at 07:06:15PM -0400, Tom Rini wrote: > This converts the following to Kconfig: > CONFIG_BOOTCOUNT_ENV > CONFIG_BOOTCOUNT_LIMIT > > Cc: Anatolij Gustschin <agust at denx.de> > Signed-off-by: Tom Rini <trini at konsulko.com> Applied to u-boot/next, thanks!
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 */
This converts the following to Kconfig: CONFIG_BOOTCOUNT_ENV CONFIG_BOOTCOUNT_LIMIT Cc: Anatolij Gustschin <agust at denx.de> Signed-off-by: Tom Rini <trini at konsulko.com> --- configs/deneb_defconfig | 2 ++ configs/giedi_defconfig | 2 ++ include/configs/capricorn-common.h | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-)