Merge branch 'master' of git://git.denx.de/u-boot-spi

[oweals/u-boot.git] / drivers / bootcount / Kconfig

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index eabfd132ad22350f4da799245dec1edbb6a854f5..d335ed14b96172a5bbd29768546cf863d2f7bb8e 100644 (file)
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -13,6 +13,17 @@ if BOOTCOUNT_LIMIT
 choice
        prompt "Boot count device"
        default BOOTCOUNT_AM33XX if AM33XX || SOC_DA8XX
+       default BOOTCOUNT_AT91 if AT91SAM9XE
+       default BOOTCOUNT_GENERIC
+
+config BOOTCOUNT_GENERIC
+       bool "Generic default boot counter"
+       help
+         Generic bootcount stored at SYS_BOOTCOUNT_ADDR.
+
+         SYS_BOOTCOUNT_ADDR:
+           Set to the address where the bootcount and bootcount magic
+           will be stored.
 
 config BOOTCOUNT_EXT
        bool "Boot counter on EXT filesystem"
@@ -23,6 +34,7 @@ config BOOTCOUNT_EXT
 config BOOTCOUNT_AM33XX
        bool "Boot counter in AM33XX RTC IP block"
        depends on AM33XX || SOC_DA8XX
+       select SPL_AM33XX_ENABLE_RTC32K_OSC if AM33XX
        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
@@ -46,10 +58,31 @@ config BOOTCOUNT_RAM
          Store the bootcount in DRAM protected against against bit errors
          due to short power loss or holding a system in RESET.
 
+config BOOTCOUNT_I2C
+       bool "Boot counter on I2C device"
+       help
+         Enable support for the bootcounter on an i2c (like RTC) device.
+         CONFIG_SYS_I2C_RTC_ADDR = i2c chip address
+         CONFIG_SYS_BOOTCOUNT_ADDR = i2c addr which is used for
+                                     the bootcounter.
+
+config BOOTCOUNT_AT91
+       bool "Boot counter for Atmel AT91SAM9XE"
+       depends on AT91SAM9XE
+
 endchoice
 
+config BOOTCOUNT_ALEN
+       int "I2C address length"
+       default 1
+       depends on BOOTCOUNT_I2C
+       help
+         Length of the the I2C address at SYS_BOOTCOUNT_ADDR for storing
+         the boot counter.
+
 config SYS_BOOTCOUNT_SINGLEWORD
        bool "Use single word to pack boot count and magic value"
+       depends on BOOTCOUNT_GENERIC
        help
          This option enables packing boot count magic value and boot count
          into single word (32 bits).
@@ -79,8 +112,10 @@ config SYS_BOOTCOUNT_EXT_NAME
 
 config SYS_BOOTCOUNT_ADDR
        hex "RAM address used for reading and writing the boot counter"
-       default 0x7000A000
-       depends on BOOTCOUNT_EXT
+       default 0x44E3E000 if BOOTCOUNT_AM33XX
+       default 0xE0115FF8 if ARCH_LS1043A || ARCH_LS1021A
+       depends on BOOTCOUNT_AM33XX || BOOTCOUNT_GENERIC || BOOTCOUNT_EXT || \
+                  BOOTCOUNT_I2C
        help
          Set the address used for reading and writing the boot counter.