| Message ID | 1518702926-18874-2-git-send-email-alex.kiernan@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Convert bootcount drivers to Kconfig | expand |
Hi Alex, > CONFIG_BOOTCOUNT was only used in mx53ppd, merge it with > CONFIG_BOOTCOUNT_LIMIT > > CONFIG_BOOTCOUNT was only used in mx53ppd, merge it with > CONFIG_BOOTCOUNT_LIMIT Please remove one instance. > > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> > Reviewed-by: Lukasz Majewski <lukma@denx.de> > Reviewed-by: Ian Ray <ian.ray@ge.com> > --- > > Changes in v2: > - Fix erroneously removed line in README > - Convert CONFIG_BOOTCOUNT_EXT too - it had only been partially done > - Reword CONFIG_BOOTCOUNT_DRAM > - Update README for AT91 driver > - Remove CONFIG_BOOTCOUNT_LIMIT and CONFIG_SYS_BOOTCOUNT_SINGLEWORD > from whitelist > - Rename CONFIG_SYS_BOOTCOUNT_ADDR to BOOTCOUNT_ADDR and remove from > Kconfig > - Migrate CONFIG_BOOTCOUNT_ALEN to Kconfig > > configs/mx53ppd_defconfig | 1 - > drivers/bootcount/Kconfig | 9 +-------- > scripts/config_whitelist.txt | 1 - > 3 files changed, 1 insertion(+), 10 deletions(-) > > diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig > index 90df425..7e3dd6d 100644 > --- a/configs/mx53ppd_defconfig > +++ b/configs/mx53ppd_defconfig > @@ -21,7 +21,6 @@ CONFIG_CMD_EXT4=y > CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > -CONFIG_BOOTCOUNT=y > CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_BOOTCOUNT_EXT=y > CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" > diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig > index d82289f..da2ccab 100644 > --- a/drivers/bootcount/Kconfig > +++ b/drivers/bootcount/Kconfig > @@ -4,13 +4,6 @@ > > menu "Boot count support" > > -config BOOTCOUNT > - bool "Enable Boot count support" > - help > - Enable boot count support, which provides the ability to > store the > - number of times the board has booted on a number of > different > - persistent storage mediums. > - > config BOOTCOUNT_LIMIT > bool "Enable support for checking boot count limit" > help > @@ -23,7 +16,7 @@ config SYS_BOOTCOUNT_SINGLEWORD > This option enables packing boot count magic value and > boot count into single word (32 bits). > > -if BOOTCOUNT > +if BOOTCOUNT_LIMIT > > config BOOTCOUNT_EXT > bool "Boot counter on EXT filesystem" > diff --git a/scripts/config_whitelist.txt > b/scripts/config_whitelist.txt index 38ce88e..b3a5d93 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -151,7 +151,6 @@ CONFIG_BOOTCOUNT_ALEN > CONFIG_BOOTCOUNT_AM33XX > CONFIG_BOOTCOUNT_ENV > CONFIG_BOOTCOUNT_I2C > -CONFIG_BOOTCOUNT_LIMIT > CONFIG_BOOTCOUNT_RAM > CONFIG_BOOTFILE > CONFIG_BOOTMAPSZ Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index 90df425..7e3dd6d 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -21,7 +21,6 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_BOOTCOUNT=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_EXT=y CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5" diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index d82289f..da2ccab 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -4,13 +4,6 @@ menu "Boot count support" -config BOOTCOUNT - bool "Enable Boot count support" - help - Enable boot count support, which provides the ability to store the - number of times the board has booted on a number of different - persistent storage mediums. - config BOOTCOUNT_LIMIT bool "Enable support for checking boot count limit" help @@ -23,7 +16,7 @@ config SYS_BOOTCOUNT_SINGLEWORD This option enables packing boot count magic value and boot count into single word (32 bits). -if BOOTCOUNT +if BOOTCOUNT_LIMIT config BOOTCOUNT_EXT bool "Boot counter on EXT filesystem" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 38ce88e..b3a5d93 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -151,7 +151,6 @@ CONFIG_BOOTCOUNT_ALEN CONFIG_BOOTCOUNT_AM33XX CONFIG_BOOTCOUNT_ENV CONFIG_BOOTCOUNT_I2C -CONFIG_BOOTCOUNT_LIMIT CONFIG_BOOTCOUNT_RAM CONFIG_BOOTFILE CONFIG_BOOTMAPSZ