[Buildroot] [PATCH v3 1/3] configs/avenger96: bump Uboot version to 2024.01

[Buildroot] [PATCH v3 1/3] configs/avenger96: bump Uboot version to 2024.01

[Javad Rahimipetroudi via buildroot]

This patch upgrades the Uboot version on the Avenger96 board.
Furthermore, as it was possible to manage build without upgrading
ATF, the ATF upgrade also moved to a separate commit.


Signed-off-by: Javad Rahimipetroudi <javad.rahimipetroudi@mind.be>

---
Changes v2 -> v3:
  - ATF upgrade moved to another commit (suggested by Peter)

Changes v1 -> v2:
  - Uboot version fixed to 2024.01
  - Unnecessary variable removed from ATF additional build args

---
 configs/avenger96_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig
index 536899583c..82702bcfc7 100644
--- a/configs/avenger96_defconfig
+++ b/configs/avenger96_defconfig
@@ -41,7 +41,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="2020.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted"
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_DTB=y
-- 
2.44.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 2/3] configs/avenger96: bump Linux version to 6.6.21LTS

[Javad Rahimipetroudi via buildroot]

This patch upgrades Kernel version to 6.6.21 LTS on avenger96 board.
Beside that, In accorcance with the kernel 6.5rc1 commit
724ba6751532 ("ARM: dts: Move .dts filesto vendor sub-directories")
the device tree path also has been modified to point the device tree in
the proper location.
As another change, to be compatible with the changes in the commit
3108eb2e8aa7 ("mmc: mmci: Set PROBE_PREFER_ASYNCHRONOUS") with the
default root append (mmcblk1p4) in 'extlinux.conf' file in the
overlay directory of the board, the rootfs was not possible to be
detected. This file also modified to point to the proper mmc block.

Signed-off-by: Javad Rahimipetroudi <javad.rahimipetroudi@mind.be>

---
Changes v2 -> v3:
  - Update the commit to document the reason of changes (suggested by
    Peter)
Changes v1 -> v2:
  - Remove uboot changes from Linux patch to Uboot (suggested by Peter)
  - Fix the kernel header version for the toolchain.(suggested by Peter)

---
 board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf | 2 +-
 configs/avenger96_defconfig                               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf b/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf
index 5d506b3dae..7d6d7f8a44 100644
--- a/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf
+++ b/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf
@@ -1,4 +1,4 @@
 label stm32mp157c-dk2-buildroot
   kernel /boot/zImage
   devicetree /boot/stm32mp157a-dhcor-avenger96.dtb
-  append root=/dev/mmcblk1p4 rootwait
+  append root=/dev/mmcblk0p4 rootwait
diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig
index 82702bcfc7..98a71a0f25 100644
--- a/configs/avenger96_defconfig
+++ b/configs/avenger96_defconfig
@@ -3,7 +3,7 @@ BR2_arm=y
 BR2_cortex_a7=y
 
 # Linux headers same as kernel, a 5.8 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
 
 # System configuration
 BR2_GLOBAL_PATCH_DIR="board/arrow/avenger96/patches"
@@ -13,10 +13,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-im
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.21"
 BR2_LINUX_KERNEL_DEFCONFIG="multi_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157a-dhcor-avenger96"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="st/stm32mp157a-dhcor-avenger96"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 
-- 
2.44.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 3/3] configs/avenger96: bump ATF version to v2.8

[Javad Rahimipetroudi via buildroot]

This patch upgrades the ATF version to v2.8. Please note that
due to DTS chages from commit 51e223058fe70b311542178f1865514745fa7874
("feat(stm32mp15-fdts): add Avenger96 board with STM32MP157A DHCOR SoM")
The ATF additional build variable also modified to use the new DTS file.

Signed-off-by: Javad Rahimipetroudi <javad.rahimipetroudi@mind.be>
---
 configs/avenger96_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig
index 98a71a0f25..67b6d16749 100644
--- a/configs/avenger96_defconfig
+++ b/configs/avenger96_defconfig
@@ -29,13 +29,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # Bootloaders
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.8"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dhcor-avenger96.dtb BL33_CFG=$(BINARIES_DIR)/u-boot.dtb"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
 BR2_TARGET_UBOOT=y
-- 
2.44.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 3/3] configs/avenger96: bump ATF version to v2.8

[Peter Korsgaard]

>>>>> "Javad" == Javad Rahimipetroudi <javad.rahimipetroudi@essensium.com> writes:

 > This patch upgrades the ATF version to v2.8. Please note that
 > due to DTS chages from commit 51e223058fe70b311542178f1865514745fa7874
 > ("feat(stm32mp15-fdts): add Avenger96 board with STM32MP157A DHCOR SoM")
 > The ATF additional build variable also modified to use the new DTS file.

 > Signed-off-by: Javad Rahimipetroudi <javad.rahimipetroudi@mind.be>

What about
board/arrow/avenger96/patches/arm-trusted-firmware/0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch?
Can that be dropped?

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 3/3] configs/avenger96: bump ATF version to v2.8

[Arnout Vandecappelle via buildroot]

