[PATCH 1/2] stm32mp: remove the bootcount activation
Today the bootcount is not managed by the Linux kernel for STM32MP15 as we don't have driver to update the used backup register in TAMP and the recovery command still executes the normal bootcmd with 'altbootcmd=run bootcmd'.
So the bootcount feature is never used, the config CONFIG_BOOTCOUNT_LIMIT and the associated environment variable 'altbootcmd' can be removed to reduce the U-Boot size.
Each boards can re-enable this feature later in their defconfig, if it is needed, with the expected backend, for example CONFIG_BOOTCOUNT_GENERIC or CONFIG_BOOTCOUNT_ENV.
CC: Marek Vasut marex@denx.de Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---
arch/arm/mach-stm32mp/Kconfig | 8 -------- include/configs/stm32mp15_common.h | 1 - 2 files changed, 9 deletions(-)
diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index a6c7fc5bfd..2fa4ea4d5c 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -68,9 +68,7 @@ choice config TARGET_ST_STM32MP15x bool "STMicroelectronics STM32MP15x boards" select STM32MP15x - imply BOOTCOUNT_LIMIT imply BOOTSTAGE - imply CMD_BOOTCOUNT imply CMD_BOOTSTAGE imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE @@ -85,9 +83,7 @@ config TARGET_ST_STM32MP15x config TARGET_MICROGEA_STM32MP1 bool "Engicam MicroGEA STM32MP1 SOM" select STM32MP15x - imply BOOTCOUNT_LIMIT imply BOOTSTAGE - imply CMD_BOOTCOUNT imply CMD_BOOTSTAGE imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE @@ -112,9 +108,7 @@ config TARGET_MICROGEA_STM32MP1 config TARGET_ICORE_STM32MP1 bool "Engicam i.Core STM32MP1 SOM" select STM32MP15x - imply BOOTCOUNT_LIMIT imply BOOTSTAGE - imply CMD_BOOTCOUNT imply CMD_BOOTSTAGE imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE @@ -136,8 +130,6 @@ config TARGET_ICORE_STM32MP1 config TARGET_DH_STM32MP1_PDK2 bool "DH STM32MP1 PDK2" select STM32MP15x - imply BOOTCOUNT_LIMIT - imply CMD_BOOTCOUNT help Target the DH PDK2 development kit with STM32MP15x SoM.
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h index dab679f71e..8cf97d73ad 100644 --- a/include/configs/stm32mp15_common.h +++ b/include/configs/stm32mp15_common.h @@ -138,7 +138,6 @@ #endif
#define STM32MP_EXTRA \ - "altbootcmd=run bootcmd\0" \ "env_check=if env info -p -d -q; then env save; fi\0" \ "boot_net_usb_start=true\0"
Default value for CONFIG_SYS_BOOTCOUNT_SINGLEWORD and CONFIG_SYS_BOOTCOUNT_ADDR are only needed when CONFIG_BOOTCOUNT_GENERIC is used.
This patch avoids to define these configs when an other bootcount backend is activated, for example for CONFIG_BOOTCOUNT_ENV.
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com ---
arch/arm/mach-stm32mp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index 2fa4ea4d5c..2819944df3 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -194,7 +194,7 @@ config PRE_CON_BUF_SZ config BOOTSTAGE_STASH_ADDR default 0xC3000000
-if BOOTCOUNT_LIMIT +if BOOTCOUNT_GENERIC config SYS_BOOTCOUNT_SINGLEWORD default y
Hi Patrick
On 12/7/21 10:05 AM, Patrick Delaunay wrote:
Default value for CONFIG_SYS_BOOTCOUNT_SINGLEWORD and CONFIG_SYS_BOOTCOUNT_ADDR are only needed when CONFIG_BOOTCOUNT_GENERIC is used.
This patch avoids to define these configs when an other bootcount backend is activated, for example for CONFIG_BOOTCOUNT_ENV.
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com
arch/arm/mach-stm32mp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index 2fa4ea4d5c..2819944df3 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -194,7 +194,7 @@ config PRE_CON_BUF_SZ config BOOTSTAGE_STASH_ADDR default 0xC3000000
-if BOOTCOUNT_LIMIT +if BOOTCOUNT_GENERIC config SYS_BOOTCOUNT_SINGLEWORD default y
Reviewed-by: Patrice Chotard patrice.chotard@foss.st.com Thanks Patrice
Hi Patrick
On 12/7/21 10:05, Patrick Delaunay wrote:
Default value for CONFIG_SYS_BOOTCOUNT_SINGLEWORD and CONFIG_SYS_BOOTCOUNT_ADDR are only needed when CONFIG_BOOTCOUNT_GENERIC is used.
This patch avoids to define these configs when an other bootcount backend is activated, for example for CONFIG_BOOTCOUNT_ENV.
Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com
arch/arm/mach-stm32mp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index 2fa4ea4d5c..2819944df3 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -194,7 +194,7 @@ config PRE_CON_BUF_SZ config BOOTSTAGE_STASH_ADDR default 0xC3000000
-if BOOTCOUNT_LIMIT +if BOOTCOUNT_GENERIC config SYS_BOOTCOUNT_SINGLEWORD default y
Applied to u-boot-stm/master
Thanks Patrice
Hi Patrick
On 12/7/21 10:05 AM, Patrick Delaunay wrote:
Today the bootcount is not managed by the Linux kernel for STM32MP15 as we don't have driver to update the used backup register in TAMP and the recovery command still executes the normal bootcmd with 'altbootcmd=run bootcmd'.
So the bootcount feature is never used, the config CONFIG_BOOTCOUNT_LIMIT and the associated environment variable 'altbootcmd' can be removed to reduce the U-Boot size.
Each boards can re-enable this feature later in their defconfig, if it is needed, with the expected backend, for example CONFIG_BOOTCOUNT_GENERIC or CONFIG_BOOTCOUNT_ENV.
CC: Marek Vasut marex@denx.de Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com
arch/arm/mach-stm32mp/Kconfig | 8 -------- include/configs/stm32mp15_common.h | 1 - 2 files changed, 9 deletions(-)
diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index a6c7fc5bfd..2fa4ea4d5c 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -68,9 +68,7 @@ choice config TARGET_ST_STM32MP15x bool "STMicroelectronics STM32MP15x boards" select STM32MP15x
- imply BOOTCOUNT_LIMIT imply BOOTSTAGE
- imply CMD_BOOTCOUNT imply CMD_BOOTSTAGE imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE
@@ -85,9 +83,7 @@ config TARGET_ST_STM32MP15x config TARGET_MICROGEA_STM32MP1 bool "Engicam MicroGEA STM32MP1 SOM" select STM32MP15x
- imply BOOTCOUNT_LIMIT imply BOOTSTAGE
- imply CMD_BOOTCOUNT imply CMD_BOOTSTAGE imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE
@@ -112,9 +108,7 @@ config TARGET_MICROGEA_STM32MP1 config TARGET_ICORE_STM32MP1 bool "Engicam i.Core STM32MP1 SOM" select STM32MP15x
- imply BOOTCOUNT_LIMIT imply BOOTSTAGE
- imply CMD_BOOTCOUNT imply CMD_BOOTSTAGE imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE
@@ -136,8 +130,6 @@ config TARGET_ICORE_STM32MP1 config TARGET_DH_STM32MP1_PDK2 bool "DH STM32MP1 PDK2" select STM32MP15x
- imply BOOTCOUNT_LIMIT
- imply CMD_BOOTCOUNT help Target the DH PDK2 development kit with STM32MP15x SoM.
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h index dab679f71e..8cf97d73ad 100644 --- a/include/configs/stm32mp15_common.h +++ b/include/configs/stm32mp15_common.h @@ -138,7 +138,6 @@ #endif
#define STM32MP_EXTRA \
- "altbootcmd=run bootcmd\0" \ "env_check=if env info -p -d -q; then env save; fi\0" \ "boot_net_usb_start=true\0"
Reviewed-by: Patrice Chotard patrice.chotard@foss.st.com Thanks Patrice
Hi Patrick
On 12/7/21 10:05, Patrick Delaunay wrote:
Today the bootcount is not managed by the Linux kernel for STM32MP15 as we don't have driver to update the used backup register in TAMP and the recovery command still executes the normal bootcmd with 'altbootcmd=run bootcmd'.
So the bootcount feature is never used, the config CONFIG_BOOTCOUNT_LIMIT and the associated environment variable 'altbootcmd' can be removed to reduce the U-Boot size.
Each boards can re-enable this feature later in their defconfig, if it is needed, with the expected backend, for example CONFIG_BOOTCOUNT_GENERIC or CONFIG_BOOTCOUNT_ENV.
CC: Marek Vasut marex@denx.de Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com
arch/arm/mach-stm32mp/Kconfig | 8 -------- include/configs/stm32mp15_common.h | 1 - 2 files changed, 9 deletions(-)
diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index a6c7fc5bfd..2fa4ea4d5c 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -68,9 +68,7 @@ choice config TARGET_ST_STM32MP15x bool "STMicroelectronics STM32MP15x boards" select STM32MP15x
- imply BOOTCOUNT_LIMIT imply BOOTSTAGE
- imply CMD_BOOTCOUNT imply CMD_BOOTSTAGE imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE
@@ -85,9 +83,7 @@ config TARGET_ST_STM32MP15x config TARGET_MICROGEA_STM32MP1 bool "Engicam MicroGEA STM32MP1 SOM" select STM32MP15x
- imply BOOTCOUNT_LIMIT imply BOOTSTAGE
- imply CMD_BOOTCOUNT imply CMD_BOOTSTAGE imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE
@@ -112,9 +108,7 @@ config TARGET_MICROGEA_STM32MP1 config TARGET_ICORE_STM32MP1 bool "Engicam i.Core STM32MP1 SOM" select STM32MP15x
- imply BOOTCOUNT_LIMIT imply BOOTSTAGE
- imply CMD_BOOTCOUNT imply CMD_BOOTSTAGE imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE
@@ -136,8 +130,6 @@ config TARGET_ICORE_STM32MP1 config TARGET_DH_STM32MP1_PDK2 bool "DH STM32MP1 PDK2" select STM32MP15x
- imply BOOTCOUNT_LIMIT
- imply CMD_BOOTCOUNT help Target the DH PDK2 development kit with STM32MP15x SoM.
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h index dab679f71e..8cf97d73ad 100644 --- a/include/configs/stm32mp15_common.h +++ b/include/configs/stm32mp15_common.h @@ -138,7 +138,6 @@ #endif
#define STM32MP_EXTRA \
- "altbootcmd=run bootcmd\0" \ "env_check=if env info -p -d -q; then env save; fi\0" \ "boot_net_usb_start=true\0"
Applied to u-boot-stm/master
Thanks Patrice
participants (2)
-
Patrice CHOTARD -
Patrick Delaunay