Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ff5410d34b1ce3fa3785ecfd785704cfccc30938

Authored by Alex Kiernan
Committed by Tom Rini
1 parent 04c96ed2a6
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

Convert CONFIG_BOOTCOUNT_RAM to Kconfig 

This converts the following to Kconfig:
  CONFIG_BOOTCOUNT_RAM

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

Showing 15 changed files with 16 additions and 6 deletions Side-by-side Diff

... ... @@ -2270,8 +2270,6 @@
2270 2270 - bootcount support:
2271 2271 CONFIG_AT91SAM9XE
2272 2272 enable special bootcounter support on at91sam9xe based boards.
2273   - CONFIG_BOOTCOUNT_RAM
2274   - enable support for the bootcounter in RAM
2275 2273 CONFIG_BOOTCOUNT_I2C
2276 2274 enable support for the bootcounter on an i2c (like RTC) device.
2277 2275 CONFIG_SYS_I2C_RTC_ADDR = i2c chip address
configs/km_kirkwood_128m16_defconfig
Diff comments   View file @ ff5410d
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_BOOTP_GATEWAY=y
31 31 CONFIG_BOOTP_HOSTNAME=y
32 32 CONFIG_BOOTCOUNT_LIMIT=y
  33 +CONFIG_BOOTCOUNT_RAM=y
33 34 # CONFIG_MMC is not set
34 35 CONFIG_SPI_FLASH=y
35 36 CONFIG_SPI_FLASH_STMICRO=y
configs/km_kirkwood_defconfig
Diff comments   View file @ ff5410d
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_BOOTP_GATEWAY=y
31 31 CONFIG_BOOTP_HOSTNAME=y
32 32 CONFIG_BOOTCOUNT_LIMIT=y
  33 +CONFIG_BOOTCOUNT_RAM=y
33 34 # CONFIG_MMC is not set
34 35 CONFIG_SPI_FLASH=y
35 36 CONFIG_SPI_FLASH_STMICRO=y
configs/km_kirkwood_pci_defconfig
Diff comments   View file @ ff5410d
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_BOOTP_GATEWAY=y
31 31 CONFIG_BOOTP_HOSTNAME=y
32 32 CONFIG_BOOTCOUNT_LIMIT=y
  33 +CONFIG_BOOTCOUNT_RAM=y
33 34 # CONFIG_MMC is not set
34 35 CONFIG_SPI_FLASH=y
35 36 CONFIG_SPI_FLASH_STMICRO=y
configs/kmcoge5un_defconfig
Diff comments   View file @ ff5410d
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_BOOTP_GATEWAY=y
31 31 CONFIG_BOOTP_HOSTNAME=y
32 32 CONFIG_BOOTCOUNT_LIMIT=y
  33 +CONFIG_BOOTCOUNT_RAM=y
33 34 # CONFIG_MMC is not set
34 35 CONFIG_SPI_FLASH=y
35 36 CONFIG_SPI_FLASH_STMICRO=y
configs/kmnusa_defconfig
Diff comments   View file @ ff5410d
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_BOOTP_GATEWAY=y
31 31 CONFIG_BOOTP_HOSTNAME=y
32 32 CONFIG_BOOTCOUNT_LIMIT=y
  33 +CONFIG_BOOTCOUNT_RAM=y
33 34 # CONFIG_MMC is not set
34 35 CONFIG_SPI_FLASH=y
35 36 CONFIG_SPI_FLASH_STMICRO=y
configs/kmsugp1_defconfig
Diff comments   View file @ ff5410d
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_BOOTP_GATEWAY=y
31 31 CONFIG_BOOTP_HOSTNAME=y
32 32 CONFIG_BOOTCOUNT_LIMIT=y
  33 +CONFIG_BOOTCOUNT_RAM=y
33 34 # CONFIG_MMC is not set
34 35 CONFIG_SPI_FLASH=y
35 36 CONFIG_SPI_FLASH_STMICRO=y
configs/kmsuv31_defconfig
Diff comments   View file @ ff5410d
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_BOOTP_GATEWAY=y
31 31 CONFIG_BOOTP_HOSTNAME=y
32 32 CONFIG_BOOTCOUNT_LIMIT=y
  33 +CONFIG_BOOTCOUNT_RAM=y
