Skip to contentSkip to conversation

configs/stm32mp157a_dk1: remove uboot config fragment

PATCH New Pierre-Jean Texier 3 participants 5 messages Jul 15, 2021 – Jul 18, 2021 Arm STM32

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 configs/stm32mp157a_dk1: remove uboot config fragment

Running stm32mp1 watchdog is properly recognized and handled by kernel watchdog framework since Linux v5.6.

---
 board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config | 1 -
 configs/stm32mp157a_dk1_defconfig                              | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config
board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config deleted +0 -1
deleted file mode 100644
index a278ce9e23..0000000000
@@ -1 +0,0 @@
-# CONFIG_STM32MP_WATCHDOG is not set
configs/stm32mp157a_dk1_defconfig +0 -1
index bdb99c8663..86265d77f8 100644
@@ -27,7 +27,6 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config"
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_STM32=y
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157a-dk1"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 configs/stm32mp157c_dk2: bump Linux and U-Boot versions

Needed to keep both stm32mp157c_dk1 and stm32mp157c_dk2 aligned.

---
 configs/stm32mp157c_dk2_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
configs/stm32mp157c_dk2_defconfig +3 -3
index a4bff897e5..45205982d7 100644
@@ -1,11 +1,11 @@
 BR2_arm=y
 BR2_cortex_a7=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y
 BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -25,7 +25,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_STM32=y
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 configs/stm32mp157c_dk2: bump Linux and U-Boot versions

Hi all,

Quoted 28 lines

Needed to keep both stm32mp157c_dk1 and stm32mp157c_dk2 aligned.

---
 configs/stm32mp157c_dk2_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
configs/stm32mp157c_dk2_defconfig +2 -2
index a4bff897e5..45205982d7 100644
@@ -1,11 +1,11 @@
 BR2_arm=y
 BR2_cortex_a7=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y
 BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y

configs/stm32mp157c_dk2_defconfig BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y · line 31

Quoted 8 lines
configs/stm32mp157c_dk2_defconfig +1 -1
@@ -25,7 +25,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_STM32=y

Thanks !

#3 lore raw

PATCH 2/2 configs/stm32mp157c_dk2: bump Linux and U-Boot versions

Hi Sergey,

Le 15/07/2021 ? 23:06, Sergey Matyukevich a ?crit?:

Quoted 41 lines

Hi all,

Quoted 28 lines

Needed to keep both stm32mp157c_dk1 and stm32mp157c_dk2 aligned.

---
  configs/stm32mp157c_dk2_defconfig | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
configs/stm32mp157c_dk2_defconfig +2 -2
index a4bff897e5..45205982d7 100644
@@ -1,11 +1,11 @@
  BR2_arm=y
  BR2_cortex_a7=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y
  BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/"
  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh"
  BR2_LINUX_KERNEL=y
  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13"
  BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
  BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/linux.config"
  BR2_LINUX_KERNEL_DTS_SUPPORT=y

configs/stm32mp157c_dk2_defconfig BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y · line 31

Quoted 8 lines
configs/stm32mp157c_dk2_defconfig +1 -1
@@ -25,7 +25,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
  BR2_TARGET_UBOOT=y
  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
  BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07"
  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
  # BR2_TARGET_UBOOT_FORMAT_BIN is not set
  BR2_TARGET_UBOOT_FORMAT_STM32=y
Quoted 1 line

Thanks !

Thanks for the review !

Signature · 1 line
Pierre-Jean Texier
#4 lore raw

PATCH 1/2 configs/stm32mp157a_dk1: remove uboot config fragment

In reply to Pierre-Jean Texier
Quoted 10 lines · On Thu, 15 Jul 2021 22:47:45 +0200 Pierre-Jean Texier <[email protected]>…

Running stm32mp1 watchdog is properly recognized and handled by kernel watchdog framework since Linux v5.6.

---
 board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config | 1 -
 configs/stm32mp157a_dk1_defconfig                              | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config

Both applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com