bootcount: Migrate CONFIG_SYS_BOOTCOUNT_ADDR

Migrate the users of CONFIG_SYS_BOOTCOUNT_ADDR to Kconfig.  We can
provide a default for BOOTCOUNT_AM33XX as that's a specific part of the
RTC in use.  We can also provide a default for ARCH_LS1043A and
ARCH_LS1021A as they had been previously calculated and their symbols
are in Kconfig.  In the case of other QE-enabled platforms, they are not
so we must update the relevant defconfig files.  The previous default
only applied in some cases, even on a specific SoC family.

Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index cbb31f6bf321b913881f235fe0acc8b3d6bfa66a..234b1a593567311b7df3374b2a72a41583a18e1f 100644 (file)
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_DIAG=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0x01C23000

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y

diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig
index 251fcd01b69a87f4cf7c632207fee68f1709cab6..2b4fe9c2c596d39ddeec80488ea6cbb0c96e7017 100644 (file)
--- a/configs/dh_imx6_defconfig
+++ b/configs/dh_imx6_defconfig
@@ -35,6 +35,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DWC_AHSATA=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000

 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y

diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig
index ee1cc432e0e08e895377fd221dca1445f59f627c..045380b6de8edafb37cd6206efb31ed2e080436f 100644 (file)
--- a/configs/ge_b450v3_defconfig
+++ b/configs/ge_b450v3_defconfig
@@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"

+CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000

 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y

diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig
index 27a89b0be782ae684f681f62df135e44466eb329..9d4b8aeebedca74765e62e74077d673f4c996643 100644 (file)
--- a/configs/ge_b650v3_defconfig
+++ b/configs/ge_b650v3_defconfig
@@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"

+CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000

 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y

diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig
index af4ba97543315cf046da2724cc8e605679718051..94785681be7d3c5ab8aaf1fb949eff0ef2bee3c8 100644 (file)
--- a/configs/ge_b850v3_defconfig
+++ b/configs/ge_b850v3_defconfig
@@ -29,6 +29,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"

+CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000

 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y

diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index 7b9c0e7d4770ae005fd90c491249898371be9ff9..55f83ed1e17c4eaad5816c18524ed190598e54a9 100644 (file)
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -17,6 +17,7 @@ CONFIG_ENV_IS_IN_NVRAM=y
 CONFIG_SCSI_AHCI=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
 CONFIG_SCSI_AHCI=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xfff3cf0c

 # CONFIG_MMC is not set
 CONFIG_SCSI=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_MMC is not set
 CONFIG_SCSI=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 5ca77030104fd07afa9e70c1fcb33b4cd77907e2..44b411cc593223e4e1e106a4b48713547e094996 100644 (file)
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -36,6 +36,7 @@ CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_I2C=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_I2C=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0x9

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y

diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index fe731dc3c76dd82291574b977f78f17bc52000cc..9d22c211a37e2023928048a95412990473351400 100644 (file)
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -35,6 +35,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020

 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index c360d06a1e4259f6d59bd52e0f227752a82ee03a..3426adf5981b60de49ce297c16d774947b6880db 100644 (file)
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -28,6 +28,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set

diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 3e9ba80e99611ce7a9522b41abe285ae7ffb2d6d..e795ac40d182252fb0af319939e183aefe59a423 100644 (file)
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set

diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
index 9d4f3d7395a5c46a6b7fc318d57e47e92e646fe3..12c06cc544865176cd13aa7005903c6a15de4699 100644 (file)
--- a/configs/kmlion1_defconfig
+++ b/configs/kmlion1_defconfig
@@ -35,6 +35,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020

 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index 484804ab0c3cd6ea1c96eda5aef67ef62396293d..f3babb6a7e570c4a30e291f14dc0c674e68dabeb 100644 (file)
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set

diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index 0a82ca344736f6b5d98e52e3fee6a50b2064ca1a..ac3f336204db78eb5baa852d434d3697af6394d4 100644 (file)
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set

diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig
index 1b2d3df785938aa830208fff2fe6f319c9b8f94e..a5930ef6a764f00f37175348eb82cf43778dd197 100644 (file)
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -29,6 +29,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set

diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
index c3dcf86e32f46a4dc5447d726988c768bdc45e4d..7441e4a888cc14bd8aacf97c49d56a0d0a816bf6 100644 (file)
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set

diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index 0dc165e312979ceddeeeaefcabb989414c81593d..b415c9d2030f5e7c2334452920f6eeb6ff65676b 100644 (file)
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -28,6 +28,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set

diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index 8fb512651f5a3f8a4ef8a8c91eac89ad0eecbddb..f4a0b9b639ff702e144890e9047bd4b9ed575389 100644 (file)
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5"
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTCOUNT_EXT=y
 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5"

+CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000

 CONFIG_NETDEVICES=y
 CONFIG_RTC_S35392A=y
 CONFIG_USB=y
 CONFIG_NETDEVICES=y
 CONFIG_RTC_S35392A=y
 CONFIG_USB=y

diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig
index 4da9356baf68c07dd923a2017cb12e30a546a478..53b5c34fd4c115f010648c58f1b0ec9d4010f290 100644 (file)
--- a/configs/socfpga_is1_defconfig
+++ b/configs/socfpga_is1_defconfig
@@ -34,6 +34,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8

 CONFIG_FPGA_SOCFPGA=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_FPGA_SOCFPGA=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y

diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig
index bdc12e4a6af985069272b23e5a3be3b15776556d..d7df688f5012a85e60ddb15a2af7c00dc0c1ac7b 100644 (file)
--- a/configs/socfpga_sr1500_defconfig
+++ b/configs/socfpga_sr1500_defconfig
@@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8

 CONFIG_FPGA_SOCFPGA=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_FPGA_SOCFPGA=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y

diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index c75c8022408b3336a0df813cb72a16a3300ff4b0..0213101d2fbfc8e93f62500932a48f729adea998 100644 (file)
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set

diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig
index b6f5974fd49fe1d6102ebae5f87611d7da7e5441..995a1ced0f5e4be2fc98fd7c255410fe4310bea8 100644 (file)
--- a/configs/tqma6s_wru4_mmc_defconfig
+++ b/configs/tqma6s_wru4_mmc_defconfig
@@ -34,6 +34,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000

 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS0=y
 CONFIG_LED_STATUS_BIT=0
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS0=y
 CONFIG_LED_STATUS_BIT=0

diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index 262a5c54793c16504be3e7b57e46aaeda0c3ac40..278d35ae61a576799dad2c90afb88dd267df38ab 100644 (file)
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set

diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index a2c101e275a01739713c1e37ab95d9505c1acf9d..6414ac29364b66861b380ecb116e9938c696df03 100644 (file)
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -27,6 +27,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8

 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set

diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index d1711e01fd45ceb80c9958c5768dcabda2d7086b..b63bf41c24520b087d55e18ade7162ce2c31953d 100644 (file)
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -38,6 +38,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:64M(ubi0),64M(ubi1)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y

+CONFIG_SYS_BOOTCOUNT_ADDR=0xD2801FF8

 CONFIG_FPGA_XILINX=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_FPGA_XILINX=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index c41b1316cd094b0703937af5462c6e9b02d1c06c..73972b7f9c375363feb71a7afdf73fb0b9841842 100644 (file)
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -111,8 +111,10 @@ config SYS_BOOTCOUNT_EXT_NAME
 
 config SYS_BOOTCOUNT_ADDR
        hex "RAM address used for reading and writing the boot counter"
 
 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.
 
        help
          Set the address used for reading and writing the boot counter.
 

diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c
index 8b499fe1286143b22e96d1c10532d7548cc75a9b..67554fa4a9b80ce9c3486d86c92183ea552574db 100644 (file)
--- a/drivers/bootcount/bootcount.c
+++ b/drivers/bootcount/bootcount.c
@@ -8,22 +8,7 @@
 #include <bootcount.h>
 #include <linux/compiler.h>
 
 #include <bootcount.h>
 #include <linux/compiler.h>
 

-/*
- * Only override CONFIG_SYS_BOOTCOUNT_ADDR if not already defined. This
- * way, some boards can define it directly in their config header.
- */
-#if !defined(CONFIG_SYS_BOOTCOUNT_ADDR)
-
-#if defined(CONFIG_QE)
-#include <linux/immap_qe.h>
-#define CONFIG_SYS_BOOTCOUNT_ADDR      (CONFIG_SYS_IMMR + 0x110000 + \
-                                        QE_MURAM_SIZE - 2 * sizeof(u32))
-#endif /* defined(CONFIG_QE) */
-
-#endif /* !defined(CONFIG_SYS_BOOTCOUNT_ADDR) */
-

 /* Now implement the generic default functions */
 /* Now implement the generic default functions */

-#if defined(CONFIG_SYS_BOOTCOUNT_ADDR)

 __weak void bootcount_store(ulong a)
 {
        void *reg = (void *)CONFIG_SYS_BOOTCOUNT_ADDR;
 __weak void bootcount_store(ulong a)
 {
        void *reg = (void *)CONFIG_SYS_BOOTCOUNT_ADDR;


@@ -54,4 +39,3 @@ __weak ulong bootcount_load(void)
                return raw_bootcount_load(reg);
 #endif /* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD) */
 }
                return raw_bootcount_load(reg);
 #endif /* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD) */
 }

