Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 39bcbb7740b099b487b20ff6e345eb790a85712c

Authored by Tom Rini
1 parent e9a98ba312
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

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>

Showing 38 changed files with 28 additions and 48 deletions Side-by-side Diff

configs/calimain_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -23,6 +23,7 @@
23 23 CONFIG_ENV_IS_IN_FLASH=y
24 24 CONFIG_BOOTP_DNS=y
25 25 CONFIG_BOOTCOUNT_LIMIT=y
  26 +CONFIG_SYS_BOOTCOUNT_ADDR=0x01C23000
26 27 # CONFIG_MMC is not set
27 28 CONFIG_MTD_NOR_FLASH=y
28 29 CONFIG_SYS_NS16550=y
configs/dh_imx6_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_ENV_IS_IN_SPI_FLASH=y
36 36 CONFIG_DWC_AHSATA=y
37 37 CONFIG_BOOTCOUNT_LIMIT=y
  38 +CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000
38 39 CONFIG_SPI_FLASH=y
39 40 CONFIG_SPI_FLASH_SPANSION=y
40 41 CONFIG_PHYLIB=y
configs/ge_b450v3_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -29,6 +29,7 @@
29 29 CONFIG_BOOTCOUNT_LIMIT=y
30 30 CONFIG_BOOTCOUNT_EXT=y
31 31 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
  32 +CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
32 33 CONFIG_SPI_FLASH=y
33 34 CONFIG_SPI_FLASH_STMICRO=y
34 35 CONFIG_NETDEVICES=y
configs/ge_b650v3_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -29,6 +29,7 @@
29 29 CONFIG_BOOTCOUNT_LIMIT=y
30 30 CONFIG_BOOTCOUNT_EXT=y
31 31 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
  32 +CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
32 33 CONFIG_SPI_FLASH=y
33 34 CONFIG_SPI_FLASH_STMICRO=y
34 35 CONFIG_NETDEVICES=y
configs/ge_b850v3_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -29,6 +29,7 @@
29 29 CONFIG_BOOTCOUNT_LIMIT=y
30 30 CONFIG_BOOTCOUNT_EXT=y
31 31 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="1:5"
  32 +CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
32 33 CONFIG_SPI_FLASH=y
33 34 CONFIG_SPI_FLASH_STMICRO=y
34 35 CONFIG_NETDEVICES=y
configs/highbank_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -17,6 +17,7 @@
17 17 CONFIG_SCSI_AHCI=y
18 18 CONFIG_BOOTCOUNT_LIMIT=y
19 19 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
  20 +CONFIG_SYS_BOOTCOUNT_ADDR=0xfff3cf0c
20 21 # CONFIG_MMC is not set
21 22 CONFIG_SCSI=y
22 23 CONFIG_OF_LIBFDT=y
configs/ids8313_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -36,6 +36,7 @@
36 36 CONFIG_BOOTP_SUBNETMASK=y
37 37 CONFIG_BOOTCOUNT_LIMIT=y
38 38 CONFIG_BOOTCOUNT_I2C=y
  39 +CONFIG_SYS_BOOTCOUNT_ADDR=0x9
39 40 # CONFIG_MMC is not set
40 41 CONFIG_MTD_NOR_FLASH=y
41 42 CONFIG_PHYLIB=y
configs/kmcoge4_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_BOOTP_GATEWAY=y
36 36 CONFIG_BOOTP_HOSTNAME=y
37 37 CONFIG_BOOTCOUNT_LIMIT=y
  38 +CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020
38 39 # CONFIG_MMC is not set
39 40 CONFIG_SPI_FLASH=y
40 41 CONFIG_SPI_FLASH_SPANSION=y
configs/kmcoge5ne_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -28,6 +28,7 @@
28 28 CONFIG_BOOTP_GATEWAY=y
29 29 CONFIG_BOOTP_HOSTNAME=y
30 30 CONFIG_BOOTCOUNT_LIMIT=y
  31 +CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8
31 32 # CONFIG_MMC is not set
32 33 CONFIG_MTD_NOR_FLASH=y
33 34 # CONFIG_PCI is not set
configs/kmeter1_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -27,6 +27,7 @@
27 27 CONFIG_BOOTP_GATEWAY=y
28 28 CONFIG_BOOTP_HOSTNAME=y
29 29 CONFIG_BOOTCOUNT_LIMIT=y
  30 +CONFIG_SYS_BOOTCOUNT_ADDR=0xE011BFF8
30 31 # CONFIG_MMC is not set
31 32 CONFIG_MTD_NOR_FLASH=y
32 33 # CONFIG_PCI is not set
configs/kmlion1_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_BOOTP_GATEWAY=y
36 36 CONFIG_BOOTP_HOSTNAME=y
37 37 CONFIG_BOOTCOUNT_LIMIT=y
  38 +CONFIG_SYS_BOOTCOUNT_ADDR=0xFB000020
