Skip to contentSkip to conversation

ARM: stm32: Enable assorted ST specific commands on DHSOM

PATCH In review Marek Vasut 3 participants 12 messages Dec 6, 2022 – Dec 7, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ARM: stm32: Enable assorted ST specific commands on DHSOM

Enable the stm32prog, stm32key, stboard commands on DHSOM. Those can be used e.g. to implement verified boot.

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
 configs/stm32mp15_dhcom_basic_defconfig | 4 ++++
 configs/stm32mp15_dhcor_basic_defconfig | 4 ++++
 2 files changed, 8 insertions(+)
configs/stm32mp15_dhcom_basic_defconfig +4 -0
index fd261d96105..92ccbb70939 100644
@@ -11,7 +11,11 @@ CONFIG_SPL_MMC=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0x5C00A14C
 CONFIG_SPL=y
+CONFIG_CMD_STM32KEY=y
+CONFIG_CMD_STBOARD=y
 CONFIG_TARGET_DH_STM32MP1_PDK2=y
+CONFIG_CMD_STM32PROG=y
+CONFIG_CMD_STM32PROG_OTP=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 # CONFIG_ARMV7_VIRT is not set
configs/stm32mp15_dhcor_basic_defconfig +4 -0
index 947bc6b502e..306221404df 100644
@@ -11,7 +11,11 @@ CONFIG_SPL_MMC=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0x5C00A14C
 CONFIG_SPL=y
+CONFIG_CMD_STM32KEY=y
+CONFIG_CMD_STBOARD=y
 CONFIG_TARGET_DH_STM32MP1_PDK2=y
+CONFIG_CMD_STM32PROG=y
+CONFIG_CMD_STM32PROG_OTP=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 # CONFIG_ARMV7_VIRT is not set
Signature · 1 line
2.35.1
#1 lore raw

PATCH 2/3 ARM: stm32: Increment boot counter in SPL on DHSOM

Increment the boot counter already in U-Boot SPL instead of incrementing it only later in U-Boot proper. This can be used by SPL to boot either of two U-Boot copies and improve redundancy of software on the platform, e.g. in case of full A/B update strategy.

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
 configs/stm32mp15_dhcom_basic_defconfig | 1 +
 configs/stm32mp15_dhcor_basic_defconfig | 1 +
 2 files changed, 2 insertions(+)
configs/stm32mp15_dhcom_basic_defconfig +1 -0
index 92ccbb70939..f1eb022bc66 100644
@@ -36,6 +36,7 @@ CONFIG_CONSOLE_MUX=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_FOOTPRINT_LIMIT=y
 CONFIG_SPL_MAX_FOOTPRINT=0x3db00
+CONFIG_SPL_BOOTCOUNT_LIMIT=y
 CONFIG_SPL_LEGACY_IMAGE_FORMAT=y
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_STACK=0x30000000
configs/stm32mp15_dhcor_basic_defconfig +1 -0
index 306221404df..2e9f2049784 100644
@@ -34,6 +34,7 @@ CONFIG_CONSOLE_MUX=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_FOOTPRINT_LIMIT=y
 CONFIG_SPL_MAX_FOOTPRINT=0x3db00
+CONFIG_SPL_BOOTCOUNT_LIMIT=y
 CONFIG_SPL_LEGACY_IMAGE_FORMAT=y
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_STACK=0x30000000
Signature · 1 line
2.35.1
Reviewed-by on v1 2/3
#2 lore raw

Re: [PATCH 2/3] ARM: stm32: Increment boot counter in SPL on DHSOM

Hi

Quoted 31 lines · Marek Vasut

Increment the boot counter already in U-Boot SPL instead of incrementing it only later in U-Boot proper. This can be used by SPL to boot either of two U-Boot copies and improve redundancy of software on the platform, e.g. in case of full A/B update strategy.

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
 configs/stm32mp15_dhcom_basic_defconfig | 1 +
 configs/stm32mp15_dhcor_basic_defconfig | 1 +
 2 files changed, 2 insertions(+)
configs/stm32mp15_dhcom_basic_defconfig +1 -0
index 92ccbb70939..f1eb022bc66 100644
@@ -36,6 +36,7 @@ CONFIG_CONSOLE_MUX=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_FOOTPRINT_LIMIT=y
 CONFIG_SPL_MAX_FOOTPRINT=0x3db00