-#endif /* defined(CONFIG_SYS_BOOTCOUNT_ADDR) */

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 30ea2d22e8942cd0f4cf8716de6eace8720b8a2f..02e989ad7ad07e114c360e2121f8acfdcfe73876 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -20,9 +20,6 @@
 #define CONFIG_LCD_DT_SIMPLEFB
 #define LCD_BPP                                LCD_COLOR32
 
 #define CONFIG_LCD_DT_SIMPLEFB
 #define LCD_BPP                                LCD_COLOR32
 

-/* Bootcount using the RTC block */
-#define CONFIG_SYS_BOOTCOUNT_ADDR      0x44E3E000
-

 /* memory */
 #define CONFIG_SYS_MALLOC_LEN          (5 * 1024 * 1024)
 
 /* memory */
 #define CONFIG_SYS_MALLOC_LEN          (5 * 1024 * 1024)
 

diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 854dc1ffedf019f83054120cb76b9ad50f008112..364066feb21b3c787b535857ba87569770bf4a6d 100644 (file)
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -274,7 +274,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR                (0x8001ff00)
 
 #define CONFIG_SYS_BOOTCOUNT_LE                /* Use little-endian accessors */
 #define CONFIG_SYS_INIT_SP_ADDR                (0x8001ff00)
 
 #define CONFIG_SYS_BOOTCOUNT_LE                /* Use little-endian accessors */

-#define CONFIG_SYS_BOOTCOUNT_ADDR      DAVINCI_RTC_BASE

 
 #ifndef __ASSEMBLY__
 int calimain_get_osc_freq(void);
 
 #ifndef __ASSEMBLY__
 int calimain_get_osc_freq(void);

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 1f7fccad3fbce62f5a94c60c4d612fd325d809fe..abe393e44c94db848e1837330530496163acec0c 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -42,7 +42,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (4 * SZ_1M)
 
 /* Bootcounter */
 #define CONFIG_SYS_MALLOC_LEN          (4 * SZ_1M)
 
 /* Bootcounter */

-#define CONFIG_SYS_BOOTCOUNT_ADDR      IRAM_BASE_ADDR

 #define CONFIG_SYS_BOOTCOUNT_BE
 
 /* FEC ethernet */
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 /* FEC ethernet */

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index e4673d812dc21df461cd59470c09c2fd7679cdc1..cbfe30d536d0b88f002a511ae1fc00203b0848d3 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -263,6 +263,4 @@
 
 #define CONFIG_BCH
 
 
 #define CONFIG_BCH
 

-#define CONFIG_SYS_BOOTCOUNT_ADDR              0x7000A000
-

 #endif /* __GE_BX50V3_CONFIG_H */
 #endif /* __GE_BX50V3_CONFIG_H */

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 0aa59bcafde1edb3a5e51996c539ed87c872e48c..785cad7762e9d9f785af5769715da56114f39e33 100644 (file)
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -25,7 +25,6 @@
 #define CONFIG_CONS_INDEX              0
 
 #define CONFIG_SYS_BOOTCOUNT_LE                /* Use little-endian accessors */
 #define CONFIG_CONS_INDEX              0
 
 #define CONFIG_SYS_BOOTCOUNT_LE                /* Use little-endian accessors */

-#define CONFIG_SYS_BOOTCOUNT_ADDR      0xfff3cf0c

 
 #define CONFIG_MISC_INIT_R
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_MISC_INIT_R
 #define CONFIG_SCSI_AHCI_PLAT

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 12c3aff4166d7ed5f82209b50ce7e06f55203f03..a4acaa65b2d54a7215ab5ec44551a7a100cf7672 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -508,9 +508,6 @@
 /* UBI Support */
 #define CONFIG_MTD_PARTITIONS
 
 /* UBI Support */
 #define CONFIG_MTD_PARTITIONS
 

-/* bootcount support */
-#define CONFIG_SYS_BOOTCOUNT_ADDR      0x9
-

 #define CONFIG_IMAGE_FORMAT_LEGACY
 
 #endif /* __CONFIG_H */
 #define CONFIG_IMAGE_FORMAT_LEGACY
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 7f735e0ac67ec2105d125262c3cbeaeb09915454..f49f4361204f88e203fb2413cfc6239123d7b3bc 100644 (file)
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -188,9 +188,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_BR1_PRELIM  CONFIG_SYS_QRIO_BR_PRELIM /* QRIO Base Address */
 #define CONFIG_SYS_OR1_PRELIM  CONFIG_SYS_QRIO_OR_PRELIM /* QRIO Options */
 
 #define CONFIG_SYS_BR1_PRELIM  CONFIG_SYS_QRIO_BR_PRELIM /* QRIO Base Address */
 #define CONFIG_SYS_OR1_PRELIM  CONFIG_SYS_QRIO_OR_PRELIM /* QRIO Options */
 