38 39 # CONFIG_MMC is not set
39 40 CONFIG_SPI_FLASH=y
40 41 CONFIG_SPI_FLASH_SPANSION=y
configs/kmopti2_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -27,6 +27,7 @@
27 27 CONFIG_BOOTP_GATEWAY=y
28 28 CONFIG_BOOTP_HOSTNAME=y
29 29 CONFIG_BOOTCOUNT_LIMIT=y
  30 +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
30 31 # CONFIG_MMC is not set
31 32 CONFIG_MTD_NOR_FLASH=y
32 33 # CONFIG_PCI is not set
configs/kmsupx5_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -27,6 +27,7 @@
27 27 CONFIG_BOOTP_GATEWAY=y
28 28 CONFIG_BOOTP_HOSTNAME=y
29 29 CONFIG_BOOTCOUNT_LIMIT=y
  30 +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
30 31 # CONFIG_MMC is not set
31 32 CONFIG_MTD_NOR_FLASH=y
32 33 # CONFIG_PCI is not set
configs/kmtegr1_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -29,6 +29,7 @@
29 29 CONFIG_BOOTP_GATEWAY=y
30 30 CONFIG_BOOTP_HOSTNAME=y
31 31 CONFIG_BOOTCOUNT_LIMIT=y
  32 +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
32 33 # CONFIG_MMC is not set
33 34 CONFIG_MTD_NOR_FLASH=y
34 35 # CONFIG_PCI is not set
configs/kmtepr2_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -27,6 +27,7 @@
27 27 CONFIG_BOOTP_GATEWAY=y
28 28 CONFIG_BOOTP_HOSTNAME=y
29 29 CONFIG_BOOTCOUNT_LIMIT=y
  30 +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
30 31 # CONFIG_MMC is not set
31 32 CONFIG_MTD_NOR_FLASH=y
32 33 # CONFIG_PCI is not set
configs/kmvect1_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -28,6 +28,7 @@
28 28 CONFIG_BOOTP_GATEWAY=y
29 29 CONFIG_BOOTP_HOSTNAME=y
30 30 CONFIG_BOOTCOUNT_LIMIT=y
  31 +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
31 32 # CONFIG_MMC is not set
32 33 CONFIG_MTD_NOR_FLASH=y
33 34 # CONFIG_PCI is not set
configs/mx53ppd_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -25,6 +25,7 @@
25 25 CONFIG_BOOTCOUNT_LIMIT=y
26 26 CONFIG_BOOTCOUNT_EXT=y
27 27 CONFIG_SYS_BOOTCOUNT_EXT_DEVPART="0:5"
  28 +CONFIG_SYS_BOOTCOUNT_ADDR=0x7000A000
28 29 CONFIG_NETDEVICES=y
29 30 CONFIG_RTC_S35392A=y
30 31 CONFIG_USB=y
configs/socfpga_is1_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -34,6 +34,7 @@
34 34 CONFIG_SPL_DM=y
35 35 CONFIG_SPL_DM_SEQ_ALIAS=y
36 36 CONFIG_BOOTCOUNT_LIMIT=y
  37 +CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8
37 38 CONFIG_FPGA_SOCFPGA=y
38 39 CONFIG_DM_GPIO=y
39 40 CONFIG_DWAPB_GPIO=y
configs/socfpga_sr1500_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -38,6 +38,7 @@
38 38 CONFIG_SPL_DM=y
39 39 CONFIG_SPL_DM_SEQ_ALIAS=y
40 40 CONFIG_BOOTCOUNT_LIMIT=y
  41 +CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8
41 42 CONFIG_FPGA_SOCFPGA=y
42 43 CONFIG_DM_GPIO=y
43 44 CONFIG_DWAPB_GPIO=y
configs/suvd3_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -27,6 +27,7 @@
27 27 CONFIG_BOOTP_GATEWAY=y
28 28 CONFIG_BOOTP_HOSTNAME=y
29 29 CONFIG_BOOTCOUNT_LIMIT=y
  30 +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
30 31 # CONFIG_MMC is not set
31 32 CONFIG_MTD_NOR_FLASH=y
32 33 # CONFIG_PCI is not set
configs/tqma6s_wru4_mmc_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -34,6 +34,7 @@
34 34 CONFIG_CMD_FS_GENERIC=y
35 35 CONFIG_ENV_IS_IN_MMC=y
36 36 CONFIG_BOOTCOUNT_LIMIT=y
  37 +CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000
37 38 CONFIG_LED_STATUS=y
38 39 CONFIG_LED_STATUS0=y
39 40 CONFIG_LED_STATUS_BIT=0
configs/tuge1_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -27,6 +27,7 @@
27 27 CONFIG_BOOTP_GATEWAY=y
28 28 CONFIG_BOOTP_HOSTNAME=y
29 29 CONFIG_BOOTCOUNT_LIMIT=y
  30 +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