33 34 # CONFIG_MMC is not set
34 35 CONFIG_SPI_FLASH=y
35 36 CONFIG_SPI_FLASH_STMICRO=y
configs/mgcoge3un_defconfig
Diff comments   View file @ ff5410d
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_BOOTP_GATEWAY=y
31 31 CONFIG_BOOTP_HOSTNAME=y
32 32 CONFIG_BOOTCOUNT_LIMIT=y
  33 +CONFIG_BOOTCOUNT_RAM=y
33 34 # CONFIG_MMC is not set
34 35 CONFIG_SPI_FLASH=y
35 36 CONFIG_SPI_FLASH_STMICRO=y
configs/portl2_defconfig
Diff comments   View file @ ff5410d
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_BOOTP_GATEWAY=y
31 31 CONFIG_BOOTP_HOSTNAME=y
32 32 CONFIG_BOOTCOUNT_LIMIT=y
  33 +CONFIG_BOOTCOUNT_RAM=y
33 34 # CONFIG_MMC is not set
34 35 CONFIG_SPI_FLASH=y
35 36 CONFIG_SPI_FLASH_STMICRO=y
configs/theadorable_debug_defconfig
Diff comments   View file @ ff5410d
... ... @@ -45,6 +45,7 @@
45 45 CONFIG_SPL_OF_TRANSLATE=y
46 46 CONFIG_SATA_MV=y
47 47 CONFIG_BOOTCOUNT_LIMIT=y
  48 +CONFIG_BOOTCOUNT_RAM=y
48 49 CONFIG_FPGA_ALTERA=y
49 50 CONFIG_DM_GPIO=y
50 51 # CONFIG_MMC is not set
drivers/bootcount/Kconfig
Diff comments   View file @ ff5410d
... ... @@ -40,6 +40,12 @@
40 40 So the Userspace Application must set the "upgrade_available"
41 41 and "bootcount" variable to 0, if a boot was successfully.
42 42  
  43 +config BOOTCOUNT_RAM
  44 + bool "Boot counter in RAM"
  45 + help
  46 + Store the bootcount in DRAM protected against against bit errors
  47 + due to short power loss or holding a system in RESET.
  48 +
43 49 endchoice
44 50  
45 51 config SYS_BOOTCOUNT_SINGLEWORD
include/configs/km/km_arm.h
Diff comments   View file @ ff5410d
... ... @@ -276,8 +276,6 @@
276 276 #define CONFIG_KM_RESERVED_PRAM 0x801000
277 277 /* address for the bootcount (taken from end of RAM) */
278 278 #define BOOTCOUNT_ADDR (CONFIG_KM_RESERVED_PRAM)
279   -/* Use generic bootcount RAM driver */
280   -#define CONFIG_BOOTCOUNT_RAM
281 279  
282 280 /* enable POST tests */
283 281 #define CONFIG_POST (CONFIG_SYS_POST_MEM_REGIONS)
include/configs/theadorable.h
Diff comments   View file @ ff5410d
... ... @@ -82,7 +82,6 @@
82 82 /*
83 83 * Bootcounter
84 84 */
85   -#define CONFIG_BOOTCOUNT_RAM
86 85 /* Max size of RAM minus BOOTCOUNT_ADDR is the bootcounter address */
87 86 #define BOOTCOUNT_ADDR 0x1000
88 87  
scripts/config_whitelist.txt
Diff comments   View file @ ff5410d
... ... @@ -147,7 +147,6 @@
147 147 CONFIG_BOOTBLOCK
148 148 CONFIG_BOOTCOUNT_ALEN
149 149 CONFIG_BOOTCOUNT_I2C
150   -CONFIG_BOOTCOUNT_RAM
151 150 CONFIG_BOOTFILE
152 151 CONFIG_BOOTMAPSZ
153 152 CONFIG_BOOTMODE