-/* bootcounter in QRIO */
-#define CONFIG_SYS_BOOTCOUNT_ADDR      (CONFIG_SYS_QRIO_BASE + 0x20)
-

 #define CONFIG_BOARD_EARLY_INIT_R      /* call board_early_init_r function */
 #define CONFIG_MISC_INIT_F
 #define CONFIG_MISC_INIT_R
 #define CONFIG_BOARD_EARLY_INIT_R      /* call board_early_init_r function */
 #define CONFIG_MISC_INIT_F
 #define CONFIG_MISC_INIT_R

diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h
index f2c3f405549ad5b3cb8532f0572a9d33c7bf6012..88f9d4a46d07dbb3dc9df98a68c17743efb69278 100644 (file)
--- a/include/configs/socfpga_is1.h
+++ b/include/configs/socfpga_is1.h
@@ -30,8 +30,6 @@
 /*
  * Bootcounter
  */
 /*
  * Bootcounter
  */

-/* last 2 lwords in OCRAM */
-#define CONFIG_SYS_BOOTCOUNT_ADDR       0xfffffff8

 #define CONFIG_SYS_BOOTCOUNT_BE
 
 #endif /* __CONFIG_SOCFPGA_IS1_H__ */
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 #endif /* __CONFIG_SOCFPGA_IS1_H__ */

diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index 8879817b3020ed503eac0f5ab4ee6d2d178b9524..492869bd37f62bbd6d67663c1866013476e3657d 100644 (file)
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -29,8 +29,6 @@
 /*
  * Bootcounter
  */
 /*
  * Bootcounter
  */

-/* last 2 lwords in OCRAM */
-#define CONFIG_SYS_BOOTCOUNT_ADDR      0xfffffff8

 #define CONFIG_SYS_BOOTCOUNT_BE
 
 /* Environment setting for SPI flash */
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 /* Environment setting for SPI flash */

diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index 6c93fd3f9b6f39c9271afefe7637942729f1cc70..8251ceb63fa0da17455c04cfc29c3292af60f447 100644 (file)
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -37,13 +37,6 @@
 #endif
 
 #define CONFIG_DRIVER_TI_CPSW          /* Driver for IP block */
 #endif
 
 #define CONFIG_DRIVER_TI_CPSW          /* Driver for IP block */

-/*
- * RTC related defines. To use bootcount you must set bootlimit in the
- * environment to a non-zero value and enable CONFIG_BOOTCOUNT_LIMIT
- * in the board config.
- */
-#define CONFIG_SYS_BOOTCOUNT_ADDR      0x44E3E000
-

 /*
  * SPL related defines.  The Public RAM memory map the ROM defines the
  * area between 0x402F0400 and 0x4030B800 as a download area and
 /*
  * SPL related defines.  The Public RAM memory map the ROM defines the
  * area between 0x402F0400 and 0x4030B800 as a download area and

diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index d94f790148dc509289f68c641d1a3b5bcb6c7c70..24b62e701c10f6d5e92d0b5c0a41d2b40a129136 100644 (file)
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -34,7 +34,6 @@
 /* LED */
 
 /* Bootcounter */
 /* LED */
 
 /* Bootcounter */

-#define CONFIG_SYS_BOOTCOUNT_ADDR      IRAM_BASE_ADDR

 #define CONFIG_SYS_BOOTCOUNT_BE
 
 #endif /* __CONFIG_TQMA6_WRU4_H */
 #define CONFIG_SYS_BOOTCOUNT_BE
 
 #endif /* __CONFIG_TQMA6_WRU4_H */

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 4bf8b1051e58a613fb895f600304ce9326340bfd..485522cd872912bb9cd20fad0f07dc3ed5eb17d8 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -116,10 +116,6 @@
 #define CONFIG_SYS_MALLOC_LEN                  (8 << 20)
 #define CONFIG_SYS_LOAD_ADDR                   0x00800000
 
 #define CONFIG_SYS_MALLOC_LEN                  (8 << 20)
 #define CONFIG_SYS_LOAD_ADDR                   0x00800000
 

-/* Use last 2 lwords in internal SRAM for bootcounter */
-#define CONFIG_SYS_BOOTCOUNT_ADDR              (CONFIG_SRAM_BASE + \
-                                                CONFIG_SRAM_SIZE)
-

 #define CONFIG_HOSTNAME                                x600
 #define CONFIG_UBI_PART                                ubi0
 #define CONFIG_UBIFS_VOLUME                    rootfs
 #define CONFIG_HOSTNAME                                x600
 #define CONFIG_UBI_PART                                ubi0
 #define CONFIG_UBIFS_VOLUME                    rootfs