| Message ID | 1518350813-3418-2-git-send-email-alex.kiernan@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,1/8] Merge CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT | expand |
On Sun, 11 Feb 2018 12:06:46 +0000 Alex Kiernan <alex.kiernan@gmail.com> wrote: > CONFIG_BOOTCOUNT was only used in mx53ppd, merge it with > CONFIG_BOOTCOUNT_LIMIT > > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> > --- > > configs/mx53ppd_defconfig | 1 - > drivers/bootcount/Kconfig | 9 +-------- > 2 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig > index b83cf72..d6a1c6a 100644 > --- a/configs/mx53ppd_defconfig > +++ b/configs/mx53ppd_defconfig > @@ -20,7 +20,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" Reviewed-by: Lukasz Majewski <lukma@denx.de> 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
> On 11 Feb 2018, at 14.06, Alex Kiernan <alex.kiernan@gmail.com> wrote: > > CONFIG_BOOTCOUNT was only used in mx53ppd, merge it with > CONFIG_BOOTCOUNT_LIMIT > > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Reviewed-by: Ian Ray <ian.ray@ge.com> > --- > > configs/mx53ppd_defconfig | 1 - > drivers/bootcount/Kconfig | 9 +-------- > 2 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig > index b83cf72..d6a1c6a 100644 > --- a/configs/mx53ppd_defconfig > +++ b/configs/mx53ppd_defconfig > @@ -20,7 +20,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" > -- > 2.7.4 >
On 02/11/2018 08:08 PM, Lukasz Majewski wrote: > On Sun, 11 Feb 2018 12:06:46 +0000 > Alex Kiernan <alex.kiernan@gmail.com> wrote: > >> CONFIG_BOOTCOUNT was only used in mx53ppd, merge it with >> CONFIG_BOOTCOUNT_LIMIT >> >> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> >> --- >> >> configs/mx53ppd_defconfig | 1 - >> drivers/bootcount/Kconfig | 9 +-------- >> 2 files changed, 1 insertion(+), 9 deletions(-) >> >> diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig >> index b83cf72..d6a1c6a 100644 >> --- a/configs/mx53ppd_defconfig >> +++ b/configs/mx53ppd_defconfig >> @@ -20,7 +20,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" Please, have a look at SYS_BOOTCOUNT_SINGLEWORD. It is only used in drivers/bootcount/bootcount.c. drivers/bootcount/bootcount.c is only compiled if BOOTCOUNT_LIMIT is enabled. So with your patch it should depend on BOOTCOUNT_LIMIT. Regards Heinrich
diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index b83cf72..d6a1c6a 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -20,7 +20,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"
CONFIG_BOOTCOUNT was only used in mx53ppd, merge it with CONFIG_BOOTCOUNT_LIMIT Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- configs/mx53ppd_defconfig | 1 - drivers/bootcount/Kconfig | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-)