30 31 # CONFIG_MMC is not set
31 32 CONFIG_MTD_NOR_FLASH=y
32 33 # CONFIG_PCI is not set
configs/tuxx1_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -27,6 +27,7 @@
27 27 CONFIG_BOOTP_GATEWAY=y
28 28 CONFIG_BOOTP_HOSTNAME=y
29 29 CONFIG_BOOTCOUNT_LIMIT=y
  30 +CONFIG_SYS_BOOTCOUNT_ADDR=0xE0113FF8
30 31 # CONFIG_MMC is not set
31 32 CONFIG_MTD_NOR_FLASH=y
32 33 # CONFIG_PCI is not set
configs/x600_defconfig
Diff comments   View file @ 39bcbb7
... ... @@ -38,6 +38,7 @@
38 38 CONFIG_CMD_UBI=y
39 39 CONFIG_ENV_IS_IN_FLASH=y
40 40 CONFIG_BOOTCOUNT_LIMIT=y
  41 +CONFIG_SYS_BOOTCOUNT_ADDR=0xD2801FF8
41 42 CONFIG_FPGA_XILINX=y
42 43 CONFIG_SYS_I2C_DW=y
43 44 # CONFIG_MMC is not set
drivers/bootcount/Kconfig
Diff comments   View file @ 39bcbb7
... ... @@ -111,8 +111,10 @@
111 111  
112 112 config SYS_BOOTCOUNT_ADDR
113 113 hex "RAM address used for reading and writing the boot counter"
114   - default 0x7000A000
115   - depends on BOOTCOUNT_EXT
  114 + default 0x44E3E000 if BOOTCOUNT_AM33XX
  115 + default 0xE0115FF8 if ARCH_LS1043A || ARCH_LS1021A
  116 + depends on BOOTCOUNT_AM33XX || BOOTCOUNT_GENERIC || BOOTCOUNT_EXT || \
  117 + BOOTCOUNT_I2C