+CONFIG_SPL_BOOTCOUNT_LIMIT=y
 CONFIG_SPL_LEGACY_IMAGE_FORMAT=y
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_STACK=0x30000000
configs/stm32mp15_dhcor_basic_defconfig +0 -0
index 306221404df..2e9f2049784 100644

configs/stm32mp15_dhcor_basic_defconfig CONFIG_CONSOLE_MUX=y · line 40

Quoted 7 lines
configs/stm32mp15_dhcor_basic_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_CONSOLE_MUX=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_FOOTPRINT_LIMIT=y
 CONFIG_SPL_MAX_FOOTPRINT=0x3db00
+CONFIG_SPL_BOOTCOUNT_LIMIT=y
 CONFIG_SPL_LEGACY_IMAGE_FORMAT=y
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_STACK=0x30000000

Thanks
Patrice

#3 lore raw

Re: [PATCH 2/3] ARM: stm32: Increment boot counter in SPL on DHSOM

Quoted 43 lines · Patrice CHOTARD

Hi

Quoted 31 lines · Marek Vasut

Increment the boot counter already in U-Boot SPL instead of incrementing it only later in U-Boot proper. This can be used by SPL to boot either of two U-Boot copies and improve redundancy of software on the platform, e.g. in case of full A/B update strategy.

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
 configs/stm32mp15_dhcom_basic_defconfig | 1 +
 configs/stm32mp15_dhcor_basic_defconfig | 1 +
 2 files changed, 2 insertions(+)
configs/stm32mp15_dhcom_basic_defconfig +1 -0
index 92ccbb70939..f1eb022bc66 100644
@@ -36,6 +36,7 @@ CONFIG_CONSOLE_MUX=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_FOOTPRINT_LIMIT=y
 CONFIG_SPL_MAX_FOOTPRINT=0x3db00
+CONFIG_SPL_BOOTCOUNT_LIMIT=y
 CONFIG_SPL_LEGACY_IMAGE_FORMAT=y
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_STACK=0x30000000
configs/stm32mp15_dhcor_basic_defconfig +0 -0
index 306221404df..2e9f2049784 100644

configs/stm32mp15_dhcor_basic_defconfig CONFIG_CONSOLE_MUX=y · line 40

Quoted 7 lines
configs/stm32mp15_dhcor_basic_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_CONSOLE_MUX=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_FOOTPRINT_LIMIT=y
 CONFIG_SPL_MAX_FOOTPRINT=0x3db00
+CONFIG_SPL_BOOTCOUNT_LIMIT=y
 CONFIG_SPL_LEGACY_IMAGE_FORMAT=y
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_STACK=0x30000000
Quoted 2 lines

Thanks
Patrice

Applied to u-boot-stm/master

Thanks
Patrice

Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH 2/3] ARM: stm32: Increment boot counter in SPL on DHSOM

In reply to Marek Vasut

Hi,

Quoted 5 lines · Marek Vasut

Increment the boot counter already in U-Boot SPL instead of incrementing it only later in U-Boot proper. This can be used by SPL to boot either of two U-Boot copies and improve redundancy of software on the platform, e.g. in case of full A/B update strategy.

Quoted 9 lines

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
  configs/stm32mp15_dhcom_basic_defconfig | 1 +
  configs/stm32mp15_dhcor_basic_defconfig | 1 +
  2 files changed, 2 insertions(+)

Thanks
Patrick

#5 lore raw

PATCH 3/3 ARM: stm32: Increment WDT by default on DHSOM

In reply to Marek Vasut

Enable watchdog timer on the DHSOM by default, both in U-Boot proper and in SPL. This can be used in combination with boot counter by either SPL or U-Boot proper to boot either copy of system software, e.g. in case of full A/B update strategy.

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
 configs/stm32mp15_dhcom_basic_defconfig | 2 ++
 configs/stm32mp15_dhcor_basic_defconfig | 2 ++
 2 files changed, 4 insertions(+)
configs/stm32mp15_dhcom_basic_defconfig +2 -0
index f1eb022bc66..26c2e73aa04 100644
@@ -175,6 +175,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0483
 CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_WDT=y
+CONFIG_WDT_STM32MP=y
 CONFIG_FAT_WRITE=y
 # CONFIG_BINMAN_FDT is not set
 CONFIG_FDT_FIXUP_PARTITIONS=y
configs/stm32mp15_dhcor_basic_defconfig +2 -0
index 2e9f2049784..f76e13eafd7 100644
@@ -174,6 +174,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0483
 CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_WDT=y
+CONFIG_WDT_STM32MP=y
 CONFIG_FAT_WRITE=y
 # CONFIG_BINMAN_FDT is not set
 CONFIG_FDT_FIXUP_PARTITIONS=y
Signature · 1 line
2.35.1
Reviewed-by on v1 3/3
#6 lore raw

Re: [PATCH 3/3] ARM: stm32: Increment WDT by default on DHSOM

Hi Marek

Quoted 32 lines · Marek Vasut

Enable watchdog timer on the DHSOM by default, both in U-Boot proper and in SPL. This can be used in combination with boot counter by either SPL or U-Boot proper to boot either copy of system software, e.g. in case of full A/B update strategy.

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
 configs/stm32mp15_dhcom_basic_defconfig | 2 ++
 configs/stm32mp15_dhcor_basic_defconfig | 2 ++
 2 files changed, 4 insertions(+)
configs/stm32mp15_dhcom_basic_defconfig +2 -0
index f1eb022bc66..26c2e73aa04 100644
@@ -175,6 +175,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0483
 CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_WDT=y
+CONFIG_WDT_STM32MP=y
 CONFIG_FAT_WRITE=y
 # CONFIG_BINMAN_FDT is not set
 CONFIG_FDT_FIXUP_PARTITIONS=y
configs/stm32mp15_dhcor_basic_defconfig +0 -0
index 2e9f2049784..f76e13eafd7 100644

configs/stm32mp15_dhcor_basic_defconfig CONFIG_USB_GADGET_VENDOR_NUM=0x0483 · line 181

Quoted 8 lines
configs/stm32mp15_dhcor_basic_defconfig +2 -0
@@ -174,6 +174,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0483
 CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_WDT=y
+CONFIG_WDT_STM32MP=y
 CONFIG_FAT_WRITE=y
 # CONFIG_BINMAN_FDT is not set
 CONFIG_FDT_FIXUP_PARTITIONS=y

Thanks
Patrice

#7 lore raw

Re: [PATCH 3/3] ARM: stm32: Increment WDT by default on DHSOM

Quoted 45 lines · Patrice CHOTARD

Hi Marek

Quoted 32 lines · Marek Vasut

Enable watchdog timer on the DHSOM by default, both in U-Boot proper and in SPL. This can be used in combination with boot counter by either SPL or U-Boot proper to boot either copy of system software, e.g. in case of full A/B update strategy.

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
 configs/stm32mp15_dhcom_basic_defconfig | 2 ++
 configs/stm32mp15_dhcor_basic_defconfig | 2 ++
 2 files changed, 4 insertions(+)
configs/stm32mp15_dhcom_basic_defconfig +2 -0
index f1eb022bc66..26c2e73aa04 100644
@@ -175,6 +175,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0483
 CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_WDT=y
+CONFIG_WDT_STM32MP=y
 CONFIG_FAT_WRITE=y
 # CONFIG_BINMAN_FDT is not set
 CONFIG_FDT_FIXUP_PARTITIONS=y
configs/stm32mp15_dhcor_basic_defconfig +0 -0
index 2e9f2049784..f76e13eafd7 100644

configs/stm32mp15_dhcor_basic_defconfig CONFIG_USB_GADGET_VENDOR_NUM=0x0483 · line 181

Quoted 8 lines
configs/stm32mp15_dhcor_basic_defconfig +2 -0
@@ -174,6 +174,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0483
 CONFIG_USB_GADGET_PRODUCT_NUM=0x5720
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_WDT=y
+CONFIG_WDT_STM32MP=y
 CONFIG_FAT_WRITE=y
 # CONFIG_BINMAN_FDT is not set
 CONFIG_FDT_FIXUP_PARTITIONS=y
Quoted 2 lines

Thanks
Patrice

Applied to u-boot-stm/master

Thanks
Patrice

Reviewed-by on v1 3/3
#8 lore raw

Re: [PATCH 3/3] ARM: stm32: Increment WDT by default on DHSOM

In reply to Marek Vasut

Hi,

Quoted 5 lines · Marek Vasut

Enable watchdog timer on the DHSOM by default, both in U-Boot proper and in SPL. This can be used in combination with boot counter by either SPL or U-Boot proper to boot either copy of system software, e.g. in case of full A/B update strategy.

Quoted 9 lines

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
  configs/stm32mp15_dhcom_basic_defconfig | 2 ++
  configs/stm32mp15_dhcor_basic_defconfig | 2 ++
  2 files changed, 4 insertions(+)

Thanks
Patrick