On 19/03/2024 08:05, Javad Rahimipetroudi wrote:
> This patch upgrades the ATF version to v2.8. Please note that
> due to DTS chages from commit 51e223058fe70b311542178f1865514745fa7874
> ("feat(stm32mp15-fdts): add Avenger96 board with STM32MP157A DHCOR SoM")
> The ATF additional build variable also modified to use the new DTS file.

  I noticed that the old DTS file fdts/stm32mp157a-avenger96.dts still exists, 
but I suppose it doesn't actually work any more then?

> Signed-off-by: Javad Rahimipetroudi <javad.rahimipetroudi@mind.be>
> ---
>   configs/avenger96_defconfig | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig
> index 98a71a0f25..67b6d16749 100644
> --- a/configs/avenger96_defconfig
> +++ b/configs/avenger96_defconfig
> @@ -29,13 +29,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
>   # Bootloaders
>   BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>   BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.8"

  The intention was to be able to use 
BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION here, so that it gets 
updated automatically when the ATF LTS version is updated.

  For sure, v2.8 is not a good choice, because there's already a v2.8.16!

>   BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
>   BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
>   BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
>   BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
>   BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin"
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb"

  Please comment in the commit message on why E=0 is removed. It was added by 
Peter in deb8d71c9285eb60bc3d28e8abcf7208f78980a7  with this comment:

     Instead use v2.5 to match the other stm32mp1 boards and use the same E=0
     -Werror workaround.

The "the same" refers to commit 1c0c67fc1ae146b34475231fb702e7f2e6bf9f8f which 
has this comment:

     With the move to default to GCC 12 in commit e0091e42eef9 (package/gcc:
     switch to gcc 12.x as the default), TF-A now fails to build as a warning is
     generated and it builds with -Werror:

       CC      plat/st/stm32mp1/bl2_plat_setup.c
     drivers/st/io/io_stm32image.c: In function ‘stm32image_partition_read’:
     drivers/st/io/io_stm32image.c:249:13: error: ‘result’ may be used 
uninitialized [-Werror=maybe-uninitialized]
       249 |         int result;
           |             ^~~~~~
     cc1: all warnings being treated as errors

     This is fixed in TF-A v2.6 with commit c1d732d0db24 (fix(io_stm32image):
     uninitialized variable warning), but I do not have the board to verify if
     v2.6 works, so instead disable -Werror by passsing E=0.

  So indeed, the E=0 is no longer necessary when we move to v2.6 or later, but 
this should be explained in the commit message.

  Regards,
  Arnout

> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dhcor-avenger96.dtb BL33_CFG=$(BINARIES_DIR)/u-boot.dtb"
>   BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32"
>   BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
>   BR2_TARGET_UBOOT=y
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 3/3] configs/avenger96: bump ATF version to v2.8

[Javad Rahimipetroudi via buildroot]

Hi Peter,

On Tue, Mar 19, 2024 at 8:38 AM Peter Korsgaard <peter@korsgaard.com> wrote:
>
> >>>>> "Javad" == Javad Rahimipetroudi <javad.rahimipetroudi@essensium.com> writes:
>
>  > This patch upgrades the ATF version to v2.8. Please note that
>  > due to DTS chages from commit 51e223058fe70b311542178f1865514745fa7874
>  > ("feat(stm32mp15-fdts): add Avenger96 board with STM32MP157A DHCOR SoM")
>  > The ATF additional build variable also modified to use the new DTS file.
>
>  > Signed-off-by: Javad Rahimipetroudi <javad.rahimipetroudi@mind.be>
>
> What about
> board/arrow/avenger96/patches/arm-trusted-firmware/0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch?
> Can that be dropped?
>
I think we can drop it. I will modify the commit.
> --
> Bye, Peter Korsgaard

Regards,
Javad
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 3/3] configs/avenger96: bump ATF version to v2.8

[Javad Rahimipetroudi via buildroot]

Hi Arnout,

On Tue, Mar 19, 2024 at 9:47 AM Arnout Vandecappelle <arnout@mind.be> wrote:
>
>
>
> On 19/03/2024 08:05, Javad Rahimipetroudi wrote:
> > This patch upgrades the ATF version to v2.8. Please note that
> > due to DTS chages from commit 51e223058fe70b311542178f1865514745fa7874
> > ("feat(stm32mp15-fdts): add Avenger96 board with STM32MP157A DHCOR SoM")
> > The ATF additional build variable also modified to use the new DTS file.
>
>   I noticed that the old DTS file fdts/stm32mp157a-avenger96.dts still exists,
> but I suppose it doesn't actually work any more then?
>
Yes, we are using "stm32mp157a-dhcor-avenger96.dts". If
"stm32mp157a-avenger96.dts"
be used, the board will not board with the following error:

NOTICE:  CPU: STM32MP157AAC Rev.B
NOTICE:  Model: Arrow Electronics STM32MP157A Avenger96 board
ERROR:   nvmem node board_id not found
ERROR:   Product_below_2v5=1:
ERROR:    HSLVEN update is destructive,
ERROR:    no update as VDD > 2.7V
PANIC at PC : 0x2ffee95d

