Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: remove uboot config fragment
@ 2021-07-15 20:47 Pierre-Jean Texier
  2021-07-15 20:47 ` [Buildroot] [PATCH 2/2] configs/stm32mp157c_dk2: bump Linux and U-Boot versions Pierre-Jean Texier
  2021-07-18 12:07 ` [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: remove uboot config fragment Thomas Petazzoni
  0 siblings, 2 replies; 5+ messages in thread
From: Pierre-Jean Texier @ 2021-07-15 20:47 UTC (permalink / raw)
  To: buildroot

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

Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Pierre-Jean Texier <texier.pj2@gmail.com>
---
 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

diff --git a/board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config b/board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config
deleted file mode 100644
index a278ce9e23..0000000000
--- a/board/stmicroelectronics/stm32mp157a-dk1/uboot-fragment.config
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_STM32MP_WATCHDOG is not set
diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig
index bdb99c8663..86265d77f8 100644
--- a/configs/stm32mp157a_dk1_defconfig
+++ b/configs/stm32mp157a_dk1_defconfig
@@ -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"
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 2/2] configs/stm32mp157c_dk2: bump Linux and U-Boot versions
  2021-07-15 20:47 [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: remove uboot config fragment Pierre-Jean Texier
@ 2021-07-15 20:47 ` Pierre-Jean Texier
  2021-07-15 21:06   ` Sergey Matyukevich
  2021-07-18 12:07 ` [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: remove uboot config fragment Thomas Petazzoni
  1 sibling, 1 reply; 5+ messages in thread
From: Pierre-Jean Texier @ 2021-07-15 20:47 UTC (permalink / raw)
  To: buildroot

Needed to keep both stm32mp157c_dk1 and stm32mp157c_dk2
aligned.

Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Pierre-Jean Texier <texier.pj2@gmail.com>
---
 configs/stm32mp157c_dk2_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig
index a4bff897e5..45205982d7 100644
--- a/configs/stm32mp157c_dk2_defconfig
+++ b/configs/stm32mp157c_dk2_defconfig
@@ -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
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 2/2] configs/stm32mp157c_dk2: bump Linux and U-Boot versions
  2021-07-15 20:47 ` [Buildroot] [PATCH 2/2] configs/stm32mp157c_dk2: bump Linux and U-Boot versions Pierre-Jean Texier
@ 2021-07-15 21:06   ` Sergey Matyukevich
  2021-07-15 21:11     ` Pierre-Jean Texier
  0 siblings, 1 reply; 5+ messages in thread
From: Sergey Matyukevich @ 2021-07-15 21:06 UTC (permalink / raw)
  To: buildroot

Hi all,

> Needed to keep both stm32mp157c_dk1 and stm32mp157c_dk2
> aligned.
> 
> Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Signed-off-by: Pierre-Jean Texier <texier.pj2@gmail.com>
> ---
>  configs/stm32mp157c_dk2_defconfig | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig
> index a4bff897e5..45205982d7 100644
> --- a/configs/stm32mp157c_dk2_defconfig
> +++ b/configs/stm32mp157c_dk2_defconfig
> @@ -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

Reviewed-by: Sergey Matyukevich <geomatsi@gmail.com>

Thanks !

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 2/2] configs/stm32mp157c_dk2: bump Linux and U-Boot versions
  2021-07-15 21:06   ` Sergey Matyukevich
@ 2021-07-15 21:11     ` Pierre-Jean Texier
  0 siblings, 0 replies; 5+ messages in thread
From: Pierre-Jean Texier @ 2021-07-15 21:11 UTC (permalink / raw)
  To: buildroot

Hi Sergey,

Le 15/07/2021 ? 23:06, Sergey Matyukevich a ?crit?:
> Hi all,
> 
>> Needed to keep both stm32mp157c_dk1 and stm32mp157c_dk2
>> aligned.
>>
>> Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
>> Signed-off-by: Pierre-Jean Texier <texier.pj2@gmail.com>
>> ---
>>   configs/stm32mp157c_dk2_defconfig | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig
>> index a4bff897e5..45205982d7 100644
>> --- a/configs/stm32mp157c_dk2_defconfig
>> +++ b/configs/stm32mp157c_dk2_defconfig
>> @@ -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
> 
> Reviewed-by: Sergey Matyukevich <geomatsi@gmail.com>
> 
> Thanks !

Thanks for the review !

-- 
Pierre-Jean Texier

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: remove uboot config fragment
  2021-07-15 20:47 [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: remove uboot config fragment Pierre-Jean Texier
  2021-07-15 20:47 ` [Buildroot] [PATCH 2/2] configs/stm32mp157c_dk2: bump Linux and U-Boot versions Pierre-Jean Texier
@ 2021-07-18 12:07 ` Thomas Petazzoni
  1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2021-07-18 12:07 UTC (permalink / raw)
  To: buildroot

On Thu, 15 Jul 2021 22:47:45 +0200
Pierre-Jean Texier <texier.pj2@gmail.com> wrote:

> Running stm32mp1 watchdog is properly recognized and handled by kernel
> watchdog framework since Linux v5.6.
> 
> Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Signed-off-by: Pierre-Jean Texier <texier.pj2@gmail.com>
> ---
>  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
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-07-18 12:07 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-15 20:47 [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: remove uboot config fragment Pierre-Jean Texier
2021-07-15 20:47 ` [Buildroot] [PATCH 2/2] configs/stm32mp157c_dk2: bump Linux and U-Boot versions Pierre-Jean Texier
2021-07-15 21:06   ` Sergey Matyukevich
2021-07-15 21:11     ` Pierre-Jean Texier
2021-07-18 12:07 ` [Buildroot] [PATCH 1/2] configs/stm32mp157a_dk1: remove uboot config fragment Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox