| Message ID | 1518350813-3418-4-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:48 +0000 Alex Kiernan <alex.kiernan@gmail.com> wrote: > This converts the following to Kconfig: > CONFIG_BOOTCOUNT_AM33XX > > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> > --- > > drivers/bootcount/Kconfig | 9 +++++++++ > drivers/bootcount/Makefile | 1 - > include/configs/am335x_evm.h | 1 - > include/configs/am335x_sl50.h | 1 - > include/configs/baltos.h | 2 -- > include/configs/bav335x.h | 1 - > include/configs/brppt1.h | 1 - > include/configs/chiliboard.h | 1 - > scripts/config_whitelist.txt | 1 - > 9 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig > index 26fec89..e905295 100644 > --- a/drivers/bootcount/Kconfig > +++ b/drivers/bootcount/Kconfig > @@ -12,6 +12,7 @@ if BOOTCOUNT_LIMIT > > choice > prompt "Boot count device" > + default BOOTCOUNT_AM33XX if AM33XX || SOC_DA8XX > > config BOOTCOUNT_EXT > bool "Boot counter on EXT filesystem" > @@ -19,6 +20,14 @@ config BOOTCOUNT_EXT > Add support for maintaining boot count in a file on an EXT > filesystem. > > +config BOOTCOUNT_AM33XX > + bool "Boot counter in AM33XX RTC IP block" > + depends on AM33XX || SOC_DA8XX > + help > + A bootcount driver for the RTC IP block found on many TI > platforms. > + This requires the RTC clocks, etc, to be enabled prior to > use and > + not all boards with this IP block on it will have the RTC > in use. + > endchoice > > config SYS_BOOTCOUNT_SINGLEWORD > diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile > index 45445d2..62bf55e 100644 > --- a/drivers/bootcount/Makefile > +++ b/drivers/bootcount/Makefile > @@ -4,7 +4,6 @@ > > obj-y += bootcount.o > obj-$(CONFIG_AT91SAM9XE) += bootcount_at91.o > -obj-$(CONFIG_SOC_DA8XX) += bootcount_davinci.o > obj-$(CONFIG_BOOTCOUNT_AM33XX) += bootcount_davinci.o > obj-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o > obj-$(CONFIG_BOOTCOUNT_ENV) += bootcount_env.o > diff --git a/include/configs/am335x_evm.h > b/include/configs/am335x_evm.h index 03791de..fff463e 100644 > --- a/include/configs/am335x_evm.h > +++ b/include/configs/am335x_evm.h > @@ -177,7 +177,6 @@ > /* SPL */ > #ifndef CONFIG_NOR_BOOT > /* Bootcount using the RTC block */ > -#define CONFIG_BOOTCOUNT_AM33XX > #define CONFIG_SYS_BOOTCOUNT_BE > > /* USB gadget RNDIS */ > diff --git a/include/configs/am335x_sl50.h > b/include/configs/am335x_sl50.h index 1cb3578..4bcbaee 100644 > --- a/include/configs/am335x_sl50.h > +++ b/include/configs/am335x_sl50.h > @@ -74,7 +74,6 @@ > /* SPL */ > > /* Bootcount using the RTC block */ > -#define CONFIG_BOOTCOUNT_AM33XX > #define CONFIG_SYS_BOOTCOUNT_BE > > #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) > diff --git a/include/configs/baltos.h b/include/configs/baltos.h > index 440dbf5..10979c7 100644 > --- a/include/configs/baltos.h > +++ b/include/configs/baltos.h > @@ -230,8 +230,6 @@ > > /* SPL */ > #ifndef CONFIG_NOR_BOOT > -/* Bootcount using the RTC block */ > -#define CONFIG_BOOTCOUNT_AM33XX > > /* USB gadget RNDIS */ > > diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h > index 7bbb7d1..27cb8f6 100644 > --- a/include/configs/bav335x.h > +++ b/include/configs/bav335x.h > @@ -339,7 +339,6 @@ DEFAULT_LINUX_BOOT_ENV \ > /* SPL */ > #ifndef CONFIG_NOR_BOOT > /* Bootcount using the RTC block */ > -#define CONFIG_BOOTCOUNT_AM33XX > #define CONFIG_SYS_BOOTCOUNT_BE > > /* USB gadget RNDIS */ > diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h > index fb2845f..30ea2d2 100644 > --- a/include/configs/brppt1.h > +++ b/include/configs/brppt1.h > @@ -22,7 +22,6 @@ > > /* Bootcount using the RTC block */ > #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 > -#define CONFIG_BOOTCOUNT_AM33XX > > /* memory */ > #define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) > diff --git a/include/configs/chiliboard.h > b/include/configs/chiliboard.h index 234cd6a..92e0479 100644 > --- a/include/configs/chiliboard.h > +++ b/include/configs/chiliboard.h > @@ -123,7 +123,6 @@ > > /* SPL */ > /* Bootcount using the RTC block */ > -#define CONFIG_BOOTCOUNT_AM33XX > #define CONFIG_SYS_BOOTCOUNT_BE > > /* NAND: device related configs */ > diff --git a/scripts/config_whitelist.txt > b/scripts/config_whitelist.txt index 1be3f23..46d9d5c 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -148,7 +148,6 @@ CONFIG_BOOGER > CONFIG_BOOM > CONFIG_BOOTBLOCK > CONFIG_BOOTCOUNT_ALEN > -CONFIG_BOOTCOUNT_AM33XX > CONFIG_BOOTCOUNT_ENV > CONFIG_BOOTCOUNT_I2C > CONFIG_BOOTCOUNT_LIMIT 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
> > This converts the following to Kconfig: > CONFIG_BOOTCOUNT_AM33XX > > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> > --- > include/configs/brppt1.h | 1 - for the brppt1 files: Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> Acked-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index 26fec89..e905295 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -12,6 +12,7 @@ if BOOTCOUNT_LIMIT choice prompt "Boot count device" + default BOOTCOUNT_AM33XX if AM33XX || SOC_DA8XX config BOOTCOUNT_EXT bool "Boot counter on EXT filesystem" @@ -19,6 +20,14 @@ config BOOTCOUNT_EXT Add support for maintaining boot count in a file on an EXT filesystem. +config BOOTCOUNT_AM33XX + bool "Boot counter in AM33XX RTC IP block" + depends on AM33XX || SOC_DA8XX + help + A bootcount driver for the RTC IP block found on many TI platforms. + This requires the RTC clocks, etc, to be enabled prior to use and + not all boards with this IP block on it will have the RTC in use. + endchoice config SYS_BOOTCOUNT_SINGLEWORD diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile index 45445d2..62bf55e 100644 --- a/drivers/bootcount/Makefile +++ b/drivers/bootcount/Makefile @@ -4,7 +4,6 @@ obj-y += bootcount.o obj-$(CONFIG_AT91SAM9XE) += bootcount_at91.o -obj-$(CONFIG_SOC_DA8XX) += bootcount_davinci.o obj-$(CONFIG_BOOTCOUNT_AM33XX) += bootcount_davinci.o obj-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o obj-$(CONFIG_BOOTCOUNT_ENV) += bootcount_env.o diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 03791de..fff463e 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -177,7 +177,6 @@ /* SPL */ #ifndef CONFIG_NOR_BOOT /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE /* USB gadget RNDIS */ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 1cb3578..4bcbaee 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -74,7 +74,6 @@ /* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 440dbf5..10979c7 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -230,8 +230,6 @@ /* SPL */ #ifndef CONFIG_NOR_BOOT -/* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX /* USB gadget RNDIS */ diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 7bbb7d1..27cb8f6 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -339,7 +339,6 @@ DEFAULT_LINUX_BOOT_ENV \ /* SPL */ #ifndef CONFIG_NOR_BOOT /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE /* USB gadget RNDIS */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index fb2845f..30ea2d2 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -22,7 +22,6 @@ /* Bootcount using the RTC block */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 -#define CONFIG_BOOTCOUNT_AM33XX /* memory */ #define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 234cd6a..92e0479 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -123,7 +123,6 @@ /* SPL */ /* Bootcount using the RTC block */ -#define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE /* NAND: device related configs */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1be3f23..46d9d5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -148,7 +148,6 @@ CONFIG_BOOGER CONFIG_BOOM CONFIG_BOOTBLOCK CONFIG_BOOTCOUNT_ALEN -CONFIG_BOOTCOUNT_AM33XX CONFIG_BOOTCOUNT_ENV CONFIG_BOOTCOUNT_I2C CONFIG_BOOTCOUNT_LIMIT
This converts the following to Kconfig: CONFIG_BOOTCOUNT_AM33XX Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- drivers/bootcount/Kconfig | 9 +++++++++ drivers/bootcount/Makefile | 1 - include/configs/am335x_evm.h | 1 - include/configs/am335x_sl50.h | 1 - include/configs/baltos.h | 2 -- include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/chiliboard.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 9 insertions(+), 9 deletions(-)