]> git.baikalelectronics.ru Git - uboot.git/commitdiff
Convert CONFIG_SYS_BOOTCOUNT_LE et al to Kconfig
authorTom Rini <trini@konsulko.com>
Sat, 25 Jun 2022 15:02:49 +0000 (11:02 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 7 Jul 2022 18:01:09 +0000 (14:01 -0400)
This converts the following to Kconfig:
   CONFIG_SYS_BOOTCOUNT_LE
   CONFIG_SYS_BOOTCOUNT_BE

Signed-off-by: Tom Rini <trini@konsulko.com>
32 files changed:
configs/am335x_boneblack_vboot_defconfig
configs/am335x_evm_defconfig
configs/am335x_evm_spiboot_defconfig
configs/am335x_hs_evm_defconfig
configs/am335x_hs_evm_uart_defconfig
configs/am335x_sl50_defconfig
configs/chiliboard_defconfig
configs/dh_imx6_defconfig
configs/kmcent2_defconfig
configs/kmcoge5ne_defconfig
configs/kmeter1_defconfig
configs/kmsupx5_defconfig
configs/kmtegr1_defconfig
configs/pg_wcom_expu1_defconfig
configs/pg_wcom_expu1_update_defconfig
configs/pg_wcom_seli8_defconfig
configs/pg_wcom_seli8_update_defconfig
configs/socfpga_is1_defconfig
configs/socfpga_sr1500_defconfig
configs/tuge1_defconfig
drivers/bootcount/Kconfig
include/bootcount.h
include/configs/am335x_evm.h
include/configs/am335x_guardian.h
include/configs/am335x_sl50.h
include/configs/chiliboard.h
include/configs/dh_imx6.h
include/configs/highbank.h
include/configs/km/pg-wcom-ls102xa.h
include/configs/socfpga_is1.h
include/configs/socfpga_sr1500.h
include/configs/tqma6_wru4.h

index b5ba2ccda5c973da2bc2da575215deffaca9f646..ab74bdb2f884efca9c113ff6ca46791fa5d41283 100644 (file)
@@ -54,6 +54,7 @@ CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 # CONFIG_SPL_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
index c7dbd3c5702d6a862d229047ae561f87f4ff141d..de13af62be2d744062340e1d0b5789205817a14e 100644 (file)
@@ -63,6 +63,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_CLK=y
 CONFIG_CLK_CDCE9XX=y
 CONFIG_CLK_TI_CTRL=y
index 00e80a89dedfc1f3b25fb5298d7ebf5e0ce6f89f..bcead2e5c5fb4aa04bb9d3775b1a3b51230dae2b 100644 (file)
@@ -53,6 +53,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_CLK=y
 CONFIG_CLK_CDCE9XX=y
 CONFIG_DFU_TFTP=y
index ef0a09877c1073721353c000476a95de09d79d1e..4d0ee46ac70f7aae4668319f2fc6abd9f6321bea 100644 (file)
@@ -51,6 +51,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_CLK=y
 CONFIG_CLK_CDCE9XX=y
 CONFIG_DFU_MMC=y
index d7ea5a31cd1dd1d8d57c439288babab5a179a016..9a86e869aa1faa0756947909b3cfba93a8942cf6 100644 (file)
@@ -52,6 +52,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_CLK=y
 CONFIG_CLK_CDCE9XX=y
 CONFIG_DFU_MMC=y
index 1338190e9ff469d71d4099cdc2a8f7181a98d79c..8808e1ff6583fcee33fb15e8c19a0fc100dc8d8b 100644 (file)
@@ -68,6 +68,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x50
index 849d751f08e8c07a77bb4df4288fbace3139e07d..05569061429942af347f654bae664353b6d4661c 100644 (file)
@@ -54,6 +54,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MISC=y
index 7cb4f417e7eb7a3da9326332c6955c4dd0ac86c8..051816f719fef65019dfe4605085a5e69f4518d8 100644 (file)
@@ -69,6 +69,7 @@ CONFIG_BOUNCE_BUFFER=y
 CONFIG_DWC_AHSATA=y
 CONFIG_LBA48=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
index bcecb88e4d10fc2c3a4329e16a58b5d13677e4d8..ee900f5d9cd3c889a1c033a48188bdd2e84e32db 100644 (file)
@@ -57,6 +57,7 @@ CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="fm1-mac5"
 CONFIG_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_FSL_CAAM=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_CHIP_SELECTS_PER_CTRL=2
index 924f9ac46377f47a314898182620ee0455a0fbda..3b73fbc812cb02747c1a19fbfe76eccbb166bb9c 100644 (file)
@@ -200,6 +200,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_MEM=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xF0001001
 CONFIG_SYS_OR0_PRELIM=0xF0000E55
index dfa2500a29a5fcff576bfae362e567db8a203073..310278d611273c72b9ca849a4ab1963f214cad44 100644 (file)
@@ -169,6 +169,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_MEM=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xF0001001
 CONFIG_SYS_OR0_PRELIM=0xF0000E55
index 221335da8eae7c352fd33b2f679162c6070f2e39..027bb73b57c6c573b36d9389392fa4d427ca765e 100644 (file)
@@ -160,6 +160,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_MEM=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xF0001001
 CONFIG_SYS_OR0_PRELIM=0xF0000E55
index f1791a0fc0e89d97df62ce2bb5a95c9e0856c694..19cb1e85b04c9cc23666ef37f63c80e2de91d21e 100644 (file)
@@ -161,6 +161,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_MEM=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xF0001001
 CONFIG_SYS_OR0_PRELIM=0xF0000E55
index 4b205e13831cfccbab643f68f04839f125773395..a84e0cdd9eb16a5cfebc920cf215cd13ca0918e6 100644 (file)
@@ -70,6 +70,7 @@ CONFIG_ETHPRIME="ethernet@2d90000"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DDR_CLK_FREQ=50000000
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_SYS_I2C_LEGACY=y
index 98f3dcc4545ae3d80d1900bbd78cc38eb48119bb..f04c3ac614766d79b64d87a8bbf60226c4487f41 100644 (file)
@@ -68,6 +68,7 @@ CONFIG_ETHPRIME="ethernet@2d90000"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DDR_CLK_FREQ=50000000
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_SYS_I2C_LEGACY=y
index ce3e7eb179b1d631e7cde8ca6ec92caa4d98f82a..4380d883635139fec1b2559df4d4da69a5475de7 100644 (file)
@@ -70,6 +70,7 @@ CONFIG_ETHPRIME="ethernet@2d90000"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DDR_CLK_FREQ=50000000
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_SYS_I2C_LEGACY=y
index 623afa33877e76c97f4756716657c2908de35158..ca05e25d47e2b4e3240b54879aca0c7157088e70 100644 (file)
@@ -68,6 +68,7 @@ CONFIG_ETHPRIME="ethernet@2d90000"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DDR_CLK_FREQ=50000000
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_SYS_I2C_LEGACY=y
index c3b6368f61710c70265ade470146c31596e3b07c..958adfe25a43893fb63cfc23997424d8258e4264 100644 (file)
@@ -52,6 +52,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_ARP_TIMEOUT=500
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
index 53d6b82972f9dae4801ae97b037743f4bfaf64fc..def2ee8dbc14b91a08d9cc59281b302c390c70da 100644 (file)
@@ -56,6 +56,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
index 3c2a7a34d1c4b13f30b6387fb5b247ecf0dd0c83..1bd48cb82a145740675ede5be3d2b3527c780a6e 100644 (file)
@@ -160,6 +160,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_MEM=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xF0001001
 CONFIG_SYS_OR0_PRELIM=0xF0000E55
index 66ce4cc29baafffd1b1d949c8dac62cdec3ae898..e918f74694640678bf81bc1154be3f8c9891d789 100644 (file)
@@ -237,4 +237,15 @@ config SYS_BOOTCOUNT_MAGIC
        help
          Set the magic value used for the boot counter.
 
+choice
+       prompt "Endianness of bootcount accessors"
+       default SYS_BOOTCOUNT_LE
+
+config SYS_BOOTCOUNT_LE
+       bool "Little endian accessors"
+
+config SYS_BOOTCOUNT_BE
+       bool "Big endian accessors"
+
+endchoice
 endif
index fccee7e15bf73c2ec9605fbfa2eee3a1a26702c2..bfa5d4642764777dbfd37a51899b4df6ec5efecd 100644 (file)
@@ -72,14 +72,6 @@ ulong bootcount_load(void);
 
 #if defined(CONFIG_SPL_BOOTCOUNT_LIMIT) || defined(CONFIG_TPL_BOOTCOUNT_LIMIT) || defined(CONFIG_BOOTCOUNT_LIMIT)
 
-#if !defined(CONFIG_SYS_BOOTCOUNT_LE) && !defined(CONFIG_SYS_BOOTCOUNT_BE)
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define CONFIG_SYS_BOOTCOUNT_LE
-# else
-#  define CONFIG_SYS_BOOTCOUNT_BE
-# endif
-#endif
-
 #ifdef CONFIG_SYS_BOOTCOUNT_LE
 static inline void raw_bootcount_store(volatile u32 *addr, u32 data)
 {
index 754bcc3304b99037e3c033846afe5c36f757ce55..f0a979423dea78abdf989ef8886109a4f9273ff5 100644 (file)
 /* PMIC support */
 #define CONFIG_POWER_TPS65910
 
-/* SPL */
-#ifndef CONFIG_NOR_BOOT
-/* Bootcount using the RTC block */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
-/* USB gadget RNDIS */
-#endif
-
 #ifdef CONFIG_MTD_RAW_NAND
 /* NAND: device related configs */
 /* NAND: driver related configs */
index 93fea95996cc3fef726a1e61cca77619502de69e..356c21a1b0ad2c5059885bf34c8330c24433159f 100644 (file)
@@ -93,9 +93,6 @@
 #define CONFIG_SYS_NS16550_COM5                0x481a8000      /* UART4 */
 #define CONFIG_SYS_NS16550_COM6                0x481aa000      /* UART5 */
 
-/* Bootcount using the RTC block */
-#define CONFIG_SYS_BOOTCOUNT_LE
-
 #ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_ECCPOS  {   2,   3,   4,   5,   6,   7,   8,   9, \
                         10,  11,  12,  13,  14,  15,  16,  17,  18,  19, \
index 79d9d03a176bc5fdda0cd5e53823b576633e4ce7..4289836bc3f61a556e83c41197fa14317883d855 100644 (file)
@@ -50,9 +50,6 @@
 
 /* SPL */
 
-/* Bootcount using the RTC block */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 /* Network. */
 
 #endif /* ! __CONFIG_AM335X_SL50_H */
index 97adb835359194c23f74d88fc91ea2b7451c27e2..965eba58b311d49b9b477f41fa569cb24dac8d65 100644 (file)
 #define CONFIG_SYS_NS16550_COM6                0x481aa000      /* UART5 */
 
 /* SPL */
-/* Bootcount using the RTC block */
-#define CONFIG_SYS_BOOTCOUNT_BE
 
 /* NAND: device related configs */
 /* NAND: driver related configs */
index f770b35528693b66f9beeb40c20011cc0c596eb1..79424647f61805a15bb41779a9da98ec7ca49b8f 100644 (file)
@@ -26,9 +26,6 @@
 
 /* Miscellaneous configurable options */
 
-/* Bootcounter */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       3
index 1fc38cfa0cc6bf0136bd49570cbf36e75fc5c7b9..bb6cc957261a82a6ee15eaf6a637b8264169244d 100644 (file)
@@ -14,8 +14,6 @@
 
 #define CONFIG_PL011_CLOCK             150000000
 
-#define CONFIG_SYS_BOOTCOUNT_LE                /* Use little-endian accessors */
-
 /*
  * Miscellaneous configurable options
  */
index a12923386a5fa85ea517197855fe585248378a60..dd6747388c74bb3e1d12e1a3bcd173087089f485 100644 (file)
 
 #define CONFIG_SYS_MONITOR_LEN         0x100000     /* 1Mbyte */
 
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 /*
  * Environment
  */
index 468a35d4ff9b243a83faba4a346259e638500deb..ad271791206d546d4a0ef8109040c028f7d61658 100644 (file)
@@ -16,9 +16,4 @@
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
-/*
- * Bootcounter
- */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 #endif /* __CONFIG_SOCFPGA_IS1_H__ */
index 62c1bc7408a6c486d1b710ed4e47cd11c0e8454e..432144cb40ce0170f8ab6f0eef9ce97ba14a3406 100644 (file)
 /* Enable SPI NOR flash reset, needed for SPI booting */
 #define CONFIG_SPI_N25Q256A_RESET
 
-/*
- * Bootcounter
- */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 /* Environment setting for SPI flash */
 
 /* The rest of the configuration is shared */
index 90db96599c1ba59e3842f8e9afd04e8121ca40f7..999130600ccb4cd44c74db76819ade186acb0fe5 100644 (file)
@@ -24,9 +24,6 @@
 
 /* LED */
 
-/* Bootcounter */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 /* I2C */
 
 #endif /* __CONFIG_TQMA6_WRU4_H */