116 118 help
117 119 Set the address used for reading and writing the boot counter.
118 120  
drivers/bootcount/bootcount.c
Diff comments   View file @ 39bcbb7
... ... @@ -8,22 +8,7 @@
8 8 #include <bootcount.h>
9 9 #include <linux/compiler.h>
10 10  
11   -/*
12   - * Only override CONFIG_SYS_BOOTCOUNT_ADDR if not already defined. This
13   - * way, some boards can define it directly in their config header.
14   - */
15   -#if !defined(CONFIG_SYS_BOOTCOUNT_ADDR)
16   -
17   -#if defined(CONFIG_QE)
18   -#include <linux/immap_qe.h>
19   -#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_IMMR + 0x110000 + \
20   - QE_MURAM_SIZE - 2 * sizeof(u32))
21   -#endif /* defined(CONFIG_QE) */
22   -
23   -#endif /* !defined(CONFIG_SYS_BOOTCOUNT_ADDR) */
24   -
25 11 /* Now implement the generic default functions */
26   -#if defined(CONFIG_SYS_BOOTCOUNT_ADDR)
27 12 __weak void bootcount_store(ulong a)
28 13 {
29 14 void *reg = (void *)CONFIG_SYS_BOOTCOUNT_ADDR;
... ... @@ -54,5 +39,4 @@
54 39 return raw_bootcount_load(reg);
55 40 #endif /* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD) */
56 41 }
57   -#endif /* defined(CONFIG_SYS_BOOTCOUNT_ADDR) */
include/configs/brppt1.h
Diff comments   View file @ 39bcbb7
... ... @@ -20,9 +20,6 @@
20 20 #define CONFIG_LCD_DT_SIMPLEFB
21 21 #define LCD_BPP LCD_COLOR32
22 22  
23   -/* Bootcount using the RTC block */
24   -#define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000
25   -
26 23 /* memory */
27 24 #define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024)
28 25  
include/configs/calimain.h
Diff comments   View file @ 39bcbb7
... ... @@ -274,7 +274,6 @@
274 274 #define CONFIG_SYS_INIT_SP_ADDR (0x8001ff00)
275 275  
276 276 #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */
277   -#define CONFIG_SYS_BOOTCOUNT_ADDR DAVINCI_RTC_BASE
278 277  
279 278 #ifndef __ASSEMBLY__
280 279 int calimain_get_osc_freq(void);
include/configs/dh_imx6.h
Diff comments   View file @ 39bcbb7
... ... @@ -42,7 +42,6 @@
42 42 #define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M)
43 43  
44 44 /* Bootcounter */
45   -#define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR
46 45 #define CONFIG_SYS_BOOTCOUNT_BE
47 46  
48 47 /* FEC ethernet */
include/configs/ge_bx50v3.h
Diff comments   View file @ 39bcbb7
... ... @@ -263,7 +263,5 @@
263 263  
264 264 #define CONFIG_BCH
265 265  
266   -#define CONFIG_SYS_BOOTCOUNT_ADDR 0x7000A000
267   -
268 266 #endif /* __GE_BX50V3_CONFIG_H */
include/configs/highbank.h
Diff comments   View file @ 39bcbb7
... ... @@ -25,7 +25,6 @@
25 25 #define CONFIG_CONS_INDEX 0
26 26  
27 27 #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */
28   -#define CONFIG_SYS_BOOTCOUNT_ADDR 0xfff3cf0c
29 28  
30 29 #define CONFIG_MISC_INIT_R
31 30 #define CONFIG_SCSI_AHCI_PLAT
include/configs/ids8313.h
Diff comments   View file @ 39bcbb7
... ... @@ -508,9 +508,6 @@
508 508 /* UBI Support */
509 509 #define CONFIG_MTD_PARTITIONS
510 510  
511   -/* bootcount support */
512   -#define CONFIG_SYS_BOOTCOUNT_ADDR 0x9
513   -
514 511 #define CONFIG_IMAGE_FORMAT_LEGACY
515 512  
516 513 #endif /* __CONFIG_H */
include/configs/km/kmp204x-common.h
Diff comments   View file @ 39bcbb7
... ... @@ -188,9 +188,6 @@
188 188 #define CONFIG_SYS_BR1_PRELIM CONFIG_SYS_QRIO_BR_PRELIM /* QRIO Base Address */
189 189 #define CONFIG_SYS_OR1_PRELIM CONFIG_SYS_QRIO_OR_PRELIM /* QRIO Options */
190 190  
191   -/* bootcounter in QRIO */
192   -#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_QRIO_BASE + 0x20)
193   -
194 191 #define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */
195 192 #define CONFIG_MISC_INIT_F
196 193 #define CONFIG_MISC_INIT_R
include/configs/socfpga_is1.h
Diff comments   View file @ 39bcbb7
... ... @@ -30,8 +30,6 @@
30 30 /*
31 31 * Bootcounter
32 32 */
33   -/* last 2 lwords in OCRAM */
34   -#define CONFIG_SYS_BOOTCOUNT_ADDR 0xfffffff8
35 33 #define CONFIG_SYS_BOOTCOUNT_BE
36 34  
37 35 #endif /* __CONFIG_SOCFPGA_IS1_H__ */
include/configs/socfpga_sr1500.h
Diff comments   View file @ 39bcbb7
... ... @@ -29,8 +29,6 @@
29 29 /*
30 30 * Bootcounter
31 31 */
32   -/* last 2 lwords in OCRAM */
33   -#define CONFIG_SYS_BOOTCOUNT_ADDR 0xfffffff8
34 32 #define CONFIG_SYS_BOOTCOUNT_BE
35 33  
36 34 /* Environment setting for SPI flash */
include/configs/ti_am335x_common.h
Diff comments   View file @ 39bcbb7
... ... @@ -38,13 +38,6 @@
38 38  
39 39 #define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */
40 40 /*
41   - * RTC related defines. To use bootcount you must set bootlimit in the
42   - * environment to a non-zero value and enable CONFIG_BOOTCOUNT_LIMIT
43   - * in the board config.
44   - */
45   -#define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000
46   -
47   -/*
48 41 * SPL related defines. The Public RAM memory map the ROM defines the
49 42 * area between 0x402F0400 and 0x4030B800 as a download area and
50 43 * 0x4030B800 to 0x4030CE00 as a public stack area. The ROM also
include/configs/tqma6_wru4.h
Diff comments   View file @ 39bcbb7
... ... @@ -34,7 +34,6 @@
34 34 /* LED */
35 35  
36 36 /* Bootcounter */
37   -#define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR
38 37 #define CONFIG_SYS_BOOTCOUNT_BE
39 38  
40 39 #endif /* __CONFIG_TQMA6_WRU4_H */
include/configs/x600.h
Diff comments   View file @ 39bcbb7
... ... @@ -116,10 +116,6 @@
116 116 #define CONFIG_SYS_MALLOC_LEN (8 << 20)
117 117 #define CONFIG_SYS_LOAD_ADDR 0x00800000
118 118  
119   -/* Use last 2 lwords in internal SRAM for bootcounter */
120   -#define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SRAM_BASE + \
121   - CONFIG_SRAM_SIZE)
122   -
123 119 #define CONFIG_HOSTNAME x600
124 120 #define CONFIG_UBI_PART ubi0
125 121 #define CONFIG_UBIFS_VOLUME rootfs