Reviewed-by on v1 1/3
#9 lore raw
In reply to Marek Vasut

Hi

Quoted 34 lines · Marek Vasut

Enable the stm32prog, stm32key, stboard commands on DHSOM. Those can be used e.g. to implement verified boot.

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
 configs/stm32mp15_dhcom_basic_defconfig | 4 ++++
 configs/stm32mp15_dhcor_basic_defconfig | 4 ++++
 2 files changed, 8 insertions(+)
configs/stm32mp15_dhcom_basic_defconfig +4 -0
index fd261d96105..92ccbb70939 100644
@@ -11,7 +11,11 @@ CONFIG_SPL_MMC=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0x5C00A14C
 CONFIG_SPL=y
+CONFIG_CMD_STM32KEY=y
+CONFIG_CMD_STBOARD=y
 CONFIG_TARGET_DH_STM32MP1_PDK2=y
+CONFIG_CMD_STM32PROG=y
+CONFIG_CMD_STM32PROG_OTP=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 # CONFIG_ARMV7_VIRT is not set
configs/stm32mp15_dhcor_basic_defconfig +0 -0
index 947bc6b502e..306221404df 100644
@@ -11,7 +11,11 @@ CONFIG_SPL_MMC=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3

configs/stm32mp15_dhcor_basic_defconfig CONFIG_SPL_MMC=y · line 21

Quoted 10 lines
configs/stm32mp15_dhcor_basic_defconfig +4 -0
 CONFIG_SYS_BOOTCOUNT_ADDR=0x5C00A14C
 CONFIG_SPL=y
+CONFIG_CMD_STM32KEY=y
+CONFIG_CMD_STBOARD=y
 CONFIG_TARGET_DH_STM32MP1_PDK2=y
+CONFIG_CMD_STM32PROG=y
+CONFIG_CMD_STM32PROG_OTP=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 # CONFIG_ARMV7_VIRT is not set

Thanks
Patrice

#10 lore raw
Quoted 49 lines · Patrice CHOTARD

Hi

Quoted 34 lines · Marek Vasut

Enable the stm32prog, stm32key, stboard commands on DHSOM. Those can be used e.g. to implement verified boot.

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
 configs/stm32mp15_dhcom_basic_defconfig | 4 ++++
 configs/stm32mp15_dhcor_basic_defconfig | 4 ++++
 2 files changed, 8 insertions(+)
configs/stm32mp15_dhcom_basic_defconfig +4 -0
index fd261d96105..92ccbb70939 100644
@@ -11,7 +11,11 @@ CONFIG_SPL_MMC=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SYS_BOOTCOUNT_ADDR=0x5C00A14C
 CONFIG_SPL=y
+CONFIG_CMD_STM32KEY=y
+CONFIG_CMD_STBOARD=y
 CONFIG_TARGET_DH_STM32MP1_PDK2=y
+CONFIG_CMD_STM32PROG=y
+CONFIG_CMD_STM32PROG_OTP=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 # CONFIG_ARMV7_VIRT is not set
configs/stm32mp15_dhcor_basic_defconfig +0 -0
index 947bc6b502e..306221404df 100644
@@ -11,7 +11,11 @@ CONFIG_SPL_MMC=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3

configs/stm32mp15_dhcor_basic_defconfig CONFIG_SPL_MMC=y · line 21

Quoted 10 lines
configs/stm32mp15_dhcor_basic_defconfig +4 -0
 CONFIG_SYS_BOOTCOUNT_ADDR=0x5C00A14C
 CONFIG_SPL=y
+CONFIG_CMD_STM32KEY=y
+CONFIG_CMD_STBOARD=y
 CONFIG_TARGET_DH_STM32MP1_PDK2=y
+CONFIG_CMD_STM32PROG=y
+CONFIG_CMD_STM32PROG_OTP=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 # CONFIG_ARMV7_VIRT is not set
Quoted 2 lines

Thanks
Patrice

Applied to u-boot-stm/master

Thanks
Patrice

Reviewed-by on v1 1/3
#11 lore raw
In reply to Marek Vasut

Hi,

Quoted 12 lines · Marek Vasut

Enable the stm32prog, stm32key, stboard commands on DHSOM. Those can be used e.g. to implement verified boot.

---
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>

---
  configs/stm32mp15_dhcom_basic_defconfig | 4 ++++
  configs/stm32mp15_dhcor_basic_defconfig | 4 ++++
  2 files changed, 8 insertions(+)

Thanks
Patrick