| Message ID | 1518350813-3418-3-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:47 +0000 Alex Kiernan <alex.kiernan@gmail.com> wrote: > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> > --- > > drivers/bootcount/Kconfig | 25 +++++++++++-------------- > 1 file changed, 11 insertions(+), 14 deletions(-) > > diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig > index da2ccab..26fec89 100644 > --- a/drivers/bootcount/Kconfig > +++ b/drivers/bootcount/Kconfig > @@ -2,29 +2,30 @@ > # Boot count configuration > # > > -menu "Boot count support" > - > -config BOOTCOUNT_LIMIT > +menuconfig BOOTCOUNT_LIMIT > bool "Enable support for checking boot count limit" > help > Enable checking for exceeding the boot count limit. > More information: > http://www.denx.de/wiki/DULG/UBootBootCountLimit > -config SYS_BOOTCOUNT_SINGLEWORD > - bool "Use single word to pack boot count and magic value" > - help > - This option enables packing boot count magic value and > boot count > - into single word (32 bits). > - > if BOOTCOUNT_LIMIT > > +choice > + prompt "Boot count device" > + > config BOOTCOUNT_EXT > bool "Boot counter on EXT filesystem" > help > Add support for maintaining boot count in a file on an EXT > filesystem. > > -if BOOTCOUNT_EXT > +endchoice > + > +config SYS_BOOTCOUNT_SINGLEWORD > + bool "Use single word to pack boot count and magic value" > + help > + This option enables packing boot count magic value and > boot count > + into single word (32 bits). > > config SYS_BOOTCOUNT_EXT_INTERFACE > string "Interface on which to find boot counter EXT > filesystem" @@ -57,7 +58,3 @@ config SYS_BOOTCOUNT_ADDR > Set the address used for reading and writing the boot > counter. > endif > - > -endif > - > -endmenu 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
diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index da2ccab..26fec89 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -2,29 +2,30 @@ # Boot count configuration # -menu "Boot count support" - -config BOOTCOUNT_LIMIT +menuconfig BOOTCOUNT_LIMIT bool "Enable support for checking boot count limit" help Enable checking for exceeding the boot count limit. More information: http://www.denx.de/wiki/DULG/UBootBootCountLimit -config SYS_BOOTCOUNT_SINGLEWORD - bool "Use single word to pack boot count and magic value" - help - This option enables packing boot count magic value and boot count - into single word (32 bits). - if BOOTCOUNT_LIMIT +choice + prompt "Boot count device" + config BOOTCOUNT_EXT bool "Boot counter on EXT filesystem" help Add support for maintaining boot count in a file on an EXT filesystem. -if BOOTCOUNT_EXT +endchoice + +config SYS_BOOTCOUNT_SINGLEWORD + bool "Use single word to pack boot count and magic value" + help + This option enables packing boot count magic value and boot count + into single word (32 bits). config SYS_BOOTCOUNT_EXT_INTERFACE string "Interface on which to find boot counter EXT filesystem" @@ -57,7 +58,3 @@ config SYS_BOOTCOUNT_ADDR Set the address used for reading and writing the boot counter. endif - -endif - -endmenu
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- drivers/bootcount/Kconfig | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)