> > Signed-off-by: Javad Rahimipetroudi <javad.rahimipetroudi@mind.be>
> > ---
> >   configs/avenger96_defconfig | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig
> > index 98a71a0f25..67b6d16749 100644
> > --- a/configs/avenger96_defconfig
> > +++ b/configs/avenger96_defconfig
> > @@ -29,13 +29,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
> >   # Bootloaders
> >   BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> >   BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
> > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6"
> > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.8"
>
>   The intention was to be able to use
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION here, so that it gets
> updated automatically when the ATF LTS version is updated.
>
>   For sure, v2.8 is not a good choice, because there's already a v2.8.16!
Thanks, I will test and use lts-2.8.16 version.
>
> >   BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1"
> >   BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
> >   BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
> >   BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
> >   BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin"
> > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb"
>
>   Please comment in the commit message on why E=0 is removed. It was added by
> Peter in deb8d71c9285eb60bc3d28e8abcf7208f78980a7  with this comment:
>
>      Instead use v2.5 to match the other stm32mp1 boards and use the same E=0
>      -Werror workaround.
>
> The "the same" refers to commit 1c0c67fc1ae146b34475231fb702e7f2e6bf9f8f which
> has this comment:
>
>      With the move to default to GCC 12 in commit e0091e42eef9 (package/gcc:
>      switch to gcc 12.x as the default), TF-A now fails to build as a warning is
>      generated and it builds with -Werror:
>
>        CC      plat/st/stm32mp1/bl2_plat_setup.c
>      drivers/st/io/io_stm32image.c: In function ‘stm32image_partition_read’:
>      drivers/st/io/io_stm32image.c:249:13: error: ‘result’ may be used
> uninitialized [-Werror=maybe-uninitialized]
>        249 |         int result;
>            |             ^~~~~~
>      cc1: all warnings being treated as errors
>
>      This is fixed in TF-A v2.6 with commit c1d732d0db24 (fix(io_stm32image):
>      uninitialized variable warning), but I do not have the board to verify if
>      v2.6 works, so instead disable -Werror by passsing E=0.
>
>   So indeed, the E=0 is no longer necessary when we move to v2.6 or later, but
> this should be explained in the commit message.
>
Sure, I will add it in the commit
>   Regards,
>   Arnout
>
> > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dhcor-avenger96.dtb BL33_CFG=$(BINARIES_DIR)/u-boot.dtb"
> >   BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32"
> >   BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y
> >   BR2_TARGET_UBOOT=y

Regards,
Javad
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 3/3] configs/avenger96: bump ATF version to v2.8

[Peter Korsgaard]

>>>>> "Javad" == Javad Rahimipetroudi <javad.rahimipetroudi@essensium.com> writes:

 > Hi Arnout,
 > On Tue, Mar 19, 2024 at 9:47 AM Arnout Vandecappelle <arnout@mind.be> wrote:
 >> 
 >> 
 >> 
 >> On 19/03/2024 08:05, Javad Rahimipetroudi wrote:
 >> > This patch upgrades the ATF version to v2.8. Please note that
 >> > due to DTS chages from commit 51e223058fe70b311542178f1865514745fa7874
 >> > ("feat(stm32mp15-fdts): add Avenger96 board with STM32MP157A DHCOR SoM")
 >> > The ATF additional build variable also modified to use the new DTS file.
 >> 
 >> I noticed that the old DTS file fdts/stm32mp157a-avenger96.dts still exists,
 >> but I suppose it doesn't actually work any more then?
 >> 
 > Yes, we are using "stm32mp157a-dhcor-avenger96.dts". If
 > "stm32mp157a-avenger96.dts"
 > be used, the board will not board with the following error:

 > NOTICE:  CPU: STM32MP157AAC Rev.B
 > NOTICE:  Model: Arrow Electronics STM32MP157A Avenger96 board
 > ERROR:   nvmem node board_id not found
 > ERROR:   Product_below_2v5=1:
 > ERROR:    HSLVEN update is destructive,
 > ERROR:    no update as VDD > 2.7V
 > PANIC at PC : 0x2ffee95d

Which seems to match:

commit deb8d71c9285eb60bc3d28e8abcf7208f78980a7
Author: Peter Korsgaard <peter@korsgaard.com>
Date:   Sun Nov 5 19:37:19 2023 +0100

    configs/avenger96_defconfig: downgrade to TF-A v2.5

    Commit 27bf08e4addb78 (configs/avenger96_defconfig: bump ATF version to 2.9
    for binutils 2.39+ support) bumped TF-A, but it unfortunately does not boot
    and instead dies with a panic:

    NOTICE:  CPU: STM32MP157AAC Rev.B
    NOTICE:  Model: Arrow Electronics STM32MP157A Avenger96 board
    ERROR:   nvmem node board_id not found
    INFO:    PMIC version = 0x10
    ERROR:   Product_below_2v5=1:
    ERROR:          HSLVEN update is destructive,
    ERROR:          no update as VDD > 2.7V
    PANIC at PC : 0x2fff086f

    Exception mode=0x00000016 at: 0x2fff086f

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot