* [Buildroot] [PATCH v12 01/16] boot/ti-k3-r5-loader: drop hash for version 2022.10
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
@ 2024-04-07 10:34 ` Romain Naour
2024-04-07 10:34 ` [Buildroot] [PATCH v12 02/16] board/ti/am6{2, 4}x-sk: add arm-trusted-firmware v2.7 hash Romain Naour
` (15 subsequent siblings)
16 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:34 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Dario Binacchi, Yann E . Morin
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
The patch removes the hash for version 2022.10 of ti-k3-r5-loader
(i. e. U-Boot), still allowing the ti_am6{2,4]x_sk_defconfig configurations
to properly validate the downloaded package with the appropriate hash.
Link: https://patchwork.ozlabs.org/project/buildroot/patch/20240304153253.732708-6-dario.binacchi@amarulasolutions.com
Suggested-by: Yann E. Morin <yann.morin.1998@free.fr>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Added in v10
---
board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 ++
board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 ++
boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 -
configs/ti_am62x_sk_defconfig | 1 +
configs/ti_am64x_sk_defconfig | 1 +
5 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
create mode 100644 board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
new file mode 100644
index 0000000000..2a5c99c459
--- /dev/null
+++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2
diff --git a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
new file mode 100644
index 0000000000..2a5c99c459
--- /dev/null
+++ b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2
diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
index 279cb7763a..fbe5d21540 100644
--- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
+++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
@@ -1,4 +1,3 @@
# Locally computed:
-sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2
sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index a129e216d2..37df7a93f7 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -1,5 +1,6 @@
BR2_aarch64=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
+BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
BR2_LINUX_KERNEL=y
diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index 26195194c7..1ebdec68ac 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -1,5 +1,6 @@
BR2_aarch64=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
+BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg"
BR2_LINUX_KERNEL=y
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v12 02/16] board/ti/am6{2, 4}x-sk: add arm-trusted-firmware v2.7 hash
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
2024-04-07 10:34 ` [Buildroot] [PATCH v12 01/16] boot/ti-k3-r5-loader: drop hash for version 2022.10 Romain Naour
@ 2024-04-07 10:34 ` Romain Naour
2024-04-07 19:53 ` Arnout Vandecappelle via buildroot
2024-04-07 10:34 ` [Buildroot] [PATCH v12 03/16] boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support Romain Naour
` (14 subsequent siblings)
16 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:34 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
We are going to enable BR2_DOWNLOAD_FORCE_CHECK_HASHES by default
to enforce downloads to have at least one valid hash including
those that use a custom version.
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
.../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++
.../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++
2 files changed, 4 insertions(+)
create mode 100644 board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
create mode 100644 board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
diff --git a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
new file mode 100644
index 0000000000..74fe35c9bc
--- /dev/null
+++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz
diff --git a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
new file mode 100644
index 0000000000..74fe35c9bc
--- /dev/null
+++ b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 02/16] board/ti/am6{2, 4}x-sk: add arm-trusted-firmware v2.7 hash
2024-04-07 10:34 ` [Buildroot] [PATCH v12 02/16] board/ti/am6{2, 4}x-sk: add arm-trusted-firmware v2.7 hash Romain Naour
@ 2024-04-07 19:53 ` Arnout Vandecappelle via buildroot
2024-04-09 11:35 ` Romain Naour
0 siblings, 1 reply; 45+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-04-07 19:53 UTC (permalink / raw)
To: Romain Naour, buildroot
On 07/04/2024 12:34, Romain Naour wrote:
> We are going to enable BR2_DOWNLOAD_FORCE_CHECK_HASHES by default
> to enforce downloads to have at least one valid hash including
> those that use a custom version.
If we switch to BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION then
this custom hash isn't needed any more.
Regards,
Arnout
>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
> .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++
> .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++
> 2 files changed, 4 insertions(+)
> create mode 100644 board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> create mode 100644 board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>
> diff --git a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> new file mode 100644
> index 0000000000..74fe35c9bc
> --- /dev/null
> +++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> @@ -0,0 +1,2 @@
> +# Locally computed:
> +sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz
> diff --git a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> new file mode 100644
> index 0000000000..74fe35c9bc
> --- /dev/null
> +++ b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> @@ -0,0 +1,2 @@
> +# Locally computed:
> +sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 02/16] board/ti/am6{2, 4}x-sk: add arm-trusted-firmware v2.7 hash
2024-04-07 19:53 ` Arnout Vandecappelle via buildroot
@ 2024-04-09 11:35 ` Romain Naour
0 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-09 11:35 UTC (permalink / raw)
To: Arnout Vandecappelle, buildroot
Hello Arnout,
Le 07/04/2024 à 21:53, Arnout Vandecappelle a écrit :
>
>
> On 07/04/2024 12:34, Romain Naour wrote:
>> We are going to enable BR2_DOWNLOAD_FORCE_CHECK_HASHES by default
>> to enforce downloads to have at least one valid hash including
>> those that use a custom version.
>
> If we switch to BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION then
> this custom hash isn't needed any more.
Indeed, but with the upcoming new TI K3 SoC support the atf v2.8 may already too
old. I would suggest to sync the ATF version with the one used by meta-ti
(currently v2.10) as much as possible.
ATF is using the TI-SCI (TI System Controller Interface) to communicate with SoC
firmware.
https://software-dl.ti.com/tisci/esd/latest/1_intro/TISCI.html
Best regards,
Romain
>
> Regards,
> Arnout
>
>>
>> Signed-off-by: Romain Naour <romain.naour@smile.fr>
>> ---
>> .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++
>> .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++
>> 2 files changed, 4 insertions(+)
>> create mode 100644
>> board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>> create mode 100644
>> board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>>
>> diff --git
>> a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>> b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>> new file mode 100644
>> index 0000000000..74fe35c9bc
>> --- /dev/null
>> +++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>> @@ -0,0 +1,2 @@
>> +# Locally computed:
>> +sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e
>> arm-trusted-firmware-v2.7.tar.gz
>> diff --git
>> a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>> b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>> new file mode 100644
>> index 0000000000..74fe35c9bc
>> --- /dev/null
>> +++ b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>> @@ -0,0 +1,2 @@
>> +# Locally computed:
>> +sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e
>> arm-trusted-firmware-v2.7.tar.gz
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v12 03/16] boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
2024-04-07 10:34 ` [Buildroot] [PATCH v12 01/16] boot/ti-k3-r5-loader: drop hash for version 2022.10 Romain Naour
2024-04-07 10:34 ` [Buildroot] [PATCH v12 02/16] board/ti/am6{2, 4}x-sk: add arm-trusted-firmware v2.7 hash Romain Naour
@ 2024-04-07 10:34 ` Romain Naour
2024-04-07 20:01 ` Arnout Vandecappelle via buildroot
2024-04-07 10:34 ` [Buildroot] [PATCH v12 04/16] boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Romain Naour
` (13 subsequent siblings)
16 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:34 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
BR2_TARGET_UBOOT_NEEDS_TI_K3_DM option has been introduced initially to
support certain TI K3 devices such as AM62x and AM62Ax that require a
Device Manager (DM) firmware.
This option needs to be renamed to use a more generic name in order
to cover further TI K3 SoCs support along with the new u-boot binman
tool that will be added in followup patch. With binman enabled in
u-boot on TI K3 SoC, ti-k3-boot-firmware is needed at buildtime to
provide ti-sysfw (System Firmware) for all TI K3 SoC along with Device
Manager (DM) firmware for AM62x and AM62Ax devices.
With binman support enabled, we don't need to provide the path of the
Device Manager firmware anymore (see [2]).
We can remove DM="<DM firmware>.xer5f" from UBOOT_MAKE_OPTS.
It also means that we can also remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
used to define DM path.
DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f
For now, keep BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME and DM only when
ti-k3-image-gen is used. We need to update ti_am62x_sk_defconfig
to use binman before removing them along with ti-k3-image-gen.
[1] 52ce606c05ee3ac869f8087292bc3dbb0d25b79b
[2] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Config.in.legacy | 8 ++++++++
boot/uboot/Config.in | 23 ++++++++++++++---------
boot/uboot/uboot.mk | 4 +++-
configs/ti_am62x_sk_defconfig | 2 +-
4 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index d00196e08b..4084ffa516 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,14 @@ endif
comment "Legacy options removed in 2024.05"
+config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
+ bool "u-boot TI K3 DM option has been renamed."
+ select BR2_LEGACY
+ select BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
+ help
+ The TI K3 Device Manager is already included in
+ ti-k3-boot-firmware.
+
config BR2_PACKAGE_FLUTTER_GALLERY
bool "flutter-gallery removed"
select BR2_LEGACY
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 39b3f2c81b..e310c09217 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -240,18 +240,23 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE
U-Boot, and that the TEE variable pointing to OPTEE's
tee.elf, is passed during the Buildroot build.
-config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
- bool "U-Boot needs TI K3 Device Manager (DM)"
- # We use the SoC selection defined for the ti-k3-image-gen
- # package
- depends on BR2_TARGET_TI_K3_IMAGE_GEN
- depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
+config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
+ bool "U-Boot needs ti-k3-boot-firmware"
+ depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE
help
- Some TI K3 devices need the Device Manager (DM) firmware to
- be available for the U-Boot build.
+ TI K3 devices needs at least ti-sysfw (System Firmware) when
+ built with u-boot's binman tool.
-if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
+ Some TI K3 devices using a split firmware boot flow (AM62,
+ j721e) also need the Device Manager (DM) firmware to be
+ available for the U-Boot build.
+if BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
+
+# TI_K3_DM_SOCNAME is only needed when ti-k3-image-gen is used for
+# TI K3 devices using the Device Manager (DM) firmware.
+# We use the SoC selection defined for the ti-k3-image-gen
+# package.
config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
string
default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 491f654cec..47fb419e92 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -194,11 +194,13 @@ UBOOT_DEPENDENCIES += optee-os
UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf
endif
-ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y)
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE),y)
UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME))
UBOOT_DEPENDENCIES += ti-k3-boot-firmware
+ifneq ($(UBOOT_TI_K3_DM_SOCNAME),)
UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f
endif
+endif
ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y)
UBOOT_DEPENDENCIES += opensbi
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index 37df7a93f7..b2814526bb 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -37,7 +37,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
-BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y
+BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 03/16] boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support
2024-04-07 10:34 ` [Buildroot] [PATCH v12 03/16] boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support Romain Naour
@ 2024-04-07 20:01 ` Arnout Vandecappelle via buildroot
2024-04-09 11:36 ` Romain Naour
0 siblings, 1 reply; 45+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-04-07 20:01 UTC (permalink / raw)
To: Romain Naour, buildroot, Gero Schwäricke, Dario Binacchi,
Anand Gadiyar, Xuanhao Shi, Alexander Sverdlin
On 07/04/2024 12:34, Romain Naour wrote:
> BR2_TARGET_UBOOT_NEEDS_TI_K3_DM option has been introduced initially to
> support certain TI K3 devices such as AM62x and AM62Ax that require a
> Device Manager (DM) firmware.
>
> This option needs to be renamed to use a more generic name in order
> to cover further TI K3 SoCs support along with the new u-boot binman
> tool that will be added in followup patch. With binman enabled in
> u-boot on TI K3 SoC, ti-k3-boot-firmware is needed at buildtime to
> provide ti-sysfw (System Firmware) for all TI K3 SoC along with Device
> Manager (DM) firmware for AM62x and AM62Ax devices.
>
> With binman support enabled, we don't need to provide the path of the
> Device Manager firmware anymore (see [2]).
> We can remove DM="<DM firmware>.xer5f" from UBOOT_MAKE_OPTS.
> It also means that we can also remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
> used to define DM path.
>
> DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f
>
> For now, keep BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME and DM only when
> ti-k3-image-gen is used. We need to update ti_am62x_sk_defconfig
> to use binman before removing them along with ti-k3-image-gen.
>
> [1] 52ce606c05ee3ac869f8087292bc3dbb0d25b79b
> [2] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html
>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
> Config.in.legacy | 8 ++++++++
> boot/uboot/Config.in | 23 ++++++++++++++---------
> boot/uboot/uboot.mk | 4 +++-
> configs/ti_am62x_sk_defconfig | 2 +-
> 4 files changed, 26 insertions(+), 11 deletions(-)
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index d00196e08b..4084ffa516 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,14 @@ endif
>
> comment "Legacy options removed in 2024.05"
>
> +config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
> + bool "u-boot TI K3 DM option has been renamed."
> + select BR2_LEGACY
> + select BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
> + help
> + The TI K3 Device Manager is already included in
> + ti-k3-boot-firmware.
> +
> config BR2_PACKAGE_FLUTTER_GALLERY
> bool "flutter-gallery removed"
> select BR2_LEGACY
> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> index 39b3f2c81b..e310c09217 100644
> --- a/boot/uboot/Config.in
> +++ b/boot/uboot/Config.in
> @@ -240,18 +240,23 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE
> U-Boot, and that the TEE variable pointing to OPTEE's
> tee.elf, is passed during the Buildroot build.
>
> -config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
> - bool "U-Boot needs TI K3 Device Manager (DM)"
> - # We use the SoC selection defined for the ti-k3-image-gen
> - # package
> - depends on BR2_TARGET_TI_K3_IMAGE_GEN
> - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
> +config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
> + bool "U-Boot needs ti-k3-boot-firmware"
> + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE
I guess that if ti-k3-boot-firmware is selected, we can pretty much assume
that U-Boot needs it, no? So I think this entire config option can be removed,
so it gets enabled automatically if ti-k3-boot-firmware is enabled.
> help
> - Some TI K3 devices need the Device Manager (DM) firmware to
> - be available for the U-Boot build.
> + TI K3 devices needs at least ti-sysfw (System Firmware) when
> + built with u-boot's binman tool.
>
> -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
> + Some TI K3 devices using a split firmware boot flow (AM62,
> + j721e) also need the Device Manager (DM) firmware to be
> + available for the U-Boot build.
>
> +if BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
I.e. this could just be
if BR2_TARGET_TI_K3_BOOT_FIRMWARE
Regards,
Arnout
> +
> +# TI_K3_DM_SOCNAME is only needed when ti-k3-image-gen is used for
> +# TI K3 devices using the Device Manager (DM) firmware.
> +# We use the SoC selection defined for the ti-k3-image-gen
> +# package.
> config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
> string
> default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index 491f654cec..47fb419e92 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -194,11 +194,13 @@ UBOOT_DEPENDENCIES += optee-os
> UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf
> endif
>
> -ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y)
> +ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE),y)
> UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME))
> UBOOT_DEPENDENCIES += ti-k3-boot-firmware
> +ifneq ($(UBOOT_TI_K3_DM_SOCNAME),)
> UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f
> endif
> +endif
>
> ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y)
> UBOOT_DEPENDENCIES += opensbi
> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
> index 37df7a93f7..b2814526bb 100644
> --- a/configs/ti_am62x_sk_defconfig
> +++ b/configs/ti_am62x_sk_defconfig
> @@ -37,7 +37,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
> BR2_TARGET_UBOOT_NEEDS_DTC=y
> BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
> BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
> -BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y
> +BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
> # BR2_TARGET_UBOOT_FORMAT_BIN is not set
> BR2_TARGET_UBOOT_FORMAT_IMG=y
> BR2_TARGET_UBOOT_SPL=y
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [Buildroot] [PATCH v12 03/16] boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support
2024-04-07 20:01 ` Arnout Vandecappelle via buildroot
@ 2024-04-09 11:36 ` Romain Naour
0 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-09 11:36 UTC (permalink / raw)
To: Arnout Vandecappelle, buildroot, Gero Schwäricke,
Dario Binacchi, Anand Gadiyar, Xuanhao Shi, Alexander Sverdlin
Hello Arnout,
Le 07/04/2024 à 22:01, Arnout Vandecappelle a écrit :
>
>
> On 07/04/2024 12:34, Romain Naour wrote:
>> BR2_TARGET_UBOOT_NEEDS_TI_K3_DM option has been introduced initially to
>> support certain TI K3 devices such as AM62x and AM62Ax that require a
>> Device Manager (DM) firmware.
>>
>> This option needs to be renamed to use a more generic name in order
>> to cover further TI K3 SoCs support along with the new u-boot binman
>> tool that will be added in followup patch. With binman enabled in
>> u-boot on TI K3 SoC, ti-k3-boot-firmware is needed at buildtime to
>> provide ti-sysfw (System Firmware) for all TI K3 SoC along with Device
>> Manager (DM) firmware for AM62x and AM62Ax devices.
>>
>> With binman support enabled, we don't need to provide the path of the
>> Device Manager firmware anymore (see [2]).
>> We can remove DM="<DM firmware>.xer5f" from UBOOT_MAKE_OPTS.
>> It also means that we can also remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
>> used to define DM path.
>>
>>
>> DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f
>>
>> For now, keep BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME and DM only when
>> ti-k3-image-gen is used. We need to update ti_am62x_sk_defconfig
>> to use binman before removing them along with ti-k3-image-gen.
>>
>> [1] 52ce606c05ee3ac869f8087292bc3dbb0d25b79b
>> [2]
>> https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html
>>
>> Signed-off-by: Romain Naour <romain.naour@smile.fr>
>> ---
>> Config.in.legacy | 8 ++++++++
>> boot/uboot/Config.in | 23 ++++++++++++++---------
>> boot/uboot/uboot.mk | 4 +++-
>> configs/ti_am62x_sk_defconfig | 2 +-
>> 4 files changed, 26 insertions(+), 11 deletions(-)
>>
>> diff --git a/Config.in.legacy b/Config.in.legacy
>> index d00196e08b..4084ffa516 100644
>> --- a/Config.in.legacy
>> +++ b/Config.in.legacy
>> @@ -146,6 +146,14 @@ endif
>> comment "Legacy options removed in 2024.05"
>> +config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
>> + bool "u-boot TI K3 DM option has been renamed."
>> + select BR2_LEGACY
>> + select BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
>> + help
>> + The TI K3 Device Manager is already included in
>> + ti-k3-boot-firmware.
>> +
>> config BR2_PACKAGE_FLUTTER_GALLERY
>> bool "flutter-gallery removed"
>> select BR2_LEGACY
>> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
>> index 39b3f2c81b..e310c09217 100644
>> --- a/boot/uboot/Config.in
>> +++ b/boot/uboot/Config.in
>> @@ -240,18 +240,23 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE
>> U-Boot, and that the TEE variable pointing to OPTEE's
>> tee.elf, is passed during the Buildroot build.
>> -config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
>> - bool "U-Boot needs TI K3 Device Manager (DM)"
>> - # We use the SoC selection defined for the ti-k3-image-gen
>> - # package
>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN
>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX ||
>> BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
>> +config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
>> + bool "U-Boot needs ti-k3-boot-firmware"
>> + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE
>
> I guess that if ti-k3-boot-firmware is selected, we can pretty much assume that
> U-Boot needs it, no? So I think this entire config option can be removed, so it
> gets enabled automatically if ti-k3-boot-firmware is enabled.
>
>> help
>> - Some TI K3 devices need the Device Manager (DM) firmware to
>> - be available for the U-Boot build.
>> + TI K3 devices needs at least ti-sysfw (System Firmware) when
>> + built with u-boot's binman tool.
>> -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
>> + Some TI K3 devices using a split firmware boot flow (AM62,
>> + j721e) also need the Device Manager (DM) firmware to be
>> + available for the U-Boot build.
>> +if BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
>
> I.e. this could just be
>
> if BR2_TARGET_TI_K3_BOOT_FIRMWARE
Indeed, I was distracted by BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME that is still used
until the AM6x defconfig are updated to use binman.
I'll post a followup patch to complete the rework.
Best regards,
Romain
>
>
> Regards,
> Arnout
>
>> +
>> +# TI_K3_DM_SOCNAME is only needed when ti-k3-image-gen is used for
>> +# TI K3 devices using the Device Manager (DM) firmware.
>> +# We use the SoC selection defined for the ti-k3-image-gen
>> +# package.
>> config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
>> string
>> default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX
>> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
>> index 491f654cec..47fb419e92 100644
>> --- a/boot/uboot/uboot.mk
>> +++ b/boot/uboot/uboot.mk
>> @@ -194,11 +194,13 @@ UBOOT_DEPENDENCIES += optee-os
>> UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf
>> endif
>> -ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y)
>> +ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE),y)
>> UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME))
>> UBOOT_DEPENDENCIES += ti-k3-boot-firmware
>> +ifneq ($(UBOOT_TI_K3_DM_SOCNAME),)
>> UBOOT_MAKE_OPTS +=
>> DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f
>> endif
>> +endif
>> ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y)
>> UBOOT_DEPENDENCIES += opensbi
>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
>> index 37df7a93f7..b2814526bb 100644
>> --- a/configs/ti_am62x_sk_defconfig
>> +++ b/configs/ti_am62x_sk_defconfig
>> @@ -37,7 +37,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
>> BR2_TARGET_UBOOT_NEEDS_DTC=y
>> BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
>> BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
>> -BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y
>> +BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
>> # BR2_TARGET_UBOOT_FORMAT_BIN is not set
>> BR2_TARGET_UBOOT_FORMAT_IMG=y
>> BR2_TARGET_UBOOT_SPL=y
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v12 04/16] boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (2 preceding siblings ...)
2024-04-07 10:34 ` [Buildroot] [PATCH v12 03/16] boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support Romain Naour
@ 2024-04-07 10:34 ` Romain Naour
2024-04-07 20:07 ` Arnout Vandecappelle via buildroot
2024-04-07 10:34 ` [Buildroot] [PATCH v12 05/16] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option Romain Naour
` (12 subsequent siblings)
16 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:34 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Dario Binacchi, Michael Trimarchi
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Recent version of U-Boot use binman to provide a mechanism for building
images, from simple SPL + U-Boot combinations, to more complex
arrangements with many parts.
This tool uses additional host python modules that must be provided by
Buildroot. So introduce a new option
BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN to add additional host packages
in U-Boot build dependency to use binman.
When BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is set, BINMAN_INDIRS
environment variable to provide the directory to search for binary
blobs and select the packages required by binman. Make sure that
ti-k3-boot-firmware package has been installed before building
ti-k3-r5-loader in order to provide such firmwares.
The BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option is currently needed
since we are in the middle of the process to switch TI AM62 and AM64
board defconfig to binman. Keep BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
disabled for them until the u-boot/ti-k3-r5-loader version bump to
2024.01.
The dependency of binman is not really easy to follow. First we have
the packages list from binman.rst [1] then we have to install
additional python modules [2]. Maybe in the future it will be
necessary to add host-lzma and host-lz4 in the dependencies list.
[1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377
[2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt
Co-developed-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Co-developed-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Changes in v11:
- Use BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option while AM62 and AM64
still use ti-k3-image-gen
- Add missing ti-k3-boot-firmware dependency
Changes in v6:
- Update the commit message adding the links of requirements.
Changes in v5:
- Add dependecy on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
- Drop runtime dependecies
- Add host-python-pylibfdt dependency without requiring
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT configuration
- Add host-python3 and host-python-setuptools dependencies
- Add SOB and COB tags of Romain Naour
Changes in v4:
- Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
Changes in v2:
- Change commit message
- Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
- Select packages required by binman if
BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled
---
boot/ti-k3-r5-loader/Config.in | 9 +++++++++
boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 15 +++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in
index 5f86c045c9..5f4f33b220 100644
--- a/boot/ti-k3-r5-loader/Config.in
+++ b/boot/ti-k3-r5-loader/Config.in
@@ -93,4 +93,13 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE
help
Path to the TI K3 R5 Loader configuration file.
+config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
+ bool "ti-k3-r5-loader use binman"
+ depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema
+ select BR2_TARGET_TI_K3_BOOT_FIRMWARE
+ help
+ Use binman tool for generation and signing of boot images.
+
+ https://docs.u-boot.org/en/v2024.01/develop/package/binman.html
+
endif
diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
index 0ffcb8235f..cf18b43871 100644
--- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
+++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
@@ -60,6 +60,21 @@ TI_K3_R5_LOADER_MAKE_OPTS = \
HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \
HOSTLDFLAGS="$(HOST_LDFLAGS)"
+ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y)
+# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt
+TI_K3_R5_LOADER_DEPENDENCIES += \
+ host-python-jsonschema \
+ host-python-pyyaml \
+ ti-k3-boot-firmware
+# Make sure that all binman requirements are build before ti-k3-r5-loader.
+TI_K3_R5_LOADER_DEPENDENCIES += \
+ host-python3 \
+ host-python-pyelftools \
+ host-python-pylibfdt \
+ host-python-setuptools
+TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR)
+endif
+
define TI_K3_R5_LOADER_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS)
endef
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 04/16] boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
2024-04-07 10:34 ` [Buildroot] [PATCH v12 04/16] boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Romain Naour
@ 2024-04-07 20:07 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 45+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-04-07 20:07 UTC (permalink / raw)
To: Romain Naour, buildroot; +Cc: Dario Binacchi, Michael Trimarchi
On 07/04/2024 12:34, Romain Naour wrote:
> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>
> Recent version of U-Boot use binman to provide a mechanism for building
> images, from simple SPL + U-Boot combinations, to more complex
> arrangements with many parts.
>
> This tool uses additional host python modules that must be provided by
> Buildroot. So introduce a new option
> BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN to add additional host packages
> in U-Boot build dependency to use binman.
>
> When BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is set, BINMAN_INDIRS
> environment variable to provide the directory to search for binary
> blobs and select the packages required by binman. Make sure that
> ti-k3-boot-firmware package has been installed before building
> ti-k3-r5-loader in order to provide such firmwares.
>
> The BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option is currently needed
> since we are in the middle of the process to switch TI AM62 and AM64
> board defconfig to binman. Keep BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
> disabled for them until the u-boot/ti-k3-r5-loader version bump to
> 2024.01.
>
> The dependency of binman is not really easy to follow. First we have
> the packages list from binman.rst [1] then we have to install
> additional python modules [2]. Maybe in the future it will be
> necessary to add host-lzma and host-lz4 in the dependencies list.
>
> [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377
> [2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt
Excellent that you added this paragraph!
Regards,
Arnout
>
> Co-developed-by: Michael Trimarchi <michael@amarulasolutions.com>
> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
> Co-developed-by: Romain Naour <romain.naour@smile.fr>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
> Changes in v11:
> - Use BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option while AM62 and AM64
> still use ti-k3-image-gen
> - Add missing ti-k3-boot-firmware dependency
>
> Changes in v6:
> - Update the commit message adding the links of requirements.
>
> Changes in v5:
> - Add dependecy on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
> - Drop runtime dependecies
> - Add host-python-pylibfdt dependency without requiring
> BR2_TARGET_UBOOT_NEEDS_PYLIBFDT configuration
> - Add host-python3 and host-python-setuptools dependencies
> - Add SOB and COB tags of Romain Naour
>
> Changes in v4:
> - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
>
> Changes in v2:
> - Change commit message
> - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
> - Select packages required by binman if
> BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled
> ---
> boot/ti-k3-r5-loader/Config.in | 9 +++++++++
> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 15 +++++++++++++++
> 2 files changed, 24 insertions(+)
>
> diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in
> index 5f86c045c9..5f4f33b220 100644
> --- a/boot/ti-k3-r5-loader/Config.in
> +++ b/boot/ti-k3-r5-loader/Config.in
> @@ -93,4 +93,13 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE
> help
> Path to the TI K3 R5 Loader configuration file.
>
> +config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
> + bool "ti-k3-r5-loader use binman"
> + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema
> + select BR2_TARGET_TI_K3_BOOT_FIRMWARE
> + help
> + Use binman tool for generation and signing of boot images.
> +
> + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html
> +
> endif
> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> index 0ffcb8235f..cf18b43871 100644
> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> @@ -60,6 +60,21 @@ TI_K3_R5_LOADER_MAKE_OPTS = \
> HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \
> HOSTLDFLAGS="$(HOST_LDFLAGS)"
>
> +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y)
> +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt
> +TI_K3_R5_LOADER_DEPENDENCIES += \
> + host-python-jsonschema \
> + host-python-pyyaml \
> + ti-k3-boot-firmware
> +# Make sure that all binman requirements are build before ti-k3-r5-loader.
> +TI_K3_R5_LOADER_DEPENDENCIES += \
> + host-python3 \
> + host-python-pyelftools \
> + host-python-pylibfdt \
> + host-python-setuptools
> +TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR)
> +endif
> +
> define TI_K3_R5_LOADER_BUILD_CMDS
> $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS)
> endef
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v12 05/16] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (3 preceding siblings ...)
2024-04-07 10:34 ` [Buildroot] [PATCH v12 04/16] boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Romain Naour
@ 2024-04-07 10:34 ` Romain Naour
2024-04-08 16:11 ` James Hilliard
2024-04-07 10:34 ` [Buildroot] [PATCH v12 06/16] boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR Romain Naour
` (11 subsequent siblings)
16 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:34 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Dario Binacchi
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Recent version of U-Boot use binman to provide a mechanism for building
images, from simple SPL + U-Boot combinations, to more complex
arrangements with many parts.
This tool uses additional host python modules that must be provided by
Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to
add additional host packages in U-Boot build dependency to use binman.
The binman requirement is directly included in buildman dependency
(tools/buildman/requirements.txt) since within U-Boot, binman is
invoked by the build system, here buildman [1].
[1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot
Co-developed-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Changes in v12:
- remove BR2_PACKAGE_TI_K3 part since this option has been removed from this series
- remove TI K3 specific part from the commit log
Changes in v11:
- Add ti-k3-boot-firmware depedendency when both BR2_TARGET_UBOOT_USE_BINMAN
and BR2_PACKAGE_TI_K3 are set
- drop BR2_TARGET_UBOOT_NEEDS_TI_K3_DM related changes
Changes in v7:
- Replace ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) with
ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),).
- Update the commit message
Changes in v6:
- BR2_TARGET_UBOOT_USE_BINMAN
- Binman tool is not specific to TI K3 platform, so add an option to specify
the use of Binman in U-Boot.
- Add runtime dependencies
- Update commit message
- Add SOB and COB tags of Romain Naour
Changes in v5:
- Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f"
from UBOOT_MAKE_OPTS.
no changes since v1:
---
boot/uboot/Config.in | 11 +++++++++++
boot/uboot/uboot.mk | 8 ++++++++
2 files changed, 19 insertions(+)
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index e310c09217..39e49d681b 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -295,6 +295,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN
This option makes sure that the needed binary blobs are copied
into the U-Boot source directory.
+config BR2_TARGET_UBOOT_USE_BINMAN
+ bool "U-Boot use binman"
+ depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema
+ select BR2_TARGET_UBOOT_NEEDS_PYTHON3
+ select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS
+ select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT
+ help
+ Use binman tool for generation and signing of boot images.
+
+ https://docs.u-boot.org/en/v2024.01/develop/package/binman.html
+
menu "U-Boot binary format"
config BR2_TARGET_UBOOT_FORMAT_AIS
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 47fb419e92..398485195e 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -279,6 +279,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y)
UBOOT_DEPENDENCIES += host-vim
endif
+ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y)
+# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt
+UBOOT_DEPENDENCIES += \
+ host-python-jsonschema \
+ host-python-pyyaml
+UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR)
+endif
+
# prior to u-boot 2013.10 the license info was in COPYING. Copy it so
# legal-info finds it
define UBOOT_COPY_OLD_LICENSE_FILE
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 05/16] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option
2024-04-07 10:34 ` [Buildroot] [PATCH v12 05/16] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option Romain Naour
@ 2024-04-08 16:11 ` James Hilliard
2024-04-09 11:58 ` Romain Naour
0 siblings, 1 reply; 45+ messages in thread
From: James Hilliard @ 2024-04-08 16:11 UTC (permalink / raw)
To: Romain Naour; +Cc: Dario Binacchi, buildroot
On Sun, Apr 7, 2024 at 4:35 AM Romain Naour <romain.naour@smile.fr> wrote:
>
> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>
> Recent version of U-Boot use binman to provide a mechanism for building
> images, from simple SPL + U-Boot combinations, to more complex
> arrangements with many parts.
>
> This tool uses additional host python modules that must be provided by
> Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to
> add additional host packages in U-Boot build dependency to use binman.
>
> The binman requirement is directly included in buildman dependency
> (tools/buildman/requirements.txt) since within U-Boot, binman is
> invoked by the build system, here buildman [1].
>
> [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot
>
> Co-developed-by: Romain Naour <romain.naour@smile.fr>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
> Changes in v12:
> - remove BR2_PACKAGE_TI_K3 part since this option has been removed from this series
> - remove TI K3 specific part from the commit log
>
> Changes in v11:
> - Add ti-k3-boot-firmware depedendency when both BR2_TARGET_UBOOT_USE_BINMAN
> and BR2_PACKAGE_TI_K3 are set
> - drop BR2_TARGET_UBOOT_NEEDS_TI_K3_DM related changes
>
> Changes in v7:
> - Replace ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) with
> ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),).
> - Update the commit message
>
> Changes in v6:
> - BR2_TARGET_UBOOT_USE_BINMAN
> - Binman tool is not specific to TI K3 platform, so add an option to specify
> the use of Binman in U-Boot.
> - Add runtime dependencies
> - Update commit message
> - Add SOB and COB tags of Romain Naour
>
> Changes in v5:
> - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f"
> from UBOOT_MAKE_OPTS.
>
> no changes since v1:
> ---
> boot/uboot/Config.in | 11 +++++++++++
> boot/uboot/uboot.mk | 8 ++++++++
> 2 files changed, 19 insertions(+)
>
> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> index e310c09217..39e49d681b 100644
> --- a/boot/uboot/Config.in
> +++ b/boot/uboot/Config.in
> @@ -295,6 +295,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN
> This option makes sure that the needed binary blobs are copied
> into the U-Boot source directory.
>
> +config BR2_TARGET_UBOOT_USE_BINMAN
> + bool "U-Boot use binman"
> + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema
This comment doesn't look right, what is selecting python-rpds-py and
python-jsonschema?
> + select BR2_TARGET_UBOOT_NEEDS_PYTHON3
> + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS
> + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT
> + help
> + Use binman tool for generation and signing of boot images.
> +
> + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html
> +
> menu "U-Boot binary format"
>
> config BR2_TARGET_UBOOT_FORMAT_AIS
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index 47fb419e92..398485195e 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -279,6 +279,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y)
> UBOOT_DEPENDENCIES += host-vim
> endif
>
> +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y)
> +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt
> +UBOOT_DEPENDENCIES += \
> + host-python-jsonschema \
> + host-python-pyyaml
> +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR)
> +endif
> +
> # prior to u-boot 2013.10 the license info was in COPYING. Copy it so
> # legal-info finds it
> define UBOOT_COPY_OLD_LICENSE_FILE
> --
> 2.44.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [Buildroot] [PATCH v12 05/16] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option
2024-04-08 16:11 ` James Hilliard
@ 2024-04-09 11:58 ` Romain Naour
0 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-09 11:58 UTC (permalink / raw)
To: James Hilliard; +Cc: Dario Binacchi, buildroot
Hello James,
Le 08/04/2024 à 18:11, James Hilliard a écrit :
> On Sun, Apr 7, 2024 at 4:35 AM Romain Naour <romain.naour@smile.fr> wrote:
>>
>> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>>
>> Recent version of U-Boot use binman to provide a mechanism for building
>> images, from simple SPL + U-Boot combinations, to more complex
>> arrangements with many parts.
>>
>> This tool uses additional host python modules that must be provided by
>> Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to
>> add additional host packages in U-Boot build dependency to use binman.
>>
>> The binman requirement is directly included in buildman dependency
>> (tools/buildman/requirements.txt) since within U-Boot, binman is
>> invoked by the build system, here buildman [1].
>>
>> [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot
>>
>> Co-developed-by: Romain Naour <romain.naour@smile.fr>
>> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>> Signed-off-by: Romain Naour <romain.naour@smile.fr>
>> ---
>> Changes in v12:
>> - remove BR2_PACKAGE_TI_K3 part since this option has been removed from this series
>> - remove TI K3 specific part from the commit log
>>
>> Changes in v11:
>> - Add ti-k3-boot-firmware depedendency when both BR2_TARGET_UBOOT_USE_BINMAN
>> and BR2_PACKAGE_TI_K3 are set
>> - drop BR2_TARGET_UBOOT_NEEDS_TI_K3_DM related changes
>>
>> Changes in v7:
>> - Replace ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) with
>> ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),).
>> - Update the commit message
>>
>> Changes in v6:
>> - BR2_TARGET_UBOOT_USE_BINMAN
>> - Binman tool is not specific to TI K3 platform, so add an option to specify
>> the use of Binman in U-Boot.
>> - Add runtime dependencies
>> - Update commit message
>> - Add SOB and COB tags of Romain Naour
>>
>> Changes in v5:
>> - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f"
>> from UBOOT_MAKE_OPTS.
>>
>> no changes since v1:
>> ---
>> boot/uboot/Config.in | 11 +++++++++++
>> boot/uboot/uboot.mk | 8 ++++++++
>> 2 files changed, 19 insertions(+)
>>
>> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
>> index e310c09217..39e49d681b 100644
>> --- a/boot/uboot/Config.in
>> +++ b/boot/uboot/Config.in
>> @@ -295,6 +295,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN
>> This option makes sure that the needed binary blobs are copied
>> into the U-Boot source directory.
>>
>> +config BR2_TARGET_UBOOT_USE_BINMAN
>> + bool "U-Boot use binman"
>> + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema
>
> This comment doesn't look right, what is selecting python-rpds-py and
> python-jsonschema?
You're right, only host-python-jsonschema is required so this depency is not needed.
Best regards,
Romain
>
>> + select BR2_TARGET_UBOOT_NEEDS_PYTHON3
>> + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS
>> + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT
>> + help
>> + Use binman tool for generation and signing of boot images.
>> +
>> + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html
>> +
>> menu "U-Boot binary format"
>>
>> config BR2_TARGET_UBOOT_FORMAT_AIS
>> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
>> index 47fb419e92..398485195e 100644
>> --- a/boot/uboot/uboot.mk
>> +++ b/boot/uboot/uboot.mk
>> @@ -279,6 +279,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y)
>> UBOOT_DEPENDENCIES += host-vim
>> endif
>>
>> +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y)
>> +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt
>> +UBOOT_DEPENDENCIES += \
>> + host-python-jsonschema \
>> + host-python-pyyaml
>> +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR)
>> +endif
>> +
>> # prior to u-boot 2013.10 the license info was in COPYING. Copy it so
>> # legal-info finds it
>> define UBOOT_COPY_OLD_LICENSE_FILE
>> --
>> 2.44.0
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v12 06/16] boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (4 preceding siblings ...)
2024-04-07 10:34 ` [Buildroot] [PATCH v12 05/16] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option Romain Naour
@ 2024-04-07 10:34 ` Romain Naour
2024-04-07 20:19 ` Arnout Vandecappelle via buildroot
2024-04-07 10:35 ` [Buildroot] [PATCH v12 07/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 Romain Naour
` (10 subsequent siblings)
16 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:34 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Dario Binacchi
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
With binman support enabled, u-boot for k3 r5 core (ti-k3-r5-loader)
install different target image (tiboot3*.bin) depending on the K3
SoC boot ROM:
- General Purpose devices (gp)
- High Security - Field Securable devices (hs-fs)
- High Security - Security Enforcing devices (hs)
An additional firmware binary is required on certain TI K3 devices such
as AM65 and J721e due to the "Split binary" boot flow [1]:
- Split binary with a combined firmware: (eg: AM65)
- Combined binary with a combined firmware: (eg: AM64)
- Split binary with a split firmware: (eg: J721E)
- Combined binary with a split firmware: (eg: AM62)
K3 SoC using Split Binary Boot Flow also requires sysfw-*.itb file
to boot (eg: am65, j721e). Only tiboot3*.bin is needed for other
boot flow.
From [1]:
"It's important to rename the generated tiboot3.bin and sysfw.itb
to match exactly tiboot3.bin and sysfw.itb as ROM and the wakeup
UBoot SPL will only look for and load the files with these names."
See the (not exhaustive) list of all tiboot3*.bin and sysfw*.itb file
variant found in meta-ti:
meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
meta-ti-bsp/conf/machine/include/am62pxx.inc:IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin"
meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin"
meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin"
meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin"
meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin"
meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/j722s.inc:IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/k3r5.inc:SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}"
meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw.itb"
meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb"
meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb"
meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw.itb"
meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb"
meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb"
This firmware list can also be verified with the firmware name used in
the u-boot devicetree k3-*-binman.dtsi files.
On the SK-AM62B-P1, three tiboot3 binaries are built, one for each boot
ROM variant:
tiboot3-am62x-gp-evm.bin
tiboot3-am62x-hs-evm.bin
tiboot3-am62x-hs-fs-evm.bin
A tiboot3.bin symlink is provided as default choice:
tiboot3.bin -> tiboot3-am62x-hs-fs-evm.bin
On this board, the tiboot3.bin symlink links to the hs-fs variant
but it not always de case for all TI K3 devices.
(ex: J721e use gp variant by default).
The tiboot3.bin symlink links the -gp, -hs-fs, -hs tiboot3 binary
according to where "symlink = "tiboot3.bin";" line is located in
k3-*binman.dtsi.
As reported by Michael Walle [2], such firmware name can also be
customized by a SBC vendor [3], so we can't always be sure which
firmware to use.
If required, let the user provide a custom tiboot3 or sysfw firmware
name from the defconfig. Otherwise use the default firmware choice
by copying tiboot3.bin and sysfw.itb symlinks.
[1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/doc/board/ti/k3.rst
[2] http://lists.busybox.net/pipermail/buildroot/2024-April/688943.html
[3] https://elixir.bootlin.com/u-boot/v2024.04/source/arch/arm/dts/k3-am625-phycore-som-binman.dtsi#L14
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Changes in v12:
- allow a custom tiboot3 and sysfw firmware name:
http://lists.busybox.net/pipermail/buildroot/2024-April/688953.html
Changes in v11:
- Introduce BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN and BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB
strings to provide firmware name to copy at the end of ti-k3-r5-loader build.
This replace the "find . -regex" from provious patch version.
- Add sysfw.itb handling needed to TI K3 SoC using Split Binary Boot Flow.
Changes in v8:
- Use the `find' command in pipe with the `cp' command.
Changes in v6:
- Replace `find' command with `cp' one.
Changes in v5:
- Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with
tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin
Added in v4
---
boot/ti-k3-r5-loader/Config.in | 40 +++++++++++++++++++++++++
boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 35 +++++++++++++++++++++-
2 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in
index 5f4f33b220..c0c7222a10 100644
--- a/boot/ti-k3-r5-loader/Config.in
+++ b/boot/ti-k3-r5-loader/Config.in
@@ -102,4 +102,44 @@ config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
https://docs.u-boot.org/en/v2024.01/develop/package/binman.html
+config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN
+ string "tiboot3.bin binary name"
+ default "tiboot3.bin"
+ help
+ Name of the TI K3 tiboot3.bin binary to use.
+
+ The tiboot3 binary name must match with the TI K3 SoC boot
+ ROM:
+
+ - General Purpose devices (gp)
+ - High Security - Field Securable devices (hs-fs)
+ - High Security - Security Enforcing devices (hs)
+
+ Or if the tiboot3 binary generated use a custom name.
+
+ If unsure, use the default tiboot3.bin (symlink) generated by
+ binman.
+
+config BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB
+ string "sysfw.itb binary name"
+ default "sysfw.itb"
+ help
+ Name of the TI K3 sysfw.itb binary to use (if any required).
+
+ sysfw*.itb are only generated for Split binary based Boot
+ Flow (eg: am65, j721e). This option is not used on other
+ TI K3 devices.
+
+ The sysfw binary name must match with the TI K3 SoC boot
+ ROM:
+
+ - General Purpose devices (gp)
+ - High Security - Field Securable devices (hs-fs)
+ - High Security - Security Enforcing devices (hs)
+
+ Or if the sysfw binary generated use a custom name.
+
+ If unsure, use the default sysfw.itb (symlink) generated by
+ binman.
+
endif
diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
index cf18b43871..0191a2501c 100644
--- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
+++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
@@ -73,7 +73,24 @@ TI_K3_R5_LOADER_DEPENDENCIES += \
host-python-pylibfdt \
host-python-setuptools
TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR)
-endif
+
+TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN))
+
+define TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN
+ cp $(@D)/$(TI_K3_R5_LOADER_TIBOOT3_BIN) $(BINARIES_DIR)/tiboot3.bin
+endef
+
+TI_K3_R5_LOADER_SWSFW_ITB = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB))
+
+# sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e).
+# So, if sysfw.itb symlink exist we must copy it or the custom sysfw.itb.
+define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB
+ if test -e $(@D)/sysfw.itb ; then \
+ cp $(@D)/$(TI_K3_R5_LOADER_SWSFW_ITB) $(BINARIES_DIR)/sysfw.itb ; \
+ fi
+endef
+
+endif # BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
define TI_K3_R5_LOADER_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS)
@@ -81,6 +98,22 @@ endef
define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS
cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin
+ $(TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN)
+ $(TI_K3_R5_LOADER_INSTALL_SWSFW_ITB)
endef
+# Checks to give errors that the user can understand
+# Must be before we call to kconfig-package
+ifeq ($(BR2_TARGET_TI_K3_R5_LOADER)$(BR_BUILDING),yy)
+
+ifeq ($(TI_K3_R5_LOADER_TIBOOT3_BIN),)
+$(error No custom tiboot3 name specified, check your BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN setting)
+endif
+
+ifeq ($(TI_K3_R5_LOADER_SWSFW_ITB),)
+$(error No custom sysfw name specified, check your BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB setting)
+endif
+
+endif # BR_BUILDING
+
$(eval $(kconfig-package))
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 06/16] boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR
2024-04-07 10:34 ` [Buildroot] [PATCH v12 06/16] boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR Romain Naour
@ 2024-04-07 20:19 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 45+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-04-07 20:19 UTC (permalink / raw)
To: Romain Naour, buildroot; +Cc: Dario Binacchi
On 07/04/2024 12:34, Romain Naour wrote:
> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>
> With binman support enabled, u-boot for k3 r5 core (ti-k3-r5-loader)
> install different target image (tiboot3*.bin) depending on the K3
> SoC boot ROM:
>
> - General Purpose devices (gp)
> - High Security - Field Securable devices (hs-fs)
> - High Security - Security Enforcing devices (hs)
>
> An additional firmware binary is required on certain TI K3 devices such
> as AM65 and J721e due to the "Split binary" boot flow [1]:
>
> - Split binary with a combined firmware: (eg: AM65)
> - Combined binary with a combined firmware: (eg: AM64)
> - Split binary with a split firmware: (eg: J721E)
> - Combined binary with a split firmware: (eg: AM62)
>
> K3 SoC using Split Binary Boot Flow also requires sysfw-*.itb file
> to boot (eg: am65, j721e). Only tiboot3*.bin is needed for other
> boot flow.
>
> From [1]:
> "It's important to rename the generated tiboot3.bin and sysfw.itb
> to match exactly tiboot3.bin and sysfw.itb as ROM and the wakeup
> UBoot SPL will only look for and load the files with these names."
>
> See the (not exhaustive) list of all tiboot3*.bin and sysfw*.itb file
> variant found in meta-ti:
>
> meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
> meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
> meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"
> meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
> meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
> meta-ti-bsp/conf/machine/include/am62pxx.inc:IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin"
> meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
> meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
> meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
> meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
> meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
> meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
> meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin"
> meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin"
> meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
> meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
> meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin"
> meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin"
> meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin"
> meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin"
> meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
> meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
> meta-ti-bsp/conf/machine/include/j722s.inc:IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin"
> meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
> meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
> meta-ti-bsp/conf/machine/include/k3r5.inc:SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}"
>
> meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw.itb"
> meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb"
> meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb"
> meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw.itb"
> meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
> meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb"
> meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb"
>
> This firmware list can also be verified with the firmware name used in
> the u-boot devicetree k3-*-binman.dtsi files.
>
> On the SK-AM62B-P1, three tiboot3 binaries are built, one for each boot
> ROM variant:
>
> tiboot3-am62x-gp-evm.bin
> tiboot3-am62x-hs-evm.bin
> tiboot3-am62x-hs-fs-evm.bin
>
> A tiboot3.bin symlink is provided as default choice:
>
> tiboot3.bin -> tiboot3-am62x-hs-fs-evm.bin
>
> On this board, the tiboot3.bin symlink links to the hs-fs variant
> but it not always de case for all TI K3 devices.
> (ex: J721e use gp variant by default).
>
> The tiboot3.bin symlink links the -gp, -hs-fs, -hs tiboot3 binary
> according to where "symlink = "tiboot3.bin";" line is located in
> k3-*binman.dtsi.
>
> As reported by Michael Walle [2], such firmware name can also be
> customized by a SBC vendor [3], so we can't always be sure which
> firmware to use.
>
> If required, let the user provide a custom tiboot3 or sysfw firmware
> name from the defconfig. Otherwise use the default firmware choice
> by copying tiboot3.bin and sysfw.itb symlinks.
>
> [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/doc/board/ti/k3.rst
> [2] http://lists.busybox.net/pipermail/buildroot/2024-April/688943.html
> [3] https://elixir.bootlin.com/u-boot/v2024.04/source/arch/arm/dts/k3-am625-phycore-som-binman.dtsi#L14
>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
> Changes in v12:
> - allow a custom tiboot3 and sysfw firmware name:
> http://lists.busybox.net/pipermail/buildroot/2024-April/688953.html
>
> Changes in v11:
> - Introduce BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN and BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB
> strings to provide firmware name to copy at the end of ti-k3-r5-loader build.
> This replace the "find . -regex" from provious patch version.
> - Add sysfw.itb handling needed to TI K3 SoC using Split Binary Boot Flow.
>
> Changes in v8:
> - Use the `find' command in pipe with the `cp' command.
>
> Changes in v6:
> - Replace `find' command with `cp' one.
>
> Changes in v5:
> - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with
> tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin
>
> Added in v4
> ---
> boot/ti-k3-r5-loader/Config.in | 40 +++++++++++++++++++++++++
> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 35 +++++++++++++++++++++-
> 2 files changed, 74 insertions(+), 1 deletion(-)
>
> diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in
> index 5f4f33b220..c0c7222a10 100644
> --- a/boot/ti-k3-r5-loader/Config.in
> +++ b/boot/ti-k3-r5-loader/Config.in
> @@ -102,4 +102,44 @@ config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
>
> https://docs.u-boot.org/en/v2024.01/develop/package/binman.html
>
> +config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN
> + string "tiboot3.bin binary name"
> + default "tiboot3.bin"
> + help
> + Name of the TI K3 tiboot3.bin binary to use.
> +
> + The tiboot3 binary name must match with the TI K3 SoC boot
> + ROM:
> +
> + - General Purpose devices (gp)
> + - High Security - Field Securable devices (hs-fs)
> + - High Security - Security Enforcing devices (hs)
> +
> + Or if the tiboot3 binary generated use a custom name.
> +
> + If unsure, use the default tiboot3.bin (symlink) generated by
> + binman.
> +
> +config BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB
This should be SYSFW, not SWSFW, right?
> + string "sysfw.itb binary name"
> + default "sysfw.itb"
> + help
> + Name of the TI K3 sysfw.itb binary to use (if any required).
> +
> + sysfw*.itb are only generated for Split binary based Boot
> + Flow (eg: am65, j721e). This option is not used on other
> + TI K3 devices.
> +
> + The sysfw binary name must match with the TI K3 SoC boot
> + ROM:
> +
> + - General Purpose devices (gp)
> + - High Security - Field Securable devices (hs-fs)
> + - High Security - Security Enforcing devices (hs)
> +
> + Or if the sysfw binary generated use a custom name.
> +
> + If unsure, use the default sysfw.itb (symlink) generated by
> + binman.
> +
> endif
> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> index cf18b43871..0191a2501c 100644
> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> @@ -73,7 +73,24 @@ TI_K3_R5_LOADER_DEPENDENCIES += \
> host-python-pylibfdt \
> host-python-setuptools
> TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR)
> -endif
> +
> +TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN))
> +
> +define TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN
> + cp $(@D)/$(TI_K3_R5_LOADER_TIBOOT3_BIN) $(BINARIES_DIR)/tiboot3.bin
> +endef
> +
> +TI_K3_R5_LOADER_SWSFW_ITB = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB))
Here also, SWSFW -> SYSFW.
Regards,
Arnout
> +
> +# sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e).
> +# So, if sysfw.itb symlink exist we must copy it or the custom sysfw.itb.
> +define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB
> + if test -e $(@D)/sysfw.itb ; then \
> + cp $(@D)/$(TI_K3_R5_LOADER_SWSFW_ITB) $(BINARIES_DIR)/sysfw.itb ; \
> + fi
> +endef
> +
> +endif # BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
>
> define TI_K3_R5_LOADER_BUILD_CMDS
> $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS)
> @@ -81,6 +98,22 @@ endef
>
> define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS
> cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin
> + $(TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN)
> + $(TI_K3_R5_LOADER_INSTALL_SWSFW_ITB)
> endef
>
> +# Checks to give errors that the user can understand
> +# Must be before we call to kconfig-package
> +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER)$(BR_BUILDING),yy)
> +
> +ifeq ($(TI_K3_R5_LOADER_TIBOOT3_BIN),)
> +$(error No custom tiboot3 name specified, check your BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN setting)
> +endif
> +
> +ifeq ($(TI_K3_R5_LOADER_SWSFW_ITB),)
> +$(error No custom sysfw name specified, check your BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB setting)
> +endif
> +
> +endif # BR_BUILDING
> +
> $(eval $(kconfig-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v12 07/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (5 preceding siblings ...)
2024-04-07 10:34 ` [Buildroot] [PATCH v12 06/16] boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR Romain Naour
@ 2024-04-07 10:35 ` Romain Naour
2024-04-08 13:00 ` Arnout Vandecappelle via buildroot
2024-04-07 10:35 ` [Buildroot] [PATCH v12 08/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18 Romain Naour
` (9 subsequent siblings)
16 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:35 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Dario Binacchi
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
The 2024.01 version of U-Boot for the am62x-sk board has introduced two
major changes:
- The device tree k3-am625-sk.dtb is no longer searched in /boot, but in
/boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET
and the use of extlinux.conf for the proper loading of the device tree.
Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to
auto-generate the extlinux.conf file so that developers can change the
kernel loading options by modifying the .config.
- U-Boot is capable of building tiboot3.bin using Binman. So it's no longer
necessary to use custom tools like ti-k3-image-gen.
- Use a custom tiboot3.bin since the default is "hs-fs",
but the ti_am62x_sk_defconfig expect the "gp" one
Tested on SK-AM62B-P1.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Changes in v12:
- Use a custom tiboot3.bin since the default is "hs-fs",
but the ti_am62x_sk_defconfig expect the "gp" one.
Changes in v11:
- remove BR2_TARGET_UBOOT_NEEDS_TI_K3_DM option
- add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
- Use new BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS and
BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS options to ease
post build/image script.
Changes in v7:
- Add devicetree k3-am625-sk.dtb to extlinux.conf
- Improve error messages in post-build.sh script
Changes in v6:
- Enable BR2_TARGET_UBOOT_USE_BINMAN option
Changes in v5:
- Update commit message.
Changes in v4:
- bump to 204.01 instead of 2023.10
- Update the commit message
- Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs
in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig.
Changes in v2:
- Update the commit message
- Drop Python options required by binman.
- Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically
selects the Python modules required by binman.
---
board/ti/am62x-sk/genimage.cfg | 7 ++-
.../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +-
board/ti/am62x-sk/post-build.sh | 54 +++++++++++++++++++
configs/ti_am62x_sk_defconfig | 14 ++---
4 files changed, 69 insertions(+), 8 deletions(-)
create mode 100755 board/ti/am62x-sk/post-build.sh
diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg
index 26304fe98f..398209f4d8 100644
--- a/board/ti/am62x-sk/genimage.cfg
+++ b/board/ti/am62x-sk/genimage.cfg
@@ -4,10 +4,15 @@ image boot.vfat {
"tiboot3.bin",
"tispl.bin",
"u-boot.img",
+ "k3-am625-sk.dtb",
+ "Image"
+ }
+ file extlinux/extlinux.conf {
+ image = extlinux.conf
}
}
- size = 16M
+ size = 64M
}
image sdcard.img {
diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
index 2a5c99c459..0e171c56f5 100644
--- a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
+++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2
+sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2
diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh
new file mode 100755
index 0000000000..4f19f4d6cf
--- /dev/null
+++ b/board/ti/am62x-sk/post-build.sh
@@ -0,0 +1,54 @@
+#!/bin/sh -x
+
+# genimage will need to find the extlinux.conf
+# in the binaries directory
+
+die() {
+ cat <<EOF >&2
+Error: $@
+
+Usage: ${0} -c <console> -r <root> [-x <extra-args>]
+EOF
+ exit 1
+}
+
+o='c:d:r:x:'
+O='console:,devicetree:,root:,extra-args:'
+opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")"
+eval set -- "${opts}"
+while [ ${#} -gt 0 ]; do
+ case "${1}" in
+ (-c|--console)
+ CONSOLE="${2}"; shift 2
+ ;;
+ (-d|--devicetree)
+ DEVICETREE="${2}"; shift 2
+ ;;
+ (-r|--root)
+ ROOT="${2}"; shift 2
+ ;;
+ (-x|--extra-args)
+ EXTRA_ARGS="${2}"; shift 2
+ ;;
+ (--)
+ shift 1; break
+ ;;
+ esac
+done
+
+[ -n "${CONSOLE}" ] || die "Missing \`console' argument"
+[ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument"
+[ -n "${ROOT}" ] || die "Missing \`root' argument"
+append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait"
+if [ -n "${EXTRA_ARGS}" ]; then
+ append="${append} ${EXTRA_ARGS}"
+fi
+
+mkdir -p "${BINARIES_DIR}"
+cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
+ label am62x-sk-buildroot
+ kernel /Image
+ fdtdir /
+ devicetree /${DEVICETREE}
+ append ${append}
+ __HEADER_EOF
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index b2814526bb..7a411ed423 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -1,15 +1,16 @@
BR2_aarch64=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
+BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16"
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y
BR2_TARGET_ROOTFS_EXT2=y
@@ -23,21 +24,22 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y
BR2_TARGET_OPTEE_OS=y
BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x"
-BR2_TARGET_TI_K3_IMAGE_GEN=y
-BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y
BR2_TARGET_TI_K3_R5_LOADER=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
-BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
+BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
+BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
+BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
+BR2_TARGET_UBOOT_USE_BINMAN=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 07/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01
2024-04-07 10:35 ` [Buildroot] [PATCH v12 07/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 Romain Naour
@ 2024-04-08 13:00 ` Arnout Vandecappelle via buildroot
2024-04-09 11:36 ` Romain Naour
2024-04-09 12:05 ` Romain Naour
0 siblings, 2 replies; 45+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-04-08 13:00 UTC (permalink / raw)
To: Romain Naour, buildroot; +Cc: Dario Binacchi
On 07/04/2024 12:35, Romain Naour wrote:
> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>
> The 2024.01 version of U-Boot for the am62x-sk board has introduced two
> major changes:
> - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in
> /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET
> and the use of extlinux.conf for the proper loading of the device tree.
> Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to
> auto-generate the extlinux.conf file so that developers can change the
> kernel loading options by modifying the .config.
> - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer
> necessary to use custom tools like ti-k3-image-gen.
> - Use a custom tiboot3.bin since the default is "hs-fs",
> but the ti_am62x_sk_defconfig expect the "gp" one
>
> Tested on SK-AM62B-P1.
>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
[snip]
> +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
> + label am62x-sk-buildroot
> + kernel /Image
> + fdtdir /
> + devicetree /${DEVICETREE}
> + append ${append}
I wonder if it's really useful to have this custom extlinux.conf... We could
also give the devicetree a common name, and move the append line into the device
tree itself.
But this patch has had enough iterations, let's just keep it as is :-)
[snip]
> -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
> +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
The hash for 2024.01 is currently in boot/uboot/uboot.hash, but as soon as we
update the U-Boot version, it will no longer be. So to be future safe, we should
add a local override of the uboot hash file as well (which is simply identical
to uboot.hash).
Regards,
Arnout
> BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
> +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
> +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
> BR2_TARGET_UBOOT=y
> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
> BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
> BR2_TARGET_UBOOT_NEEDS_DTC=y
> BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
> BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
> BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
> +BR2_TARGET_UBOOT_USE_BINMAN=y
> # BR2_TARGET_UBOOT_FORMAT_BIN is not set
> BR2_TARGET_UBOOT_FORMAT_IMG=y
> BR2_TARGET_UBOOT_SPL=y
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 07/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01
2024-04-08 13:00 ` Arnout Vandecappelle via buildroot
@ 2024-04-09 11:36 ` Romain Naour
2024-04-09 12:05 ` Romain Naour
1 sibling, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-09 11:36 UTC (permalink / raw)
To: Arnout Vandecappelle, buildroot; +Cc: Dario Binacchi
Hello Arnout,
Le 08/04/2024 à 15:00, Arnout Vandecappelle a écrit :
>
>
> On 07/04/2024 12:35, Romain Naour wrote:
>> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>>
>> The 2024.01 version of U-Boot for the am62x-sk board has introduced two
>> major changes:
>> - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in
>> /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET
>> and the use of extlinux.conf for the proper loading of the device tree.
>> Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to
>> auto-generate the extlinux.conf file so that developers can change the
>> kernel loading options by modifying the .config.
>> - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer
>> necessary to use custom tools like ti-k3-image-gen.
>> - Use a custom tiboot3.bin since the default is "hs-fs",
>> but the ti_am62x_sk_defconfig expect the "gp" one
>>
>> Tested on SK-AM62B-P1.
>>
>> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>> Signed-off-by: Romain Naour <romain.naour@smile.fr>
>
> [snip]
>> +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
>> + label am62x-sk-buildroot
>> + kernel /Image
>> + fdtdir /
>> + devicetree /${DEVICETREE}
>> + append ${append}
>
> I wonder if it's really useful to have this custom extlinux.conf... We could
> also give the devicetree a common name, and move the append line into the device
> tree itself.
>
I believe it's to avoid using TI u-boot environment that expect a unusual
path /boot/dtb/ti for searching for devicetree.
See board/ti/j721e-sk/post-build.sh from:
http://lists.busybox.net/pipermail/buildroot/2024-February/685672.html
> But this patch has had enough iterations, let's just keep it as is :-)
Indeed.
Best regards,
Romain
>
> [snip]
>> -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
>> +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
>
> The hash for 2024.01 is currently in boot/uboot/uboot.hash, but as soon as we
> update the U-Boot version, it will no longer be. So to be future safe, we should
> add a local override of the uboot hash file as well (which is simply identical
> to uboot.hash).
>
> Regards,
> Arnout
>
>> BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
>> +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
>> +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
>> BR2_TARGET_UBOOT=y
>> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>> BR2_TARGET_UBOOT_CUSTOM_VERSION=y
>> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
>> BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
>> BR2_TARGET_UBOOT_NEEDS_DTC=y
>> BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
>> BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
>> BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
>> +BR2_TARGET_UBOOT_USE_BINMAN=y
>> # BR2_TARGET_UBOOT_FORMAT_BIN is not set
>> BR2_TARGET_UBOOT_FORMAT_IMG=y
>> BR2_TARGET_UBOOT_SPL=y
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 07/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01
2024-04-08 13:00 ` Arnout Vandecappelle via buildroot
2024-04-09 11:36 ` Romain Naour
@ 2024-04-09 12:05 ` Romain Naour
1 sibling, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-09 12:05 UTC (permalink / raw)
To: Arnout Vandecappelle, buildroot; +Cc: Dario Binacchi
Hello Arnout,
Le 08/04/2024 à 15:00, Arnout Vandecappelle a écrit :
>
>
> On 07/04/2024 12:35, Romain Naour wrote:
>> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>>
>> The 2024.01 version of U-Boot for the am62x-sk board has introduced two
>> major changes:
>> - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in
>> /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET
>> and the use of extlinux.conf for the proper loading of the device tree.
>> Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to
>> auto-generate the extlinux.conf file so that developers can change the
>> kernel loading options by modifying the .config.
>> - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer
>> necessary to use custom tools like ti-k3-image-gen.
>> - Use a custom tiboot3.bin since the default is "hs-fs",
>> but the ti_am62x_sk_defconfig expect the "gp" one
>>
>> Tested on SK-AM62B-P1.
>>
>> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>> Signed-off-by: Romain Naour <romain.naour@smile.fr>
>
> [snip]
>> +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
>> + label am62x-sk-buildroot
>> + kernel /Image
>> + fdtdir /
>> + devicetree /${DEVICETREE}
>> + append ${append}
>
> I wonder if it's really useful to have this custom extlinux.conf... We could
> also give the devicetree a common name, and move the append line into the device
> tree itself.
>
> But this patch has had enough iterations, let's just keep it as is :-)
>
> [snip]
>> -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
>> +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
>
> The hash for 2024.01 is currently in boot/uboot/uboot.hash, but as soon as we
> update the U-Boot version, it will no longer be. So to be future safe, we should
> add a local override of the uboot hash file as well (which is simply identical
> to uboot.hash).
I updated board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash in this
version, so we are future safe already :)
Best regards,
Romain
>
> Regards,
> Arnout
>
>> BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
>> +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
>> +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
>> BR2_TARGET_UBOOT=y
>> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>> BR2_TARGET_UBOOT_CUSTOM_VERSION=y
>> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
>> BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
>> BR2_TARGET_UBOOT_NEEDS_DTC=y
>> BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
>> BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
>> BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
>> +BR2_TARGET_UBOOT_USE_BINMAN=y
>> # BR2_TARGET_UBOOT_FORMAT_BIN is not set
>> BR2_TARGET_UBOOT_FORMAT_IMG=y
>> BR2_TARGET_UBOOT_SPL=y
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v12 08/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (6 preceding siblings ...)
2024-04-07 10:35 ` [Buildroot] [PATCH v12 07/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 Romain Naour
@ 2024-04-07 10:35 ` Romain Naour
2024-04-07 10:35 ` [Buildroot] [PATCH v12 09/16] board/ti/am62x-sk: generalize post-build.sh Romain Naour
` (8 subsequent siblings)
16 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:35 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Dario Binacchi
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Tested on SK-AM62B-P1.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Changes in v11:
- Add BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
Changes in v8
- Bump to 6.6.18 from 6.6.17
- Update commit message
Changes in v5
- Bump to 6.6.17 from 6.6.1
- Update commit message
Changes in v4
- Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig.
no changes since v1
---
board/ti/am62x-sk/patches/linux-headers/linux-headers.hash | 1 +
board/ti/am62x-sk/patches/linux/linux.hash | 2 ++
configs/ti_am62x_sk_defconfig | 5 +++--
3 files changed, 6 insertions(+), 2 deletions(-)
create mode 120000 board/ti/am62x-sk/patches/linux-headers/linux-headers.hash
create mode 100644 board/ti/am62x-sk/patches/linux/linux.hash
diff --git a/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash b/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash
new file mode 120000
index 0000000000..5808d92afe
--- /dev/null
+++ b/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash
@@ -0,0 +1 @@
+../linux/linux.hash
\ No newline at end of file
diff --git a/board/ti/am62x-sk/patches/linux/linux.hash b/board/ti/am62x-sk/patches/linux/linux.hash
new file mode 100644
index 0000000000..cedae67f33
--- /dev/null
+++ b/board/ti/am62x-sk/patches/linux/linux.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index 7a411ed423..d4b19e5039 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -1,13 +1,14 @@
BR2_aarch64=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18"
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk"
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v12 09/16] board/ti/am62x-sk: generalize post-build.sh
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (7 preceding siblings ...)
2024-04-07 10:35 ` [Buildroot] [PATCH v12 08/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18 Romain Naour
@ 2024-04-07 10:35 ` Romain Naour
2024-04-08 13:25 ` Arnout Vandecappelle via buildroot
2024-04-07 10:35 ` [Buildroot] [PATCH v12 10/16] board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx Romain Naour
` (7 subsequent siblings)
16 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:35 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Dario Binacchi
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Removing any explicit reference to the ti_am62x_sk_defconfig
configuration, the script can also be used by other configurations or at
least by ti_am64x_sk_defconfig.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Added in v8
---
board/ti/am62x-sk/post-build.sh | 10 +++++++---
configs/ti_am62x_sk_defconfig | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh
index 4f19f4d6cf..d066e28fd0 100755
--- a/board/ti/am62x-sk/post-build.sh
+++ b/board/ti/am62x-sk/post-build.sh
@@ -12,8 +12,8 @@ EOF
exit 1
}
-o='c:d:r:x:'
-O='console:,devicetree:,root:,extra-args:'
+o='c:d:l:r:x:'
+O='console:,devicetree:,label:,root:,extra-args:'
opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")"
eval set -- "${opts}"
while [ ${#} -gt 0 ]; do
@@ -24,6 +24,9 @@ while [ ${#} -gt 0 ]; do
(-d|--devicetree)
DEVICETREE="${2}"; shift 2
;;
+ (-l|--label)
+ LABEL="${2}"; shift 2
+ ;;
(-r|--root)
ROOT="${2}"; shift 2
;;
@@ -38,6 +41,7 @@ done
[ -n "${CONSOLE}" ] || die "Missing \`console' argument"
[ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument"
+[ -n "${LABEL}" ] || die "Missing \`label' argument"
[ -n "${ROOT}" ] || die "Missing \`root' argument"
append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait"
if [ -n "${EXTRA_ARGS}" ]; then
@@ -46,7 +50,7 @@ fi
mkdir -p "${BINARIES_DIR}"
cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
- label am62x-sk-buildroot
+ label ${LABEL}
kernel /Image
fdtdir /
devicetree /${DEVICETREE}
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index d4b19e5039..1c7085d04d 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
-BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
+BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
BR2_LINUX_KERNEL=y
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 09/16] board/ti/am62x-sk: generalize post-build.sh
2024-04-07 10:35 ` [Buildroot] [PATCH v12 09/16] board/ti/am62x-sk: generalize post-build.sh Romain Naour
@ 2024-04-08 13:25 ` Arnout Vandecappelle via buildroot
2024-04-09 11:41 ` Romain Naour
0 siblings, 1 reply; 45+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-04-08 13:25 UTC (permalink / raw)
To: Romain Naour, buildroot; +Cc: Dario Binacchi
On 07/04/2024 12:35, Romain Naour wrote:
> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>
> Removing any explicit reference to the ti_am62x_sk_defconfig
> configuration, the script can also be used by other configurations or at
> least by ti_am64x_sk_defconfig.
>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
>
> Added in v8
> ---
> board/ti/am62x-sk/post-build.sh | 10 +++++++---
Keeping in mind the above remark that it can be reused for ti_am64x, perhaps
move it to board/ti/common or board/ti/common-am6x or something like that?
Same for the hash files BTW.
For me it's fine to apply as is and clean this up afterwards.
> configs/ti_am62x_sk_defconfig | 2 +-
> 2 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh
> index 4f19f4d6cf..d066e28fd0 100755
> --- a/board/ti/am62x-sk/post-build.sh
> +++ b/board/ti/am62x-sk/post-build.sh
> @@ -12,8 +12,8 @@ EOF
> exit 1
> }
>
> -o='c:d:r:x:'
> -O='console:,devicetree:,root:,extra-args:'
> +o='c:d:l:r:x:'
> +O='console:,devicetree:,label:,root:,extra-args:'
> opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")"
> eval set -- "${opts}"
> while [ ${#} -gt 0 ]; do
> @@ -24,6 +24,9 @@ while [ ${#} -gt 0 ]; do
> (-d|--devicetree)
> DEVICETREE="${2}"; shift 2
> ;;
> + (-l|--label)
> + LABEL="${2}"; shift 2
> + ;;
> (-r|--root)
> ROOT="${2}"; shift 2
> ;;
> @@ -38,6 +41,7 @@ done
>
> [ -n "${CONSOLE}" ] || die "Missing \`console' argument"
> [ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument"
> +[ -n "${LABEL}" ] || die "Missing \`label' argument"
> [ -n "${ROOT}" ] || die "Missing \`root' argument"
> append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait"
> if [ -n "${EXTRA_ARGS}" ]; then
> @@ -46,7 +50,7 @@ fi
>
> mkdir -p "${BINARIES_DIR}"
> cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
> - label am62x-sk-buildroot
> + label ${LABEL}
AFAIK the label is completely meaningless when you use extlinux.conf from
U-Boot. It's used as the menu entry in the extlinux bootloader, but in U-Boot I
think it's just the first one which gets chosen, without menu. And regardless,
we have one entry anyway. So can't we just set the label to "buildroot"?
If we do set a label, I would use BR2_TARGET_GENERIC_HOSTNAME instead of
adding yet another option in the post-build script.
Regards,
Arnout
> kernel /Image
> fdtdir /
> devicetree /${DEVICETREE}
> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
> index d4b19e5039..1c7085d04d 100644
> --- a/configs/ti_am62x_sk_defconfig
> +++ b/configs/ti_am62x_sk_defconfig
> @@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
> BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches"
> BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
> BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
> -BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
> +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
> BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
> BR2_LINUX_KERNEL=y
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 09/16] board/ti/am62x-sk: generalize post-build.sh
2024-04-08 13:25 ` Arnout Vandecappelle via buildroot
@ 2024-04-09 11:41 ` Romain Naour
0 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-09 11:41 UTC (permalink / raw)
To: Arnout Vandecappelle, buildroot; +Cc: Dario Binacchi
Hello Arnout,
Le 08/04/2024 à 15:25, Arnout Vandecappelle a écrit :
>
>
> On 07/04/2024 12:35, Romain Naour wrote:
>> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>>
>> Removing any explicit reference to the ti_am62x_sk_defconfig
>> configuration, the script can also be used by other configurations or at
>> least by ti_am64x_sk_defconfig.
>>
>> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>> Signed-off-by: Romain Naour <romain.naour@smile.fr>
>> ---
>>
>> Added in v8
>> ---
>> board/ti/am62x-sk/post-build.sh | 10 +++++++---
>
> Keeping in mind the above remark that it can be reused for ti_am64x, perhaps
> move it to board/ti/common or board/ti/common-am6x or something like that?
>
> Same for the hash files BTW.
>
> For me it's fine to apply as is and clean this up afterwards.
>
>> configs/ti_am62x_sk_defconfig | 2 +-
>> 2 files changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh
>> index 4f19f4d6cf..d066e28fd0 100755
>> --- a/board/ti/am62x-sk/post-build.sh
>> +++ b/board/ti/am62x-sk/post-build.sh
>> @@ -12,8 +12,8 @@ EOF
>> exit 1
>> }
>> -o='c:d:r:x:'
>> -O='console:,devicetree:,root:,extra-args:'
>> +o='c:d:l:r:x:'
>> +O='console:,devicetree:,label:,root:,extra-args:'
>> opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")"
>> eval set -- "${opts}"
>> while [ ${#} -gt 0 ]; do
>> @@ -24,6 +24,9 @@ while [ ${#} -gt 0 ]; do
>> (-d|--devicetree)
>> DEVICETREE="${2}"; shift 2
>> ;;
>> + (-l|--label)
>> + LABEL="${2}"; shift 2
>> + ;;
>> (-r|--root)
>> ROOT="${2}"; shift 2
>> ;;
>> @@ -38,6 +41,7 @@ done
>> [ -n "${CONSOLE}" ] || die "Missing \`console' argument"
>> [ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument"
>> +[ -n "${LABEL}" ] || die "Missing \`label' argument"
>> [ -n "${ROOT}" ] || die "Missing \`root' argument"
>> append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait"
>> if [ -n "${EXTRA_ARGS}" ]; then
>> @@ -46,7 +50,7 @@ fi
>> mkdir -p "${BINARIES_DIR}"
>> cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
>> - label am62x-sk-buildroot
>> + label ${LABEL}
>
> AFAIK the label is completely meaningless when you use extlinux.conf from
> U-Boot. It's used as the menu entry in the extlinux bootloader, but in U-Boot I
> think it's just the first one which gets chosen, without menu. And regardless,
> we have one entry anyway. So can't we just set the label to "buildroot"?
>
> If we do set a label, I would use BR2_TARGET_GENERIC_HOSTNAME instead of adding
> yet another option in the post-build script.
I'll keep this as is in order to merge this series.
Best regards,
Romain
>
> Regards,
> Arnout
>
>> kernel /Image
>> fdtdir /
>> devicetree /${DEVICETREE}
>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
>> index d4b19e5039..1c7085d04d 100644
>> --- a/configs/ti_am62x_sk_defconfig
>> +++ b/configs/ti_am62x_sk_defconfig
>> @@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
>> BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches"
>> BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
>> BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
>> -BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r
>> /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
>> +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l
>> am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
>> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
>> BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
>> BR2_LINUX_KERNEL=y
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v12 10/16] board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (8 preceding siblings ...)
2024-04-07 10:35 ` [Buildroot] [PATCH v12 09/16] board/ti/am62x-sk: generalize post-build.sh Romain Naour
@ 2024-04-07 10:35 ` Romain Naour
2024-04-08 13:26 ` Arnout Vandecappelle via buildroot
2024-04-07 10:35 ` [Buildroot] [PATCH v12 11/16] configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01 Romain Naour
` (6 subsequent siblings)
16 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:35 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Dario Binacchi
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
The patch makes it clear that the moved script can be used by the
am6{2,4}x platforms.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Changes in v11:
- Remove board/ti/common/am6xx/post-image.sh since we use
BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS option instead.
Added in v8
---
board/ti/{am62x-sk => common/am6xx}/post-build.sh | 0
configs/ti_am62x_sk_defconfig | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename board/ti/{am62x-sk => common/am6xx}/post-build.sh (100%)
diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/common/am6xx/post-build.sh
similarity index 100%
rename from board/ti/am62x-sk/post-build.sh
rename to board/ti/common/am6xx/post-build.sh
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index 1c7085d04d..b62f624d82 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -2,7 +2,7 @@ BR2_aarch64=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh"
BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 10/16] board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx
2024-04-07 10:35 ` [Buildroot] [PATCH v12 10/16] board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx Romain Naour
@ 2024-04-08 13:26 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 45+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-04-08 13:26 UTC (permalink / raw)
To: Romain Naour, buildroot; +Cc: Dario Binacchi
On 07/04/2024 12:35, Romain Naour wrote:
> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>
> The patch makes it clear that the moved script can be used by the
> am6{2,4}x platforms.
>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
> Changes in v11:
> - Remove board/ti/common/am6xx/post-image.sh since we use
> BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS option instead.
>
> Added in v8
> ---
> board/ti/{am62x-sk => common/am6xx}/post-build.sh | 0
> configs/ti_am62x_sk_defconfig | 2 +-
> 2 files changed, 1 insertion(+), 1 deletion(-)
> rename board/ti/{am62x-sk => common/am6xx}/post-build.sh (100%)
>
> diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/common/am6xx/post-build.sh
> similarity index 100%
> rename from board/ti/am62x-sk/post-build.sh
> rename to board/ti/common/am6xx/post-build.sh
Oops, never mind my previous comment about moving it to common :-)
Regards,
Arnout
> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
> index 1c7085d04d..b62f624d82 100644
> --- a/configs/ti_am62x_sk_defconfig
> +++ b/configs/ti_am62x_sk_defconfig
> @@ -2,7 +2,7 @@ BR2_aarch64=y
> BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
> BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches"
> BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
> -BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh"
> BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
> BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v12 11/16] configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (9 preceding siblings ...)
2024-04-07 10:35 ` [Buildroot] [PATCH v12 10/16] board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx Romain Naour
@ 2024-04-07 10:35 ` Romain Naour
2024-04-07 10:35 ` [Buildroot] [PATCH v12 12/16] configs/ti_am64x_sk_defconfig: bump Linux version to 6.6.18 Romain Naour
` (5 subsequent siblings)
16 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:35 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Dario Binacchi
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
The 2024.01 version of U-Boot for the am64x-sk board has introduced two
major changes:
- The device tree k3-am642-sk.dtb is no longer searched in /boot, but in
/boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET
and the use of extlinux.conf for the proper loading of the device tree.
Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to
auto-generate the extlinux.conf file so that developers can change the
kernel loading options by modifying the .config.
- U-Boot is capable of building tiboot3.bin using Binman. So it's no longer
necessary to use custom tools like ti-k3-image-gen.
- Use a custom tiboot3.bin since the default is "hs-fs",
but the ti_am64x_sk_defconfig expect the "gp" one.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Changes in v12:
- use a custom tiboot3.bin since the default one is the hs-fs,
but the ti_am64x_sk_defconfig expect the gp one.
Changes in v11:
- add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
- Use new BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS and
BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS options to ease
post build/image script.
Changes in v9:
- squashed with patch [v8,20/23] "package/ti-k3: fix BR2_PACKAGE_TI_K3_SOC
setting for am64x SOC"
- Update the commit message
Added in v8
---
board/ti/am64x-sk/genimage.cfg | 7 ++++++-
.../patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 3 +--
configs/ti_am64x_sk_defconfig | 15 +++++++++------
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/board/ti/am64x-sk/genimage.cfg b/board/ti/am64x-sk/genimage.cfg
index 26304fe98f..88dff8fe23 100644
--- a/board/ti/am64x-sk/genimage.cfg
+++ b/board/ti/am64x-sk/genimage.cfg
@@ -4,10 +4,15 @@ image boot.vfat {
"tiboot3.bin",
"tispl.bin",
"u-boot.img",
+ "k3-am642-sk.dtb",
+ "Image"
+ }
+ file extlinux/extlinux.conf {
+ image = extlinux.conf
}
}
- size = 16M
+ size = 64M
}
image sdcard.img {
diff --git a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
index 2a5c99c459..dbb4428738 100644
--- a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
+++ b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
@@ -1,2 +1 @@
-# Locally computed:
-sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2
+sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2
diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index 1ebdec68ac..eaeccde316 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -1,15 +1,16 @@
BR2_aarch64=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am642-sk.dtb -l am64x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg"
+BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16"
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y
BR2_TARGET_ROOTFS_EXT2=y
@@ -23,20 +24,22 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y
BR2_TARGET_OPTEE_OS=y
BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x"
-BR2_TARGET_TI_K3_IMAGE_GEN=y
-BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y
BR2_TARGET_TI_K3_R5_LOADER=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
-BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
+BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5"
+BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin"
+BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
+BR2_TARGET_UBOOT_USE_BINMAN=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v12 12/16] configs/ti_am64x_sk_defconfig: bump Linux version to 6.6.18
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (10 preceding siblings ...)
2024-04-07 10:35 ` [Buildroot] [PATCH v12 11/16] configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01 Romain Naour
@ 2024-04-07 10:35 ` Romain Naour
2024-04-07 10:35 ` [Buildroot] [PATCH v12 13/16] boot/uboot: remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME Romain Naour
` (4 subsequent siblings)
16 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:35 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Dario Binacchi
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Changes in v11:
- add BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
Added in v8
---
board/ti/am64x-sk/patches/linux-headers/linux-headers.hash | 1 +
board/ti/am64x-sk/patches/linux/linux.hash | 2 ++
configs/ti_am64x_sk_defconfig | 5 +++--
3 files changed, 6 insertions(+), 2 deletions(-)
create mode 120000 board/ti/am64x-sk/patches/linux-headers/linux-headers.hash
create mode 100644 board/ti/am64x-sk/patches/linux/linux.hash
diff --git a/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash b/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash
new file mode 120000
index 0000000000..5808d92afe
--- /dev/null
+++ b/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash
@@ -0,0 +1 @@
+../linux/linux.hash
\ No newline at end of file
diff --git a/board/ti/am64x-sk/patches/linux/linux.hash b/board/ti/am64x-sk/patches/linux/linux.hash
new file mode 100644
index 0000000000..cedae67f33
--- /dev/null
+++ b/board/ti/am64x-sk/patches/linux/linux.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz
diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index eaeccde316..56e1b23335 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -1,13 +1,14 @@
BR2_aarch64=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh"
BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am642-sk.dtb -l am64x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18"
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk"
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v12 13/16] boot/uboot: remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (11 preceding siblings ...)
2024-04-07 10:35 ` [Buildroot] [PATCH v12 12/16] configs/ti_am64x_sk_defconfig: bump Linux version to 6.6.18 Romain Naour
@ 2024-04-07 10:35 ` Romain Naour
2024-04-07 10:35 ` [Buildroot] [PATCH v12 14/16] boot/ti-k3-image-gen: remove package Romain Naour
` (3 subsequent siblings)
16 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:35 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Previoulsy (without binman), when a TI K3 SoC using Combined binary
with a split firmware boot method was used (am62ax or am62x) [1], the
user had to select BR2_TARGET_UBOOT_NEEDS_TI_K3_DM in the defconfig
to provide Device Manager firmware provided by ti-k3-boot-firmware.
With binman, this option is no longer necessary since
ti-k3-boot-firmware package is already in the u-boot dependency and the
path to DM and SYSFW binaries are provided by BINMAN_INDIRS.
We are going to remove ti-k3-image-gen, so binman is now mandatory on
all TI K3 SoCs.
[1] https://gitlab.com/buildroot.org/buildroot/-/commit/52ce606c05ee3ac869f8087292bc3dbb0d25b79b
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
boot/uboot/Config.in | 13 -------------
boot/uboot/uboot.mk | 4 ----
2 files changed, 17 deletions(-)
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 39e49d681b..8d2228dc7d 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -251,19 +251,6 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
j721e) also need the Device Manager (DM) firmware to be
available for the U-Boot build.
-if BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
-
-# TI_K3_DM_SOCNAME is only needed when ti-k3-image-gen is used for
-# TI K3 devices using the Device Manager (DM) firmware.
-# We use the SoC selection defined for the ti-k3-image-gen
-# package.
-config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
- string
- default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX
- default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
-
-endif
-
config BR2_TARGET_UBOOT_NEEDS_OPENSBI
bool "U-Boot needs OpenSBI"
depends on BR2_TARGET_OPENSBI
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 398485195e..a894654698 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -195,11 +195,7 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf
endif
ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE),y)
-UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME))
UBOOT_DEPENDENCIES += ti-k3-boot-firmware
-ifneq ($(UBOOT_TI_K3_DM_SOCNAME),)
-UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f
-endif
endif
ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y)
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v12 14/16] boot/ti-k3-image-gen: remove package
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (12 preceding siblings ...)
2024-04-07 10:35 ` [Buildroot] [PATCH v12 13/16] boot/uboot: remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME Romain Naour
@ 2024-04-07 10:35 ` Romain Naour
2024-04-07 10:35 ` [Buildroot] [PATCH v12 15/16] boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN Romain Naour
` (2 subsequent siblings)
16 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:35 UTC (permalink / raw)
To: buildroot
Cc: Xuanhao Shi, Romain Naour, Dario Binacchi, Alexander Sverdlin,
Anand Gadiyar
ti-k3-image-gen tool is deprecated an replaced by binman [1].
All defconfig that was using it have been updated to use U-boot
binman tool instead.
So, we can safely remove ti-k3-image-gen package.
[1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235
Cc: Anand Gadiyar <gadiyar@ti.com>
Cc: Xuanhao Shi <X15000177@gmail.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Config.in.legacy | 7 +++
DEVELOPERS | 2 -
boot/Config.in | 1 -
boot/ti-k3-image-gen/Config.in | 77 -----------------------
boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 -
boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ----------------
6 files changed, 7 insertions(+), 137 deletions(-)
delete mode 100644 boot/ti-k3-image-gen/Config.in
delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash
delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 4084ffa516..76af1da348 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2024.05"
+config BR2_TARGET_TI_K3_IMAGE_GEN
+ bool "ti-k3-image-gen removed"
+ select BR2_LEGACY
+ help
+ ti-k3-image-gen tool has been removed and replaced by
+ U-Boot binman tool (requires U-boot >= 2023.10).
+
config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
bool "u-boot TI K3 DM option has been renamed."
select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index d78661cd60..399b2931ff 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -158,7 +158,6 @@ N: Anand Gadiyar <gadiyar@ti.com>
F: board/ti/am62x-sk/
F: board/ti/am64x-sk/
F: boot/ti-k3-boot-firmware/
-F: boot/ti-k3-image-gen/
F: boot/ti-k3-r5-loader/
F: configs/ti_am62x_sk_defconfig
F: configs/ti_am64x_sk_defconfig
@@ -3193,7 +3192,6 @@ N: Xuanhao Shi <X15000177@gmail.com>
F: board/ti/am62x-sk/
F: board/ti/am64x-sk/
F: boot/ti-k3-boot-firmware/
-F: boot/ti-k3-image-gen/
F: boot/ti-k3-r5-loader/
F: configs/ti_am62x_sk_defconfig
F: configs/ti_am64x_sk_defconfig
diff --git a/boot/Config.in b/boot/Config.in
index e5fdf7ad43..87e1b7c00e 100644
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -20,7 +20,6 @@ source "boot/s500-bootloader/Config.in"
source "boot/shim/Config.in"
source "boot/syslinux/Config.in"
source "boot/ti-k3-boot-firmware/Config.in"
-source "boot/ti-k3-image-gen/Config.in"
source "boot/ti-k3-r5-loader/Config.in"
source "boot/uboot/Config.in"
source "boot/vexpress-firmware/Config.in"
diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in
deleted file mode 100644
index d76cef82e9..0000000000
--- a/boot/ti-k3-image-gen/Config.in
+++ /dev/null
@@ -1,77 +0,0 @@
-config BR2_TARGET_TI_K3_IMAGE_GEN
- bool "ti-k3-image-gen"
- depends on BR2_TARGET_TI_K3_R5_LOADER
- select BR2_TARGET_TI_K3_BOOT_FIRMWARE
- # We need FIT support in uboot-tools, which is why we select a
- # host package
- select BR2_PACKAGE_HOST_UBOOT_TOOLS
- select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT
- help
- Use TI's k3-image-gen to build a separate bare metal boot
- binary from a separate SPL that is running on the R5 core.
-
- https://git.ti.com/cgit/k3-image-gen/k3-image-gen/
-
-if BR2_TARGET_TI_K3_IMAGE_GEN
-choice
- prompt "SoC family"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX
- bool "am62ax"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
- bool "am62x"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X
- bool "am64x"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X
- bool "am65x"
-
-endchoice
-
-choice
- prompt "Security type"
- help
- The target SoC security type option for image gen. Valid
- options are "gp" for General Purpose devices, "hs-fs" for
- High Security - Field Securable devices, or "hs" for High
- Security - Security Enforcing devices. Note for all High
- Security device variants the TI_SECURE_DEV_PKG environmental
- variable must be defined at build time pointing to a valid
- core-secdev-k3 folder location, otherwise the build will
- fail, see
- https://git.ti.com/cgit/security-development-tools/core-secdev-k3
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP
- bool "gp"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS
- bool "hs-fs"
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS
- bool "hs"
-
-endchoice
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SOC
- string
- default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX
- default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
- default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X
- default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE
- string
- default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX
- default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X
- default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X
- default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE
- string
- default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP
- default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS
- default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS
-
-endif
diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash b/boot/ti-k3-image-gen/ti-k3-image-gen.hash
deleted file mode 100644
index c968c5648f..0000000000
--- a/boot/ti-k3-image-gen/ti-k3-image-gen.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally calculated
-sha256 f89ea4b1f5c992455b1a682fde48359221b53f3294135df4bf20feea6aea90e4 k3-image-gen-08.06.00.007.tar.gz
-sha256 f012e8d000d711d0539e5b4c812fc1d3a59c10fc1e3d6ea155556f5b78286845 LICENSE
diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk
deleted file mode 100644
index 64be9a18f2..0000000000
--- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-################################################################################
-#
-# ti-k3-image-gen
-#
-################################################################################
-
-TI_K3_IMAGE_GEN_VERSION = 08.06.00.007
-TI_K3_IMAGE_GEN_SITE = https://git.ti.com/cgit/k3-image-gen/k3-image-gen/snapshot
-TI_K3_IMAGE_GEN_SOURCE = k3-image-gen-$(TI_K3_IMAGE_GEN_VERSION).tar.gz
-TI_K3_IMAGE_GEN_LICENSE = BSD-3-Clause
-TI_K3_IMAGE_GEN_LICENSE_FILES = LICENSE
-TI_K3_IMAGE_GEN_INSTALL_IMAGES = YES
-
-# - ti-k3-image-gen is used to build tiboot3.bin, using the
-# r5-u-boot-spl.bin file from the ti-k3-r5-loader package. Hence the
-# dependency on ti-k3-r5-loader.
-# - the ti-k3-image-gen makefiles seem to need some feature from Make
-# v4.0, similar to u-boot.
-TI_K3_IMAGE_GEN_DEPENDENCIES = \
- host-arm-gnu-toolchain \
- host-python3 \
- host-openssl \
- host-uboot-tools \
- ti-k3-r5-loader \
- ti-k3-boot-firmware \
- $(BR2_MAKE_HOST_DEPENDENCY)
-
-TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE))
-TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC))
-TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE))
-
-TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin
-
-define TI_K3_IMAGE_GEN_CONFIGURE_CMDS
- cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D)
-endef
-
-define TI_K3_IMAGE_GEN_BUILD_CMDS
- $(TARGET_MAKE_ENV) \
- $(BR2_MAKE) -C $(@D) \
- SOC=$(TI_K3_IMAGE_GEN_SOC) \
- SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \
- CONFIG=evm \
- CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \
- SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \
- O=$(@D)/tmp \
- BIN_DIR=$(@D)
-endef
-
-define TI_K3_IMAGE_GEN_INSTALL_IMAGES_CMDS
- cp $(@D)/tiboot3.bin $(BINARIES_DIR)
-endef
-
-$(eval $(generic-package))
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* [Buildroot] [PATCH v12 15/16] boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (13 preceding siblings ...)
2024-04-07 10:35 ` [Buildroot] [PATCH v12 14/16] boot/ti-k3-image-gen: remove package Romain Naour
@ 2024-04-07 10:35 ` Romain Naour
2024-04-08 13:39 ` Arnout Vandecappelle via buildroot
2024-04-07 10:35 ` [Buildroot] [PATCH v12 16/16] package/ti-k3: switch ti_am6{2, 4}x_sk_defconfig to HS-FS by default Romain Naour
2024-04-07 20:30 ` [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Arnout Vandecappelle via buildroot
16 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:35 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Since all AM62 and AM64 defconfig has been updated to use binman
and ti-k3-image-gen has been removed, binman is now mandatory
for all TI K3 SoC. So remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
option since since it can't be disabled anymore.
We can remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN without
legacy handling since this option is not part of any Buildroot
release.
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
boot/ti-k3-r5-loader/Config.in | 11 ++-------
boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 30 ++++++++++---------------
configs/ti_am62x_sk_defconfig | 1 -
configs/ti_am64x_sk_defconfig | 1 -
4 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in
index c0c7222a10..d91aefed79 100644
--- a/boot/ti-k3-r5-loader/Config.in
+++ b/boot/ti-k3-r5-loader/Config.in
@@ -1,6 +1,8 @@
config BR2_TARGET_TI_K3_R5_LOADER
bool "ti-k3-r5-loader"
depends on BR2_aarch64
+ depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema
+ select BR2_TARGET_TI_K3_BOOT_FIRMWARE # binman
help
Separate U-Boot SPL build for R5 core on TI's K3 processors.
Usually used to build tiboot3.bin with k3-image-gen.
@@ -93,15 +95,6 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE
help
Path to the TI K3 R5 Loader configuration file.
-config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
- bool "ti-k3-r5-loader use binman"
- depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema
- select BR2_TARGET_TI_K3_BOOT_FIRMWARE
- help
- Use binman tool for generation and signing of boot images.
-
- https://docs.u-boot.org/en/v2024.01/develop/package/binman.html
-
config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN
string "tiboot3.bin binary name"
default "tiboot3.bin"
diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
index 0191a2501c..93d9e0b134 100644
--- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
+++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
@@ -35,11 +35,20 @@ TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt
TI_K3_R5_LOADER_CPE_ID_VENDOR = denx
TI_K3_R5_LOADER_CPE_ID_PRODUCT = u-boot
TI_K3_R5_LOADER_INSTALL_IMAGES = YES
+# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt
+# Make sure that all binman requirements are build before ti-k3-r5-loader.
TI_K3_R5_LOADER_DEPENDENCIES = \
host-pkgconf \
$(BR2_MAKE_HOST_DEPENDENCY) \
host-arm-gnu-toolchain \
- host-openssl
+ host-openssl \
+ host-python3 \
+ host-python-jsonschema \
+ host-python-pyelftools \
+ host-python-pylibfdt \
+ host-python-pyyaml \
+ host-python-setuptools \
+ ti-k3-boot-firmware
TI_K3_R5_LOADER_MAKE = $(BR2_MAKE)
TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV)
@@ -58,21 +67,8 @@ TI_K3_R5_LOADER_MAKE_OPTS = \
CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \
ARCH=arm \
HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \
- HOSTLDFLAGS="$(HOST_LDFLAGS)"
-
-ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y)
-# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt
-TI_K3_R5_LOADER_DEPENDENCIES += \
- host-python-jsonschema \
- host-python-pyyaml \
- ti-k3-boot-firmware
-# Make sure that all binman requirements are build before ti-k3-r5-loader.
-TI_K3_R5_LOADER_DEPENDENCIES += \
- host-python3 \
- host-python-pyelftools \
- host-python-pylibfdt \
- host-python-setuptools
-TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR)
+ HOSTLDFLAGS="$(HOST_LDFLAGS)" \
+ BINMAN_INDIRS=$(BINARIES_DIR)
TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN))
@@ -90,8 +86,6 @@ define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB
fi
endef
-endif # BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
-
define TI_K3_R5_LOADER_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS)
endef
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index b62f624d82..fa2c008d4c 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
-BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index 56e1b23335..f7c6d16b35 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5"
BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin"
-BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 15/16] boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
2024-04-07 10:35 ` [Buildroot] [PATCH v12 15/16] boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN Romain Naour
@ 2024-04-08 13:39 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 45+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-04-08 13:39 UTC (permalink / raw)
To: Romain Naour, buildroot
On 07/04/2024 12:35, Romain Naour wrote:
> Since all AM62 and AM64 defconfig has been updated to use binman
> and ti-k3-image-gen has been removed, binman is now mandatory
> for all TI K3 SoC. So remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
> option since since it can't be disabled anymore.
>
> We can remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN without
> legacy handling since this option is not part of any Buildroot
> release.
>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
> boot/ti-k3-r5-loader/Config.in | 11 ++-------
> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 30 ++++++++++---------------
> configs/ti_am62x_sk_defconfig | 1 -
> configs/ti_am64x_sk_defconfig | 1 -
> 4 files changed, 14 insertions(+), 29 deletions(-)
>
> diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in
> index c0c7222a10..d91aefed79 100644
> --- a/boot/ti-k3-r5-loader/Config.in
> +++ b/boot/ti-k3-r5-loader/Config.in
> @@ -1,6 +1,8 @@
> config BR2_TARGET_TI_K3_R5_LOADER
> bool "ti-k3-r5-loader"
> depends on BR2_aarch64
> + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema
> + select BR2_TARGET_TI_K3_BOOT_FIRMWARE # binman
> help
> Separate U-Boot SPL build for R5 core on TI's K3 processors.
> Usually used to build tiboot3.bin with k3-image-gen.
> @@ -93,15 +95,6 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE
> help
> Path to the TI K3 R5 Loader configuration file.
>
> -config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
> - bool "ti-k3-r5-loader use binman"
> - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema
> - select BR2_TARGET_TI_K3_BOOT_FIRMWARE
> - help
> - Use binman tool for generation and signing of boot images.
> -
> - https://docs.u-boot.org/en/v2024.01/develop/package/binman.html
> -
> config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN
> string "tiboot3.bin binary name"
> default "tiboot3.bin"
> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> index 0191a2501c..93d9e0b134 100644
> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> @@ -35,11 +35,20 @@ TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt
> TI_K3_R5_LOADER_CPE_ID_VENDOR = denx
> TI_K3_R5_LOADER_CPE_ID_PRODUCT = u-boot
> TI_K3_R5_LOADER_INSTALL_IMAGES = YES
> +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt
In patch 4/16 you have another URL, it would be best to add that one here as
well, because the URL above has just 2 dependencies.
#
https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377
I didn't change that when applying patch 4/16 because it would anyway lead to
a conflict here.
> +# Make sure that all binman requirements are build before ti-k3-r5-loader.
build -> built
Regards,
Arnout
> TI_K3_R5_LOADER_DEPENDENCIES = \
> host-pkgconf \
> $(BR2_MAKE_HOST_DEPENDENCY) \
> host-arm-gnu-toolchain \
> - host-openssl
> + host-openssl \
> + host-python3 \
> + host-python-jsonschema \
> + host-python-pyelftools \
> + host-python-pylibfdt \
> + host-python-pyyaml \
> + host-python-setuptools \
> + ti-k3-boot-firmware
>
> TI_K3_R5_LOADER_MAKE = $(BR2_MAKE)
> TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV)
> @@ -58,21 +67,8 @@ TI_K3_R5_LOADER_MAKE_OPTS = \
> CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \
> ARCH=arm \
> HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \
> - HOSTLDFLAGS="$(HOST_LDFLAGS)"
> -
> -ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y)
> -# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt > -TI_K3_R5_LOADER_DEPENDENCIES += \
> - host-python-jsonschema \
> - host-python-pyyaml \
> - ti-k3-boot-firmware
> -# Make sure that all binman requirements are build before ti-k3-r5-loader.
> -TI_K3_R5_LOADER_DEPENDENCIES += \
> - host-python3 \
> - host-python-pyelftools \
> - host-python-pylibfdt \
> - host-python-setuptools
> -TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR)
> + HOSTLDFLAGS="$(HOST_LDFLAGS)" \
> + BINMAN_INDIRS=$(BINARIES_DIR)
>
> TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN))
>
> @@ -90,8 +86,6 @@ define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB
> fi
> endef
>
> -endif # BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
> -
> define TI_K3_R5_LOADER_BUILD_CMDS
> $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS)
> endef
> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
> index b62f624d82..fa2c008d4c 100644
> --- a/configs/ti_am62x_sk_defconfig
> +++ b/configs/ti_am62x_sk_defconfig
> @@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
> BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
> BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
> -BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
> BR2_TARGET_UBOOT=y
> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
> index 56e1b23335..f7c6d16b35 100644
> --- a/configs/ti_am64x_sk_defconfig
> +++ b/configs/ti_am64x_sk_defconfig
> @@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
> BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5"
> BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin"
> -BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
> BR2_TARGET_UBOOT=y
> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> BR2_TARGET_UBOOT_CUSTOM_VERSION=y
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* [Buildroot] [PATCH v12 16/16] package/ti-k3: switch ti_am6{2, 4}x_sk_defconfig to HS-FS by default
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (14 preceding siblings ...)
2024-04-07 10:35 ` [Buildroot] [PATCH v12 15/16] boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN Romain Naour
@ 2024-04-07 10:35 ` Romain Naour
2024-04-08 13:46 ` Arnout Vandecappelle via buildroot
2024-04-07 20:30 ` [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Arnout Vandecappelle via buildroot
16 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2024-04-07 10:35 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
From Andreas Dannenberg (TI K3 architect) [1]:
"HS-FS should be the default for all TI AM6x devices. This is our
"production silicon" and what's used for (almost) all projects,
especially new projects. This being said having support for GP device
variants still is desirable for existing boards/projects, such as the
current BeaglePlay boards (amongst earlier version of TI starter kit
EVMs for AM6x)."
See further details on e2e Forum [2]:
"Unfortunately with this transition any existing GP device based AM62x
(and AM64x) boards will no longer boot with MMC/SD card images generated"
For such existing GP device based AM62x (and AM64x) boards, users have
to provide the tiboot3.bin name using BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN.
[1] https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto
[2] http://lists.busybox.net/pipermail/buildroot/2024-February/685821.html
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
configs/ti_am62x_sk_defconfig | 1 -
configs/ti_am64x_sk_defconfig | 1 -
2 files changed, 2 deletions(-)
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index fa2c008d4c..5c7b97b3b0 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
-BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index f7c6d16b35..28e97f94e2 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5"
-BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 16/16] package/ti-k3: switch ti_am6{2, 4}x_sk_defconfig to HS-FS by default
2024-04-07 10:35 ` [Buildroot] [PATCH v12 16/16] package/ti-k3: switch ti_am6{2, 4}x_sk_defconfig to HS-FS by default Romain Naour
@ 2024-04-08 13:46 ` Arnout Vandecappelle via buildroot
2024-04-09 21:35 ` Andreas Dannenberg via buildroot
0 siblings, 1 reply; 45+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-04-08 13:46 UTC (permalink / raw)
To: Romain Naour, buildroot; +Cc: Andreas Dannenberg
On 07/04/2024 12:35, Romain Naour wrote:
> From Andreas Dannenberg (TI K3 architect) [1]:
>
> "HS-FS should be the default for all TI AM6x devices. This is our
> "production silicon" and what's used for (almost) all projects,
> especially new projects. This being said having support for GP device
> variants still is desirable for existing boards/projects, such as the
> current BeaglePlay boards (amongst earlier version of TI starter kit
> EVMs for AM6x)."
Andreas, BeaglePlay would anyway be a separate defconfig (it has another
device tree), no? I think it's more relevant to have a BeaglePlay defconfig than
to have a ti_am62x_sk GP defconfig.
>
> See further details on e2e Forum [2]:
>
> "Unfortunately with this transition any existing GP device based AM62x
> (and AM64x) boards will no longer boot with MMC/SD card images generated"
>
> For such existing GP device based AM62x (and AM64x) boards, users have
> to provide the tiboot3.bin name using BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN.
Please add this information to board/ti/am6{2,4}x-sk/readme.txt
> [1] https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto
> [2] http://lists.busybox.net/pipermail/buildroot/2024-February/685821.html
You swapped those two references (the first quote above comes from [2]).
Regards,
Arnout
>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
> configs/ti_am62x_sk_defconfig | 1 -
> configs/ti_am64x_sk_defconfig | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
> index fa2c008d4c..5c7b97b3b0 100644
> --- a/configs/ti_am62x_sk_defconfig
> +++ b/configs/ti_am62x_sk_defconfig
> @@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y
> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
> BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
> -BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
> BR2_TARGET_UBOOT=y
> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
> index f7c6d16b35..28e97f94e2 100644
> --- a/configs/ti_am64x_sk_defconfig
> +++ b/configs/ti_am64x_sk_defconfig
> @@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y
> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
> BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5"
> -BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin"
> BR2_TARGET_UBOOT=y
> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> BR2_TARGET_UBOOT_CUSTOM_VERSION=y
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 16/16] package/ti-k3: switch ti_am6{2, 4}x_sk_defconfig to HS-FS by default
2024-04-08 13:46 ` Arnout Vandecappelle via buildroot
@ 2024-04-09 21:35 ` Andreas Dannenberg via buildroot
0 siblings, 0 replies; 45+ messages in thread
From: Andreas Dannenberg via buildroot @ 2024-04-09 21:35 UTC (permalink / raw)
To: Arnout Vandecappelle; +Cc: Romain Naour, buildroot
Hi Arnout, All,
On Mon, Apr 08, 2024 at 03:46:54PM +0200, Arnout Vandecappelle wrote:
>
>
> On 07/04/2024 12:35, Romain Naour wrote:
> > From Andreas Dannenberg (TI K3 architect) [1]:
> >
> > "HS-FS should be the default for all TI AM6x devices. This is our
> > "production silicon" and what's used for (almost) all projects,
> > especially new projects. This being said having support for GP device
> > variants still is desirable for existing boards/projects, such as the
> > current BeaglePlay boards (amongst earlier version of TI starter kit
> > EVMs for AM6x)."
>
> Andreas, BeaglePlay would anyway be a separate defconfig (it has another
> device tree), no? I think it's more relevant to have a BeaglePlay defconfig
> than to have a ti_am62x_sk GP defconfig.
Yes BeaglePlay should have its own defconfig, and I think is actually a
really REALLY great target in the context and "spirit" of Buildroot. And
it _should_ really be the only board out there that uses AM62x GP.
Now that we have AM6x base support merged (thanks everybody!!) I can't
wait to see this support growing. I do have working AM6x graphics
patches that I'll spend some time cleaning up and posting soon.
--
Andreas Dannenberg
Texas Instruments Inc
> >
> > See further details on e2e Forum [2]:
> >
> > "Unfortunately with this transition any existing GP device based AM62x
> > (and AM64x) boards will no longer boot with MMC/SD card images generated"
> >
> > For such existing GP device based AM62x (and AM64x) boards, users have
> > to provide the tiboot3.bin name using BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN.
>
> Please add this information to board/ti/am6{2,4}x-sk/readme.txt
>
>
> > [1] https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto
> > [2] http://lists.busybox.net/pipermail/buildroot/2024-February/685821.html
>
> You swapped those two references (the first quote above comes from [2]).
>
>
> Regards,
> Arnout
>
> >
> > Signed-off-by: Romain Naour <romain.naour@smile.fr>
> > ---
> > configs/ti_am62x_sk_defconfig | 1 -
> > configs/ti_am64x_sk_defconfig | 1 -
> > 2 files changed, 2 deletions(-)
> >
> > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
> > index fa2c008d4c..5c7b97b3b0 100644
> > --- a/configs/ti_am62x_sk_defconfig
> > +++ b/configs/ti_am62x_sk_defconfig
> > @@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y
> > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
> > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
> > BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
> > -BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
> > BR2_TARGET_UBOOT=y
> > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> > BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
> > index f7c6d16b35..28e97f94e2 100644
> > --- a/configs/ti_am64x_sk_defconfig
> > +++ b/configs/ti_am64x_sk_defconfig
> > @@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y
> > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
> > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
> > BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5"
> > -BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin"
> > BR2_TARGET_UBOOT=y
> > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> > BR2_TARGET_UBOOT_CUSTOM_VERSION=y
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices
2024-04-07 10:34 [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Romain Naour
` (15 preceding siblings ...)
2024-04-07 10:35 ` [Buildroot] [PATCH v12 16/16] package/ti-k3: switch ti_am6{2, 4}x_sk_defconfig to HS-FS by default Romain Naour
@ 2024-04-07 20:30 ` Arnout Vandecappelle via buildroot
2024-04-08 13:47 ` Arnout Vandecappelle via buildroot
16 siblings, 1 reply; 45+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-04-07 20:30 UTC (permalink / raw)
To: Romain Naour, buildroot; +Cc: Gero Schwäricke
On 07/04/2024 12:34, Romain Naour wrote:
> This series aims initially to fix AM62x-SK HS-FS devices but doing so
> would requires adding a TI legacy tool "ti-k3-core-secdev" into Buildroot.
> ti-k3-core-secdev is replaced by u-boot's binman tool since v2023.10 release
> of u-boot.
>
> Instead, we bump the BSP to use the latest u-boot release (2024.01) to use
> binman. Doing so requires to rework the TI K3 SoC support in Buildroot.
>
> This new version (v12) of this series remove the ti-k3 package and
> all SOC and SECTYPE options. As suggested by Michael Walle, copy the
> default tiboot3.bin and sysfw.itb (if any) if no custom file name is
> provided on the defconfig. Since such file name can be customized,
> the user must provide the complete firmware name if not using the
> default one.
>
> http://lists.busybox.net/pipermail/buildroot/2024-April/688943.html
>
> With the advice of Andreas Dannenberg (TI K3 architect), we switch
> AM62x/AM62Ax/AM64x to HS-FS by default.
>
> Tests performed on earlier revision of this series:
>
> * compiled ti_am62x_sk_defconfig
> * success
> * booted on AM62x SK EVM (E3)
> * success
> * no obvious errors in dmesg
>
> Tested-by: Gero Schwäricke <gero.schwaericke@grandcentrix.net>
>
> Dario Binacchi (10):
> boot/ti-k3-r5-loader: drop hash for version 2022.10
> boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
> boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option
> boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to
> BINARIES_DIR
> configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01
> configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18
> board/ti/am62x-sk: generalize post-build.sh
> board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx
> configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01
> configs/ti_am64x_sk_defconfig: bump Linux version to 6.6.18
>
> Romain Naour (6):
> board/ti/am6{2,4}x-sk: add arm-trusted-firmware v2.7 hash
> boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support
> boot/uboot: remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
> boot/ti-k3-image-gen: remove package
> boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
> package/ti-k3: switch AM62x/AM62Ax/AM64x to HS-FS by default
Patches 1-5 applied to master. And there I stopped, due to the SWSFW typo. I
could have fixed it up myself but it's really every patch that needs to be
updated...
Regards,
Arnout
>
> Config.in.legacy | 15 ++++
> DEVELOPERS | 2 -
> board/ti/am62x-sk/genimage.cfg | 7 +-
> .../arm-trusted-firmware.hash | 2 +
> .../patches/linux-headers/linux-headers.hash | 1 +
> board/ti/am62x-sk/patches/linux/linux.hash | 2 +
> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +
> board/ti/am64x-sk/genimage.cfg | 7 +-
> .../arm-trusted-firmware.hash | 2 +
> .../patches/linux-headers/linux-headers.hash | 1 +
> board/ti/am64x-sk/patches/linux/linux.hash | 2 +
> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 +
> board/ti/common/am6xx/post-build.sh | 58 ++++++++++++++
> boot/Config.in | 1 -
> boot/ti-k3-image-gen/Config.in | 77 -------------------
> boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 -
> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 -------------
> boot/ti-k3-r5-loader/Config.in | 33 ++++++++
> boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 -
> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 40 +++++++++-
> boot/uboot/Config.in | 35 +++++----
> boot/uboot/uboot.mk | 12 ++-
> configs/ti_am62x_sk_defconfig | 21 ++---
> configs/ti_am64x_sk_defconfig | 20 +++--
> 24 files changed, 221 insertions(+), 178 deletions(-)
> create mode 100644 board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> create mode 120000 board/ti/am62x-sk/patches/linux-headers/linux-headers.hash
> create mode 100644 board/ti/am62x-sk/patches/linux/linux.hash
> create mode 100644 board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
> create mode 100644 board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> create mode 120000 board/ti/am64x-sk/patches/linux-headers/linux-headers.hash
> create mode 100644 board/ti/am64x-sk/patches/linux/linux.hash
> create mode 100644 board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
> create mode 100755 board/ti/common/am6xx/post-build.sh
> delete mode 100644 boot/ti-k3-image-gen/Config.in
> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash
> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk
>
> --
> 2.44.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices
2024-04-07 20:30 ` [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices Arnout Vandecappelle via buildroot
@ 2024-04-08 13:47 ` Arnout Vandecappelle via buildroot
2024-04-09 21:17 ` Romain Naour
0 siblings, 1 reply; 45+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2024-04-08 13:47 UTC (permalink / raw)
To: Romain Naour, buildroot; +Cc: Gero Schwäricke
On 07/04/2024 22:30, Arnout Vandecappelle wrote:
>
>
> On 07/04/2024 12:34, Romain Naour wrote:
>> This series aims initially to fix AM62x-SK HS-FS devices but doing so
>> would requires adding a TI legacy tool "ti-k3-core-secdev" into Buildroot.
>> ti-k3-core-secdev is replaced by u-boot's binman tool since v2023.10 release
>> of u-boot.
>>
>> Instead, we bump the BSP to use the latest u-boot release (2024.01) to use
>> binman. Doing so requires to rework the TI K3 SoC support in Buildroot.
>>
>> This new version (v12) of this series remove the ti-k3 package and
>> all SOC and SECTYPE options. As suggested by Michael Walle, copy the
>> default tiboot3.bin and sysfw.itb (if any) if no custom file name is
>> provided on the defconfig. Since such file name can be customized,
>> the user must provide the complete firmware name if not using the
>> default one.
>>
>> http://lists.busybox.net/pipermail/buildroot/2024-April/688943.html
>>
>> With the advice of Andreas Dannenberg (TI K3 architect), we switch
>> AM62x/AM62Ax/AM64x to HS-FS by default.
>>
>> Tests performed on earlier revision of this series:
>>
>> * compiled ti_am62x_sk_defconfig
>> * success
>> * booted on AM62x SK EVM (E3)
>> * success
>> * no obvious errors in dmesg
>>
>> Tested-by: Gero Schwäricke <gero.schwaericke@grandcentrix.net>
>>
>> Dario Binacchi (10):
>> boot/ti-k3-r5-loader: drop hash for version 2022.10
>> boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
>> boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option
>> boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to
>> BINARIES_DIR
>> configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01
>> configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18
>> board/ti/am62x-sk: generalize post-build.sh
>> board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx
>> configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01
>> configs/ti_am64x_sk_defconfig: bump Linux version to 6.6.18
>>
>> Romain Naour (6):
>> board/ti/am6{2,4}x-sk: add arm-trusted-firmware v2.7 hash
>> boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support
>> boot/uboot: remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
>> boot/ti-k3-image-gen: remove package
>> boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
>> package/ti-k3: switch AM62x/AM62Ax/AM64x to HS-FS by default
>
> Patches 1-5 applied to master. And there I stopped, due to the SWSFW typo. I
> could have fixed it up myself but it's really every patch that needs to be
> updated...
I also reviewed the rest of the series with minor comments, so you can apply
them directly (with my Reviewed-by: Arnout Vandecappelle <arnout@mind.be>)
Regards,
Arnout
>
>
> Regards,
> Arnout
>
>>
>> Config.in.legacy | 15 ++++
>> DEVELOPERS | 2 -
>> board/ti/am62x-sk/genimage.cfg | 7 +-
>> .../arm-trusted-firmware.hash | 2 +
>> .../patches/linux-headers/linux-headers.hash | 1 +
>> board/ti/am62x-sk/patches/linux/linux.hash | 2 +
>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +
>> board/ti/am64x-sk/genimage.cfg | 7 +-
>> .../arm-trusted-firmware.hash | 2 +
>> .../patches/linux-headers/linux-headers.hash | 1 +
>> board/ti/am64x-sk/patches/linux/linux.hash | 2 +
>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 +
>> board/ti/common/am6xx/post-build.sh | 58 ++++++++++++++
>> boot/Config.in | 1 -
>> boot/ti-k3-image-gen/Config.in | 77 -------------------
>> boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 -
>> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 -------------
>> boot/ti-k3-r5-loader/Config.in | 33 ++++++++
>> boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 -
>> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 40 +++++++++-
>> boot/uboot/Config.in | 35 +++++----
>> boot/uboot/uboot.mk | 12 ++-
>> configs/ti_am62x_sk_defconfig | 21 ++---
>> configs/ti_am64x_sk_defconfig | 20 +++--
>> 24 files changed, 221 insertions(+), 178 deletions(-)
>> create mode 100644
>> board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>> create mode 120000 board/ti/am62x-sk/patches/linux-headers/linux-headers.hash
>> create mode 100644 board/ti/am62x-sk/patches/linux/linux.hash
>> create mode 100644
>> board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
>> create mode 100644
>> board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>> create mode 120000 board/ti/am64x-sk/patches/linux-headers/linux-headers.hash
>> create mode 100644 board/ti/am64x-sk/patches/linux/linux.hash
>> create mode 100644
>> board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
>> create mode 100755 board/ti/common/am6xx/post-build.sh
>> delete mode 100644 boot/ti-k3-image-gen/Config.in
>> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash
>> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk
>>
>> --
>> 2.44.0
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices
2024-04-08 13:47 ` Arnout Vandecappelle via buildroot
@ 2024-04-09 21:17 ` Romain Naour
2024-04-10 7:34 ` Dario Binacchi
0 siblings, 1 reply; 45+ messages in thread
From: Romain Naour @ 2024-04-09 21:17 UTC (permalink / raw)
To: Arnout Vandecappelle, buildroot, Dario Binacchi,
Michael Nazzareno Trimarchi, Andreas Dannenberg, Bryan Brattlof,
Alexander Sverdlin, Heiko Thiery, Michael Walle
Cc: Gero Schwäricke
Hello Arnout, All,
Le 08/04/2024 à 15:47, Arnout Vandecappelle a écrit :
>
> On 07/04/2024 22:30, Arnout Vandecappelle wrote:
>>
>>
>> On 07/04/2024 12:34, Romain Naour wrote:
>>> This series aims initially to fix AM62x-SK HS-FS devices but doing so
>>> would requires adding a TI legacy tool "ti-k3-core-secdev" into Buildroot.
>>> ti-k3-core-secdev is replaced by u-boot's binman tool since v2023.10 release
>>> of u-boot.
>>>
>>> Instead, we bump the BSP to use the latest u-boot release (2024.01) to use
>>> binman. Doing so requires to rework the TI K3 SoC support in Buildroot.
>>>
>>> This new version (v12) of this series remove the ti-k3 package and
>>> all SOC and SECTYPE options. As suggested by Michael Walle, copy the
>>> default tiboot3.bin and sysfw.itb (if any) if no custom file name is
>>> provided on the defconfig. Since such file name can be customized,
>>> the user must provide the complete firmware name if not using the
>>> default one.
>>>
>>> http://lists.busybox.net/pipermail/buildroot/2024-April/688943.html
>>>
>>> With the advice of Andreas Dannenberg (TI K3 architect), we switch
>>> AM62x/AM62Ax/AM64x to HS-FS by default.
>>>
>>> Tests performed on earlier revision of this series:
>>>
>>> * compiled ti_am62x_sk_defconfig
>>> * success
>>> * booted on AM62x SK EVM (E3)
>>> * success
>>> * no obvious errors in dmesg
>>>
>>> Tested-by: Gero Schwäricke <gero.schwaericke@grandcentrix.net>
>>>
>>> Dario Binacchi (10):
>>> boot/ti-k3-r5-loader: drop hash for version 2022.10
>>> boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
>>> boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option
>>> boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to
>>> BINARIES_DIR
>>> configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01
>>> configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18
>>> board/ti/am62x-sk: generalize post-build.sh
>>> board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx
>>> configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01
>>> configs/ti_am64x_sk_defconfig: bump Linux version to 6.6.18
>>>
>>> Romain Naour (6):
>>> board/ti/am6{2,4}x-sk: add arm-trusted-firmware v2.7 hash
>>> boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support
>>> boot/uboot: remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
>>> boot/ti-k3-image-gen: remove package
>>> boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
>>> package/ti-k3: switch AM62x/AM62Ax/AM64x to HS-FS by default
>>
>> Patches 1-5 applied to master. And there I stopped, due to the SWSFW typo. I
>> could have fixed it up myself but it's really every patch that needs to be
>> updated...
>
>
> I also reviewed the rest of the series with minor comments, so you can apply
> them directly (with my Reviewed-by: Arnout Vandecappelle <arnout@mind.be>)
Thanks, the series is merged.
Thanks to Dario and Michael for the initial work on the HS-FS topic!
The initial series showed that it was necessary to rework heavily the TI K3 SoC
related packages in Buildroot. This was the opportinity to anticipate on the
addition of new TI K3 SoC support.
Thanks to Andreas and Bryan from TI for the review and fine details about TI K3
SoC familly and the runtime testing.
Thanks to all testers and reviewers.
Best regards,
Romain
>
>
> Regards,
> Arnout
>
>
>>
>>
>> Regards,
>> Arnout
>>
>>>
>>> Config.in.legacy | 15 ++++
>>> DEVELOPERS | 2 -
>>> board/ti/am62x-sk/genimage.cfg | 7 +-
>>> .../arm-trusted-firmware.hash | 2 +
>>> .../patches/linux-headers/linux-headers.hash | 1 +
>>> board/ti/am62x-sk/patches/linux/linux.hash | 2 +
>>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +
>>> board/ti/am64x-sk/genimage.cfg | 7 +-
>>> .../arm-trusted-firmware.hash | 2 +
>>> .../patches/linux-headers/linux-headers.hash | 1 +
>>> board/ti/am64x-sk/patches/linux/linux.hash | 2 +
>>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 +
>>> board/ti/common/am6xx/post-build.sh | 58 ++++++++++++++
>>> boot/Config.in | 1 -
>>> boot/ti-k3-image-gen/Config.in | 77 -------------------
>>> boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 -
>>> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 -------------
>>> boot/ti-k3-r5-loader/Config.in | 33 ++++++++
>>> boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 -
>>> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 40 +++++++++-
>>> boot/uboot/Config.in | 35 +++++----
>>> boot/uboot/uboot.mk | 12 ++-
>>> configs/ti_am62x_sk_defconfig | 21 ++---
>>> configs/ti_am64x_sk_defconfig | 20 +++--
>>> 24 files changed, 221 insertions(+), 178 deletions(-)
>>> create mode 100644
>>> board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>>> create mode 120000 board/ti/am62x-sk/patches/linux-headers/linux-headers.hash
>>> create mode 100644 board/ti/am62x-sk/patches/linux/linux.hash
>>> create mode 100644
>>> board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
>>> create mode 100644
>>> board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>>> create mode 120000 board/ti/am64x-sk/patches/linux-headers/linux-headers.hash
>>> create mode 100644 board/ti/am64x-sk/patches/linux/linux.hash
>>> create mode 100644
>>> board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
>>> create mode 100755 board/ti/common/am6xx/post-build.sh
>>> delete mode 100644 boot/ti-k3-image-gen/Config.in
>>> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash
>>> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk
>>>
>>> --
>>> 2.44.0
>>>
>>> _______________________________________________
>>> buildroot mailing list
>>> buildroot@buildroot.org
>>> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices
2024-04-09 21:17 ` Romain Naour
@ 2024-04-10 7:34 ` Dario Binacchi
2024-04-10 8:00 ` Gero Schwäricke via buildroot
2024-04-10 21:30 ` Romain Naour
0 siblings, 2 replies; 45+ messages in thread
From: Dario Binacchi @ 2024-04-10 7:34 UTC (permalink / raw)
To: Romain Naour
Cc: Michael Walle, Bryan Brattlof, Gero Schwäricke, buildroot,
Heiko Thiery, Michael Nazzareno Trimarchi, Alexander Sverdlin,
Andreas Dannenberg
Hi Romain, All
On Tue, Apr 9, 2024 at 11:17 PM Romain Naour <romain.naour@smile.fr> wrote:
>
> Hello Arnout, All,
>
> Le 08/04/2024 à 15:47, Arnout Vandecappelle a écrit :
> >
> > On 07/04/2024 22:30, Arnout Vandecappelle wrote:
> >>
> >>
> >> On 07/04/2024 12:34, Romain Naour wrote:
> >>> This series aims initially to fix AM62x-SK HS-FS devices but doing so
> >>> would requires adding a TI legacy tool "ti-k3-core-secdev" into Buildroot.
> >>> ti-k3-core-secdev is replaced by u-boot's binman tool since v2023.10 release
> >>> of u-boot.
> >>>
> >>> Instead, we bump the BSP to use the latest u-boot release (2024.01) to use
> >>> binman. Doing so requires to rework the TI K3 SoC support in Buildroot.
> >>>
> >>> This new version (v12) of this series remove the ti-k3 package and
> >>> all SOC and SECTYPE options. As suggested by Michael Walle, copy the
> >>> default tiboot3.bin and sysfw.itb (if any) if no custom file name is
> >>> provided on the defconfig. Since such file name can be customized,
> >>> the user must provide the complete firmware name if not using the
> >>> default one.
> >>>
> >>> http://lists.busybox.net/pipermail/buildroot/2024-April/688943.html
> >>>
> >>> With the advice of Andreas Dannenberg (TI K3 architect), we switch
> >>> AM62x/AM62Ax/AM64x to HS-FS by default.
> >>>
> >>> Tests performed on earlier revision of this series:
> >>>
> >>> * compiled ti_am62x_sk_defconfig
> >>> * success
> >>> * booted on AM62x SK EVM (E3)
> >>> * success
> >>> * no obvious errors in dmesg
> >>>
> >>> Tested-by: Gero Schwäricke <gero.schwaericke@grandcentrix.net>
> >>>
> >>> Dario Binacchi (10):
> >>> boot/ti-k3-r5-loader: drop hash for version 2022.10
> >>> boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
> >>> boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option
> >>> boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to
> >>> BINARIES_DIR
> >>> configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01
> >>> configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18
> >>> board/ti/am62x-sk: generalize post-build.sh
> >>> board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx
> >>> configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01
> >>> configs/ti_am64x_sk_defconfig: bump Linux version to 6.6.18
> >>>
> >>> Romain Naour (6):
> >>> board/ti/am6{2,4}x-sk: add arm-trusted-firmware v2.7 hash
> >>> boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support
> >>> boot/uboot: remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
> >>> boot/ti-k3-image-gen: remove package
> >>> boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
> >>> package/ti-k3: switch AM62x/AM62Ax/AM64x to HS-FS by default
> >>
> >> Patches 1-5 applied to master. And there I stopped, due to the SWSFW typo. I
> >> could have fixed it up myself but it's really every patch that needs to be
> >> updated...
> >
> >
> > I also reviewed the rest of the series with minor comments, so you can apply
> > them directly (with my Reviewed-by: Arnout Vandecappelle <arnout@mind.be>)
>
> Thanks, the series is merged.
>
> Thanks to Dario and Michael for the initial work on the HS-FS topic!
>
> The initial series showed that it was necessary to rework heavily the TI K3 SoC
> related packages in Buildroot. This was the opportinity to anticipate on the
> addition of new TI K3 SoC support.
>
> Thanks to Andreas and Bryan from TI for the review and fine details about TI K3
> SoC familly and the runtime testing.
>
> Thanks to all testers and reviewers.
I think my two patches for version 10 were ultimately lost:
[v10,05/12] package/ti-k3: disable HS-FS for AM65 SOC
[v10,04/12] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope
Specifically, patch 4 is necessary for the proper creation of the
image. Has version 12 actually been tested by anyone?
I can assure you version 10 has been.
Additionally, it seems that patch
[v10,02/12] boot/ti-k3-r5-loader: set binman environment
has been incorporated into your patch "boot/ti-k3-r5-loader: remove
BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN"
and I don't understand why.
Thanks and regards,
Dario
>
> Best regards,
> Romain
>
> >
> >
> > Regards,
> > Arnout
> >
> >
> >>
> >>
> >> Regards,
> >> Arnout
> >>
> >>>
> >>> Config.in.legacy | 15 ++++
> >>> DEVELOPERS | 2 -
> >>> board/ti/am62x-sk/genimage.cfg | 7 +-
> >>> .../arm-trusted-firmware.hash | 2 +
> >>> .../patches/linux-headers/linux-headers.hash | 1 +
> >>> board/ti/am62x-sk/patches/linux/linux.hash | 2 +
> >>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +
> >>> board/ti/am64x-sk/genimage.cfg | 7 +-
> >>> .../arm-trusted-firmware.hash | 2 +
> >>> .../patches/linux-headers/linux-headers.hash | 1 +
> >>> board/ti/am64x-sk/patches/linux/linux.hash | 2 +
> >>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 +
> >>> board/ti/common/am6xx/post-build.sh | 58 ++++++++++++++
> >>> boot/Config.in | 1 -
> >>> boot/ti-k3-image-gen/Config.in | 77 -------------------
> >>> boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 -
> >>> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 -------------
> >>> boot/ti-k3-r5-loader/Config.in | 33 ++++++++
> >>> boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 -
> >>> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 40 +++++++++-
> >>> boot/uboot/Config.in | 35 +++++----
> >>> boot/uboot/uboot.mk | 12 ++-
> >>> configs/ti_am62x_sk_defconfig | 21 ++---
> >>> configs/ti_am64x_sk_defconfig | 20 +++--
> >>> 24 files changed, 221 insertions(+), 178 deletions(-)
> >>> create mode 100644
> >>> board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> >>> create mode 120000 board/ti/am62x-sk/patches/linux-headers/linux-headers.hash
> >>> create mode 100644 board/ti/am62x-sk/patches/linux/linux.hash
> >>> create mode 100644
> >>> board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
> >>> create mode 100644
> >>> board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> >>> create mode 120000 board/ti/am64x-sk/patches/linux-headers/linux-headers.hash
> >>> create mode 100644 board/ti/am64x-sk/patches/linux/linux.hash
> >>> create mode 100644
> >>> board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
> >>> create mode 100755 board/ti/common/am6xx/post-build.sh
> >>> delete mode 100644 boot/ti-k3-image-gen/Config.in
> >>> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash
> >>> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk
> >>>
> >>> --
> >>> 2.44.0
> >>>
> >>> _______________________________________________
> >>> buildroot mailing list
> >>> buildroot@buildroot.org
> >>> https://lists.buildroot.org/mailman/listinfo/buildroot
>
--
Dario Binacchi
Senior Embedded Linux Developer
dario.binacchi@amarulasolutions.com
__________________________________
Amarula Solutions SRL
Via Le Canevare 30, 31100 Treviso, Veneto, IT
T. +39 042 243 5310
info@amarulasolutions.com
www.amarulasolutions.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices
2024-04-10 7:34 ` Dario Binacchi
@ 2024-04-10 8:00 ` Gero Schwäricke via buildroot
2024-04-10 8:24 ` Andreas Dannenberg via buildroot
2024-04-10 21:30 ` Romain Naour
1 sibling, 1 reply; 45+ messages in thread
From: Gero Schwäricke via buildroot @ 2024-04-10 8:00 UTC (permalink / raw)
To: Dario Binacchi; +Cc: buildroot
On Wed, Apr 10, 2024 at 09:34:16AM +0200, Dario Binacchi wrote:
> Hi Romain, All
>
> On Tue, Apr 9, 2024 at 11:17 PM Romain Naour <romain.naour@smile.fr> wrote:
> >
> > Hello Arnout, All,
[...]
> >
> > Thanks, the series is merged.
> >
> > Thanks to Dario and Michael for the initial work on the HS-FS topic!
> >
> > The initial series showed that it was necessary to rework heavily the TI K3 SoC
> > related packages in Buildroot. This was the opportinity to anticipate on the
> > addition of new TI K3 SoC support.
> >
> > Thanks to Andreas and Bryan from TI for the review and fine details about TI K3
> > SoC familly and the runtime testing.
> >
> > Thanks to all testers and reviewers.
>
> I think my two patches for version 10 were ultimately lost:
>
> [v10,05/12] package/ti-k3: disable HS-FS for AM65 SOC
> [v10,04/12] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope
>
> Specifically, patch 4 is necessary for the proper creation of the
> image. Has version 12 actually been tested by anyone?
> I can assure you version 10 has been.
>
> Additionally, it seems that patch
> [v10,02/12] boot/ti-k3-r5-loader: set binman environment
> has been incorporated into your patch "boot/ti-k3-r5-loader: remove
> BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN"
> and I don't understand why.
>
> Thanks and regards,
> Dario
Hi Dario,
I can confirm that something is amiss, maybe it would have been better
to await more tests with patch V12. At least my current test of
ti_am62x_sk_defconfig on master failed to boot:
U-Boot SPL 2024.01 (Apr 10 2024 - 09:32:17 +0200)
k3_system_controller sysctrler: k3_sysctrler_start: Boot Notification response failed. ret = -110
Firmware init failed on rproc (-110)
resetting ...
I tested with AM62x SK EVM E3. I'll try to apply your two missing
patches and test again.
Best,
Gero
> > Best regards,
> > Romain
> >
[...]
--
–––
grandcentrix GmbH | A Vodafone Company · Holzmarkt 1 · 50676
*Cologne* | Phoenixseestrasse 18 · 44263 *Dortmund* · Germany
| in
<https://www.linkedin.com/company/grandcentrix> | phone: +49-221-677-860-0
| email: hello@grandcentrix.net <mailto:hello@grandcentrix.net>
grandcentrix cares about privacy
<https://grandcentrix.net/de/pages/privacymail/>
Amtsgericht Köln | HRB
70119 | Geschäftsführer: M. Krömer, R. Hänel | USt.-IdNr.: DE266333969
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices
2024-04-10 8:00 ` Gero Schwäricke via buildroot
@ 2024-04-10 8:24 ` Andreas Dannenberg via buildroot
2024-04-10 9:23 ` Andreas Dannenberg via buildroot
` (2 more replies)
0 siblings, 3 replies; 45+ messages in thread
From: Andreas Dannenberg via buildroot @ 2024-04-10 8:24 UTC (permalink / raw)
To: Dario Binacchi, buildroot
Gero, Dario,
On Wed, Apr 10, 2024 at 10:00:06AM +0200, Gero Schwäricke via buildroot wrote:
> On Wed, Apr 10, 2024 at 09:34:16AM +0200, Dario Binacchi wrote:
> > Hi Romain, All
> >
> > On Tue, Apr 9, 2024 at 11:17 PM Romain Naour <romain.naour@smile.fr> wrote:
> > >
> > > Hello Arnout, All,
> [...]
> > >
> > > Thanks, the series is merged.
> > >
> > > Thanks to Dario and Michael for the initial work on the HS-FS topic!
> > >
> > > The initial series showed that it was necessary to rework heavily the TI K3 SoC
> > > related packages in Buildroot. This was the opportinity to anticipate on the
> > > addition of new TI K3 SoC support.
> > >
> > > Thanks to Andreas and Bryan from TI for the review and fine details about TI K3
> > > SoC familly and the runtime testing.
> > >
> > > Thanks to all testers and reviewers.
> >
> > I think my two patches for version 10 were ultimately lost:
> >
> > [v10,05/12] package/ti-k3: disable HS-FS for AM65 SOC
> > [v10,04/12] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope
> >
> > Specifically, patch 4 is necessary for the proper creation of the
> > image. Has version 12 actually been tested by anyone?
> > I can assure you version 10 has been.
> >
> > Additionally, it seems that patch
> > [v10,02/12] boot/ti-k3-r5-loader: set binman environment
> > has been incorporated into your patch "boot/ti-k3-r5-loader: remove
> > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN"
> > and I don't understand why.
> >
> > Thanks and regards,
> > Dario
>
> Hi Dario,
>
> I can confirm that something is amiss, maybe it would have been better
> to await more tests with patch V12.
I just tested top-of-master w/o any additional patches on SK-AM62 (with
GP silicon) and SK-AM62B (production board, with HS-FS silicon) and it
worked like a champ. Here's the beginning of the boot using SK-AM62...
<...snip...>
U-Boot SPL 2024.01 (Apr 09 2024 - 20:11:30 -0500)
SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar')
SPL initial stack usage: 13368 bytes
Trying to boot from MMC2
Authentication passed
Authentication passed
Authentication passed
Authentication passed
Authentication passed
Starting ATF on ARM64 core...
NOTICE: BL31: v2.7(release):v2.7
NOTICE: BL31: Built : 20:08:16, Apr 9 2024
I/TC:
I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot
2024.02-416-gd01e13c4d4)) #1 Wed Apr 10 01:08:14 UTC 2024 aarch64
I/TC: WARNING: This OP-TEE configuration might be insecure!
I/TC: WARNING: Please check
https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html
I/TC: Primary CPU initializing
I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill
Capybar')
I/TC: HUK Initialized
I/TC: Activated SA2UL device
I/TC: Enabled firewalls for SA2UL TRNG device
I/TC: SA2UL TRNG initialized
I/TC: SA2UL Drivers initialized
I/TC: Primary CPU switching to normal world boot
U-Boot SPL 2024.01 (Apr 09 2024 - 20:11:48 -0500)
SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar')
SPL initial stack usage: 1872 bytes
Trying to boot from MMC2
Authentication passed
Authentication passed
U-Boot 2024.01 (Apr 09 2024 - 20:11:48 -0500)
SoC: AM62X SR1.0 HS-FS
Model: Texas Instruments AM625 SK
DRAM: 2 GiB
Core: 56 devices, 23 uclasses, devicetree: separate
MMC: mmc@fa10000: 0, mmc@fa00000: 1
Loading Environment from nowhere... OK
In: serial@2800000
Out: serial@2800000
Err: serial@2800000
Net: eth0: ethernet@8000000port@1
Hit any key to stop autoboot: 0
<...snip...>
> At least my current test of ti_am62x_sk_defconfig on master failed to boot:
>
> U-Boot SPL 2024.01 (Apr 10 2024 - 09:32:17 +0200)
> k3_system_controller sysctrler: k3_sysctrler_start: Boot Notification response failed. ret = -110
> Firmware init failed on rproc (-110)
>
> resetting ...
>
> I tested with AM62x SK EVM E3. I'll try to apply your two missing
> patches and test again.
Are you using a board with PCB revision 'PROC114E3'? If so this board is
known as 'Third prototype, early release revision of the AM62x SK EVM'
and should have GP silicon. Which means you must have re-added...
BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin
...to your .config?
I don't have a PROC114E3 board but the board I used to test the GP
variant today is a PROC114E2, and it worked. But neither of those boards
is considered "production".
Also just for refernce, an SK-AM62 PCB revision history can be found in
Table 1-1 in the AM62x SK EVM User's Guide [1].
--
Andreas Dannenberg
Texas Instruments Inc
[1] https://www.ti.com/lit/pdf/spruj40
> Best,
> Gero
>
> > > Best regards,
> > > Romain
> > >
> [...]
>
> --
>
>
>
> –––
>
>
> grandcentrix GmbH | A Vodafone Company · Holzmarkt 1 · 50676
> *Cologne* | Phoenixseestrasse 18 · 44263 *Dortmund* · Germany
> | in
> <https://www.linkedin.com/company/grandcentrix> | phone: +49-221-677-860-0
> | email: hello@grandcentrix.net <mailto:hello@grandcentrix.net>
>
>
> grandcentrix cares about privacy
> <https://grandcentrix.net/de/pages/privacymail/>
>
> Amtsgericht Köln | HRB
> 70119 | Geschäftsführer: M. Krömer, R. Hänel | USt.-IdNr.: DE266333969
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices
2024-04-10 8:24 ` Andreas Dannenberg via buildroot
@ 2024-04-10 9:23 ` Andreas Dannenberg via buildroot
2024-04-10 9:36 ` Dario Binacchi
2024-04-10 11:10 ` Gero Schwäricke via buildroot
2024-04-10 21:38 ` Romain Naour
2 siblings, 1 reply; 45+ messages in thread
From: Andreas Dannenberg via buildroot @ 2024-04-10 9:23 UTC (permalink / raw)
To: Dario Binacchi, buildroot
Gero, Dario, All,
On Wed, Apr 10, 2024 at 03:24:29AM -0500, Andreas Dannenberg via buildroot wrote:
> Gero, Dario,
>
> On Wed, Apr 10, 2024 at 10:00:06AM +0200, Gero Schwäricke via buildroot wrote:
> > On Wed, Apr 10, 2024 at 09:34:16AM +0200, Dario Binacchi wrote:
> > > Hi Romain, All
> > >
> > > On Tue, Apr 9, 2024 at 11:17 PM Romain Naour <romain.naour@smile.fr> wrote:
> > > >
> > > > Hello Arnout, All,
> > [...]
> > > >
> > > > Thanks, the series is merged.
> > > >
> > > > Thanks to Dario and Michael for the initial work on the HS-FS topic!
> > > >
> > > > The initial series showed that it was necessary to rework heavily the TI K3 SoC
> > > > related packages in Buildroot. This was the opportinity to anticipate on the
> > > > addition of new TI K3 SoC support.
> > > >
> > > > Thanks to Andreas and Bryan from TI for the review and fine details about TI K3
> > > > SoC familly and the runtime testing.
> > > >
> > > > Thanks to all testers and reviewers.
> > >
> > > I think my two patches for version 10 were ultimately lost:
> > >
> > > [v10,05/12] package/ti-k3: disable HS-FS for AM65 SOC
> > > [v10,04/12] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope
> > >
> > > Specifically, patch 4 is necessary for the proper creation of the
> > > image. Has version 12 actually been tested by anyone?
> > > I can assure you version 10 has been.
> > >
> > > Additionally, it seems that patch
> > > [v10,02/12] boot/ti-k3-r5-loader: set binman environment
> > > has been incorporated into your patch "boot/ti-k3-r5-loader: remove
> > > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN"
> > > and I don't understand why.
> > >
> > > Thanks and regards,
> > > Dario
> >
> > Hi Dario,
> >
> > I can confirm that something is amiss, maybe it would have been better
> > to await more tests with patch V12.
>
> I just tested top-of-master w/o any additional patches on SK-AM62 (with
> GP silicon) and SK-AM62B (production board, with HS-FS silicon) and it
> worked like a champ. Here's the beginning of the boot using SK-AM62...
I also just tested top-of-master with SK-AM64 (with GP silicon) and
SK-AM64B (production board, with HS-FS silicon) successfully. With this
I can boot on all 4 board/silicon variants without any issues. This was
done using commit...
d01e13c4d4 ("package/python3: fix cross builds when host and target use the same SOABI")
So from my POV there is no issue with missing patches.
--
Andreas Dannenberg
Texas Instruments Inc
>
> <...snip...>
> U-Boot SPL 2024.01 (Apr 09 2024 - 20:11:30 -0500)
> SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar')
> SPL initial stack usage: 13368 bytes
> Trying to boot from MMC2
> Authentication passed
> Authentication passed
> Authentication passed
> Authentication passed
> Authentication passed
> Starting ATF on ARM64 core...
>
> NOTICE: BL31: v2.7(release):v2.7
> NOTICE: BL31: Built : 20:08:16, Apr 9 2024
> I/TC:
> I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot
> 2024.02-416-gd01e13c4d4)) #1 Wed Apr 10 01:08:14 UTC 2024 aarch64
> I/TC: WARNING: This OP-TEE configuration might be insecure!
> I/TC: WARNING: Please check
> https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html
> I/TC: Primary CPU initializing
> I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill
> Capybar')
> I/TC: HUK Initialized
> I/TC: Activated SA2UL device
> I/TC: Enabled firewalls for SA2UL TRNG device
> I/TC: SA2UL TRNG initialized
> I/TC: SA2UL Drivers initialized
> I/TC: Primary CPU switching to normal world boot
>
> U-Boot SPL 2024.01 (Apr 09 2024 - 20:11:48 -0500)
> SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar')
> SPL initial stack usage: 1872 bytes
> Trying to boot from MMC2
> Authentication passed
> Authentication passed
>
>
> U-Boot 2024.01 (Apr 09 2024 - 20:11:48 -0500)
>
> SoC: AM62X SR1.0 HS-FS
> Model: Texas Instruments AM625 SK
> DRAM: 2 GiB
> Core: 56 devices, 23 uclasses, devicetree: separate
> MMC: mmc@fa10000: 0, mmc@fa00000: 1
> Loading Environment from nowhere... OK
> In: serial@2800000
> Out: serial@2800000
> Err: serial@2800000
> Net: eth0: ethernet@8000000port@1
> Hit any key to stop autoboot: 0
> <...snip...>
>
>
> > At least my current test of ti_am62x_sk_defconfig on master failed to boot:
> >
> > U-Boot SPL 2024.01 (Apr 10 2024 - 09:32:17 +0200)
> > k3_system_controller sysctrler: k3_sysctrler_start: Boot Notification response failed. ret = -110
> > Firmware init failed on rproc (-110)
> >
> > resetting ...
> >
> > I tested with AM62x SK EVM E3. I'll try to apply your two missing
> > patches and test again.
>
> Are you using a board with PCB revision 'PROC114E3'? If so this board is
> known as 'Third prototype, early release revision of the AM62x SK EVM'
> and should have GP silicon. Which means you must have re-added...
>
> BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin
>
> ...to your .config?
>
> I don't have a PROC114E3 board but the board I used to test the GP
> variant today is a PROC114E2, and it worked. But neither of those boards
> is considered "production".
>
> Also just for refernce, an SK-AM62 PCB revision history can be found in
> Table 1-1 in the AM62x SK EVM User's Guide [1].
>
>
> --
> Andreas Dannenberg
> Texas Instruments Inc
>
>
> [1] https://www.ti.com/lit/pdf/spruj40
>
>
>
>
> > Best,
> > Gero
> >
> > > > Best regards,
> > > > Romain
> > > >
> > [...]
> >
> > --
> >
> >
> >
> > –––
> >
> >
> > grandcentrix GmbH | A Vodafone Company · Holzmarkt 1 · 50676
> > *Cologne* | Phoenixseestrasse 18 · 44263 *Dortmund* · Germany
> > | in
> > <https://www.linkedin.com/company/grandcentrix> | phone: +49-221-677-860-0
> > | email: hello@grandcentrix.net <mailto:hello@grandcentrix.net>
> >
> >
> > grandcentrix cares about privacy
> > <https://grandcentrix.net/de/pages/privacymail/>
> >
> > Amtsgericht Köln | HRB
> > 70119 | Geschäftsführer: M. Krömer, R. Hänel | USt.-IdNr.: DE266333969
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices
2024-04-10 9:23 ` Andreas Dannenberg via buildroot
@ 2024-04-10 9:36 ` Dario Binacchi
0 siblings, 0 replies; 45+ messages in thread
From: Dario Binacchi @ 2024-04-10 9:36 UTC (permalink / raw)
To: Andreas Dannenberg; +Cc: buildroot
Hi Andreas,
On Wed, Apr 10, 2024 at 11:23 AM Andreas Dannenberg <dannenberg@ti.com> wrote:
>
> Gero, Dario, All,
>
> On Wed, Apr 10, 2024 at 03:24:29AM -0500, Andreas Dannenberg via buildroot wrote:
> > Gero, Dario,
> >
> > On Wed, Apr 10, 2024 at 10:00:06AM +0200, Gero Schwäricke via buildroot wrote:
> > > On Wed, Apr 10, 2024 at 09:34:16AM +0200, Dario Binacchi wrote:
> > > > Hi Romain, All
> > > >
> > > > On Tue, Apr 9, 2024 at 11:17 PM Romain Naour <romain.naour@smile.fr> wrote:
> > > > >
> > > > > Hello Arnout, All,
> > > [...]
> > > > >
> > > > > Thanks, the series is merged.
> > > > >
> > > > > Thanks to Dario and Michael for the initial work on the HS-FS topic!
> > > > >
> > > > > The initial series showed that it was necessary to rework heavily the TI K3 SoC
> > > > > related packages in Buildroot. This was the opportinity to anticipate on the
> > > > > addition of new TI K3 SoC support.
> > > > >
> > > > > Thanks to Andreas and Bryan from TI for the review and fine details about TI K3
> > > > > SoC familly and the runtime testing.
> > > > >
> > > > > Thanks to all testers and reviewers.
> > > >
> > > > I think my two patches for version 10 were ultimately lost:
> > > >
> > > > [v10,05/12] package/ti-k3: disable HS-FS for AM65 SOC
> > > > [v10,04/12] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope
> > > >
> > > > Specifically, patch 4 is necessary for the proper creation of the
> > > > image. Has version 12 actually been tested by anyone?
> > > > I can assure you version 10 has been.
> > > >
> > > > Additionally, it seems that patch
> > > > [v10,02/12] boot/ti-k3-r5-loader: set binman environment
> > > > has been incorporated into your patch "boot/ti-k3-r5-loader: remove
> > > > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN"
> > > > and I don't understand why.
> > > >
> > > > Thanks and regards,
> > > > Dario
> > >
> > > Hi Dario,
> > >
> > > I can confirm that something is amiss, maybe it would have been better
> > > to await more tests with patch V12.
> >
> > I just tested top-of-master w/o any additional patches on SK-AM62 (with
> > GP silicon) and SK-AM62B (production board, with HS-FS silicon) and it
> > worked like a champ. Here's the beginning of the boot using SK-AM62...
>
> I also just tested top-of-master with SK-AM64 (with GP silicon) and
> SK-AM64B (production board, with HS-FS silicon) successfully. With this
> I can boot on all 4 board/silicon variants without any issues. This was
> done using commit...
>
> d01e13c4d4 ("package/python3: fix cross builds when host and target use the same SOABI")
>
> So from my POV there is no issue with missing patches.
I must have missed something.
Thanks again for your tests.
Regards
Dario
>
> --
> Andreas Dannenberg
> Texas Instruments Inc
>
>
> >
> > <...snip...>
> > U-Boot SPL 2024.01 (Apr 09 2024 - 20:11:30 -0500)
> > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar')
> > SPL initial stack usage: 13368 bytes
> > Trying to boot from MMC2
> > Authentication passed
> > Authentication passed
> > Authentication passed
> > Authentication passed
> > Authentication passed
> > Starting ATF on ARM64 core...
> >
> > NOTICE: BL31: v2.7(release):v2.7
> > NOTICE: BL31: Built : 20:08:16, Apr 9 2024
> > I/TC:
> > I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot
> > 2024.02-416-gd01e13c4d4)) #1 Wed Apr 10 01:08:14 UTC 2024 aarch64
> > I/TC: WARNING: This OP-TEE configuration might be insecure!
> > I/TC: WARNING: Please check
> > https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html
> > I/TC: Primary CPU initializing
> > I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill
> > Capybar')
> > I/TC: HUK Initialized
> > I/TC: Activated SA2UL device
> > I/TC: Enabled firewalls for SA2UL TRNG device
> > I/TC: SA2UL TRNG initialized
> > I/TC: SA2UL Drivers initialized
> > I/TC: Primary CPU switching to normal world boot
> >
> > U-Boot SPL 2024.01 (Apr 09 2024 - 20:11:48 -0500)
> > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar')
> > SPL initial stack usage: 1872 bytes
> > Trying to boot from MMC2
> > Authentication passed
> > Authentication passed
> >
> >
> > U-Boot 2024.01 (Apr 09 2024 - 20:11:48 -0500)
> >
> > SoC: AM62X SR1.0 HS-FS
> > Model: Texas Instruments AM625 SK
> > DRAM: 2 GiB
> > Core: 56 devices, 23 uclasses, devicetree: separate
> > MMC: mmc@fa10000: 0, mmc@fa00000: 1
> > Loading Environment from nowhere... OK
> > In: serial@2800000
> > Out: serial@2800000
> > Err: serial@2800000
> > Net: eth0: ethernet@8000000port@1
> > Hit any key to stop autoboot: 0
> > <...snip...>
> >
> >
> > > At least my current test of ti_am62x_sk_defconfig on master failed to boot:
> > >
> > > U-Boot SPL 2024.01 (Apr 10 2024 - 09:32:17 +0200)
> > > k3_system_controller sysctrler: k3_sysctrler_start: Boot Notification response failed. ret = -110
> > > Firmware init failed on rproc (-110)
> > >
> > > resetting ...
> > >
> > > I tested with AM62x SK EVM E3. I'll try to apply your two missing
> > > patches and test again.
> >
> > Are you using a board with PCB revision 'PROC114E3'? If so this board is
> > known as 'Third prototype, early release revision of the AM62x SK EVM'
> > and should have GP silicon. Which means you must have re-added...
> >
> > BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin
> >
> > ...to your .config?
> >
> > I don't have a PROC114E3 board but the board I used to test the GP
> > variant today is a PROC114E2, and it worked. But neither of those boards
> > is considered "production".
> >
> > Also just for refernce, an SK-AM62 PCB revision history can be found in
> > Table 1-1 in the AM62x SK EVM User's Guide [1].
> >
> >
> > --
> > Andreas Dannenberg
> > Texas Instruments Inc
> >
> >
> > [1] https://www.ti.com/lit/pdf/spruj40
> >
> >
> >
> >
> > > Best,
> > > Gero
> > >
> > > > > Best regards,
> > > > > Romain
> > > > >
> > > [...]
> > >
> > > --
> > >
> > >
> > >
> > > –––
> > >
> > >
> > > grandcentrix GmbH | A Vodafone Company · Holzmarkt 1 · 50676
> > > *Cologne* | Phoenixseestrasse 18 · 44263 *Dortmund* · Germany
> > > | in
> > > <https://www.linkedin.com/company/grandcentrix> | phone: +49-221-677-860-0
> > > | email: hello@grandcentrix.net <mailto:hello@grandcentrix.net>
> > >
> > >
> > > grandcentrix cares about privacy
> > > <https://grandcentrix.net/de/pages/privacymail/>
> > >
> > > Amtsgericht Köln | HRB
> > > 70119 | Geschäftsführer: M. Krömer, R. Hänel | USt.-IdNr.: DE266333969
> > >
> > > _______________________________________________
> > > buildroot mailing list
> > > buildroot@buildroot.org
> > > https://lists.buildroot.org/mailman/listinfo/buildroot
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
--
Dario Binacchi
Senior Embedded Linux Developer
dario.binacchi@amarulasolutions.com
__________________________________
Amarula Solutions SRL
Via Le Canevare 30, 31100 Treviso, Veneto, IT
T. +39 042 243 5310
info@amarulasolutions.com
www.amarulasolutions.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices
2024-04-10 8:24 ` Andreas Dannenberg via buildroot
2024-04-10 9:23 ` Andreas Dannenberg via buildroot
@ 2024-04-10 11:10 ` Gero Schwäricke via buildroot
2024-04-10 21:38 ` Romain Naour
2 siblings, 0 replies; 45+ messages in thread
From: Gero Schwäricke via buildroot @ 2024-04-10 11:10 UTC (permalink / raw)
To: Andreas Dannenberg; +Cc: buildroot
On Wed, Apr 10, 2024 at 03:24:29AM -0500, Andreas Dannenberg via buildroot wrote:
> Gero, Dario,
>
[...]
> > At least my current test of ti_am62x_sk_defconfig on master failed to boot:
> >
> > U-Boot SPL 2024.01 (Apr 10 2024 - 09:32:17 +0200)
> > k3_system_controller sysctrler: k3_sysctrler_start: Boot Notification response failed. ret = -110
> > Firmware init failed on rproc (-110)
> >
> > resetting ...
> >
> > I tested with AM62x SK EVM E3. I'll try to apply your two missing
> > patches and test again.
>
> Are you using a board with PCB revision 'PROC114E3'? If so this board is
> known as 'Third prototype, early release revision of the AM62x SK EVM'
> and should have GP silicon. Which means you must have re-added...
>
> BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin
>
> ...to your .config?
Hi,
Yes, I have a PROC114E3.
I tested the same way I did V10, but missed
[PATCH v12 16/16] package/ti-k3: switch ti_am6{2, 4}x_sk_defconfig to HS-FS by default
which was new in V11/12. I now manually set
BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
and it's booting fine. Thank you!
Also thanks for testing with the other hardware revisions!
Best,
Gero
>
> I don't have a PROC114E3 board but the board I used to test the GP
> variant today is a PROC114E2, and it worked. But neither of those boards
> is considered "production".
>
> Also just for refernce, an SK-AM62 PCB revision history can be found in
> Table 1-1 in the AM62x SK EVM User's Guide [1].
>
>
> --
> Andreas Dannenberg
> Texas Instruments Inc
>
>
> [1] https://www.ti.com/lit/pdf/spruj40
>
>
>
>
> > Best,
> > Gero
> >
> > > > Best regards,
> > > > Romain
> > > >
> > [...]
> >
> > --
> >
> >
> >
> > –––
> >
> >
> > grandcentrix GmbH | A Vodafone Company · Holzmarkt 1 · 50676
> > *Cologne* | Phoenixseestrasse 18 · 44263 *Dortmund* · Germany
> > | in
> > <https://www.linkedin.com/company/grandcentrix> | phone: +49-221-677-860-0
> > | email: hello@grandcentrix.net <mailto:hello@grandcentrix.net>
> >
> >
> > grandcentrix cares about privacy
> > <https://grandcentrix.net/de/pages/privacymail/>
> >
> > Amtsgericht Köln | HRB
> > 70119 | Geschäftsführer: M. Krömer, R. Hänel | USt.-IdNr.: DE266333969
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
–––
grandcentrix GmbH | A Vodafone Company · Holzmarkt 1 · 50676
*Cologne* | Phoenixseestrasse 18 · 44263 *Dortmund* · Germany
| in
<https://www.linkedin.com/company/grandcentrix> | phone: +49-221-677-860-0
| email: hello@grandcentrix.net <mailto:hello@grandcentrix.net>
grandcentrix cares about privacy
<https://grandcentrix.net/de/pages/privacymail/>
Amtsgericht Köln | HRB
70119 | Geschäftsführer: M. Krömer, R. Hänel | USt.-IdNr.: DE266333969
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices
2024-04-10 8:24 ` Andreas Dannenberg via buildroot
2024-04-10 9:23 ` Andreas Dannenberg via buildroot
2024-04-10 11:10 ` Gero Schwäricke via buildroot
@ 2024-04-10 21:38 ` Romain Naour
2 siblings, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-10 21:38 UTC (permalink / raw)
To: Andreas Dannenberg, Dario Binacchi, buildroot
Hi Andreas, Gero, Dario, All,
Le 10/04/2024 à 10:24, Andreas Dannenberg via buildroot a écrit :
> Gero, Dario,
>
> On Wed, Apr 10, 2024 at 10:00:06AM +0200, Gero Schwäricke via buildroot wrote:
>> On Wed, Apr 10, 2024 at 09:34:16AM +0200, Dario Binacchi wrote:
>>> Hi Romain, All
>>>
>>> On Tue, Apr 9, 2024 at 11:17 PM Romain Naour <romain.naour@smile.fr> wrote:
>>>>
>>>> Hello Arnout, All,
>> [...]
>>>>
>>>> Thanks, the series is merged.
>>>>
>>>> Thanks to Dario and Michael for the initial work on the HS-FS topic!
>>>>
>>>> The initial series showed that it was necessary to rework heavily the TI K3 SoC
>>>> related packages in Buildroot. This was the opportinity to anticipate on the
>>>> addition of new TI K3 SoC support.
>>>>
>>>> Thanks to Andreas and Bryan from TI for the review and fine details about TI K3
>>>> SoC familly and the runtime testing.
>>>>
>>>> Thanks to all testers and reviewers.
>>>
>>> I think my two patches for version 10 were ultimately lost:
>>>
>>> [v10,05/12] package/ti-k3: disable HS-FS for AM65 SOC
>>> [v10,04/12] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope
>>>
>>> Specifically, patch 4 is necessary for the proper creation of the
>>> image. Has version 12 actually been tested by anyone?
>>> I can assure you version 10 has been.
>>>
>>> Additionally, it seems that patch
>>> [v10,02/12] boot/ti-k3-r5-loader: set binman environment
>>> has been incorporated into your patch "boot/ti-k3-r5-loader: remove
>>> BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN"
>>> and I don't understand why.
>>>
>>> Thanks and regards,
>>> Dario
>>
>> Hi Dario,
>>
>> I can confirm that something is amiss, maybe it would have been better
>> to await more tests with patch V12.
>
> I just tested top-of-master w/o any additional patches on SK-AM62 (with
> GP silicon) and SK-AM62B (production board, with HS-FS silicon) and it
> worked like a champ. Here's the beginning of the boot using SK-AM62...
>
> <...snip...>
> U-Boot SPL 2024.01 (Apr 09 2024 - 20:11:30 -0500)
> SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar')
> SPL initial stack usage: 13368 bytes
> Trying to boot from MMC2
> Authentication passed
> Authentication passed
> Authentication passed
> Authentication passed
> Authentication passed
> Starting ATF on ARM64 core...
>
> NOTICE: BL31: v2.7(release):v2.7
> NOTICE: BL31: Built : 20:08:16, Apr 9 2024
> I/TC:
> I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot
> 2024.02-416-gd01e13c4d4)) #1 Wed Apr 10 01:08:14 UTC 2024 aarch64
> I/TC: WARNING: This OP-TEE configuration might be insecure!
> I/TC: WARNING: Please check
> https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html
> I/TC: Primary CPU initializing
> I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill
> Capybar')
> I/TC: HUK Initialized
> I/TC: Activated SA2UL device
> I/TC: Enabled firewalls for SA2UL TRNG device
> I/TC: SA2UL TRNG initialized
> I/TC: SA2UL Drivers initialized
> I/TC: Primary CPU switching to normal world boot
>
> U-Boot SPL 2024.01 (Apr 09 2024 - 20:11:48 -0500)
> SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar')
> SPL initial stack usage: 1872 bytes
> Trying to boot from MMC2
> Authentication passed
> Authentication passed
>
>
> U-Boot 2024.01 (Apr 09 2024 - 20:11:48 -0500)
>
> SoC: AM62X SR1.0 HS-FS
> Model: Texas Instruments AM625 SK
> DRAM: 2 GiB
> Core: 56 devices, 23 uclasses, devicetree: separate
> MMC: mmc@fa10000: 0, mmc@fa00000: 1
> Loading Environment from nowhere... OK
> In: serial@2800000
> Out: serial@2800000
> Err: serial@2800000
> Net: eth0: ethernet@8000000port@1
> Hit any key to stop autoboot: 0
> <...snip...>
>
>
>> At least my current test of ti_am62x_sk_defconfig on master failed to boot:
>>
>> U-Boot SPL 2024.01 (Apr 10 2024 - 09:32:17 +0200)
>> k3_system_controller sysctrler: k3_sysctrler_start: Boot Notification response failed. ret = -110
>> Firmware init failed on rproc (-110)
>>
>> resetting ...
>>
>> I tested with AM62x SK EVM E3. I'll try to apply your two missing
>> patches and test again.
>
> Are you using a board with PCB revision 'PROC114E3'? If so this board is
> known as 'Third prototype, early release revision of the AM62x SK EVM'
> and should have GP silicon. Which means you must have re-added...
>
> BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin
>
> ...to your .config?
>
> I don't have a PROC114E3 board but the board I used to test the GP
> variant today is a PROC114E2, and it worked. But neither of those boards
> is considered "production".
>
> Also just for refernce, an SK-AM62 PCB revision history can be found in
> Table 1-1 in the AM62x SK EVM User's Guide [1].
Thanks for the additional testing Andreas!
Gero, if you are using an early hardware revision of the SK-AM62 you must re-add:
BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
I added a new comment in board/ti/am62x-sk/readme.txt [1] that refer to the TI
E2E forum post [2].
[1]
https://gitlab.com/buildroot.org/buildroot/-/blob/master/board/ti/am62x-sk/readme.txt?ref_type=heads&plain=1#L20
[2]
https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto
Best regards,
Romain
>
>
> --
> Andreas Dannenberg
> Texas Instruments Inc
>
>
> [1] https://www.ti.com/lit/pdf/spruj40
>
>
>
>
>> Best,
>> Gero
>>
>>>> Best regards,
>>>> Romain
>>>>
>> [...]
>>
>> --
>>
>>
>>
>> –––
>>
>>
>> grandcentrix GmbH | A Vodafone Company · Holzmarkt 1 · 50676
>> *Cologne* | Phoenixseestrasse 18 · 44263 *Dortmund* · Germany
>> | in
>> <https://www.linkedin.com/company/grandcentrix> | phone: +49-221-677-860-0
>> | email: hello@grandcentrix.net <mailto:hello@grandcentrix.net>
>>
>>
>> grandcentrix cares about privacy
>> <https://grandcentrix.net/de/pages/privacymail/>
>>
>> Amtsgericht Köln | HRB
>> 70119 | Geschäftsführer: M. Krömer, R. Hänel | USt.-IdNr.: DE266333969
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [Buildroot] [PATCH v12 00/16] Add support for AM62x-SK HS-FS devices
2024-04-10 7:34 ` Dario Binacchi
2024-04-10 8:00 ` Gero Schwäricke via buildroot
@ 2024-04-10 21:30 ` Romain Naour
1 sibling, 0 replies; 45+ messages in thread
From: Romain Naour @ 2024-04-10 21:30 UTC (permalink / raw)
To: Dario Binacchi
Cc: Michael Walle, Bryan Brattlof, Gero Schwäricke, buildroot,
Heiko Thiery, Michael Nazzareno Trimarchi, Alexander Sverdlin,
Andreas Dannenberg
Hi Dario, All,
Le 10/04/2024 à 09:34, Dario Binacchi a écrit :
> Hi Romain, All
>
> On Tue, Apr 9, 2024 at 11:17 PM Romain Naour <romain.naour@smile.fr> wrote:
>>
>> Hello Arnout, All,
>>
>> Le 08/04/2024 à 15:47, Arnout Vandecappelle a écrit :
>>>
>>> On 07/04/2024 22:30, Arnout Vandecappelle wrote:
>>>>
>>>>
>>>> On 07/04/2024 12:34, Romain Naour wrote:
>>>>> This series aims initially to fix AM62x-SK HS-FS devices but doing so
>>>>> would requires adding a TI legacy tool "ti-k3-core-secdev" into Buildroot.
>>>>> ti-k3-core-secdev is replaced by u-boot's binman tool since v2023.10 release
>>>>> of u-boot.
>>>>>
>>>>> Instead, we bump the BSP to use the latest u-boot release (2024.01) to use
>>>>> binman. Doing so requires to rework the TI K3 SoC support in Buildroot.
>>>>>
>>>>> This new version (v12) of this series remove the ti-k3 package and
>>>>> all SOC and SECTYPE options. As suggested by Michael Walle, copy the
>>>>> default tiboot3.bin and sysfw.itb (if any) if no custom file name is
>>>>> provided on the defconfig. Since such file name can be customized,
>>>>> the user must provide the complete firmware name if not using the
>>>>> default one.
>>>>>
>>>>> http://lists.busybox.net/pipermail/buildroot/2024-April/688943.html
>>>>>
>>>>> With the advice of Andreas Dannenberg (TI K3 architect), we switch
>>>>> AM62x/AM62Ax/AM64x to HS-FS by default.
>>>>>
>>>>> Tests performed on earlier revision of this series:
>>>>>
>>>>> * compiled ti_am62x_sk_defconfig
>>>>> * success
>>>>> * booted on AM62x SK EVM (E3)
>>>>> * success
>>>>> * no obvious errors in dmesg
>>>>>
>>>>> Tested-by: Gero Schwäricke <gero.schwaericke@grandcentrix.net>
>>>>>
>>>>> Dario Binacchi (10):
>>>>> boot/ti-k3-r5-loader: drop hash for version 2022.10
>>>>> boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
>>>>> boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option
>>>>> boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to
>>>>> BINARIES_DIR
>>>>> configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01
>>>>> configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18
>>>>> board/ti/am62x-sk: generalize post-build.sh
>>>>> board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx
>>>>> configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01
>>>>> configs/ti_am64x_sk_defconfig: bump Linux version to 6.6.18
>>>>>
>>>>> Romain Naour (6):
>>>>> board/ti/am6{2,4}x-sk: add arm-trusted-firmware v2.7 hash
>>>>> boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support
>>>>> boot/uboot: remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
>>>>> boot/ti-k3-image-gen: remove package
>>>>> boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
>>>>> package/ti-k3: switch AM62x/AM62Ax/AM64x to HS-FS by default
>>>>
>>>> Patches 1-5 applied to master. And there I stopped, due to the SWSFW typo. I
>>>> could have fixed it up myself but it's really every patch that needs to be
>>>> updated...
>>>
>>>
>>> I also reviewed the rest of the series with minor comments, so you can apply
>>> them directly (with my Reviewed-by: Arnout Vandecappelle <arnout@mind.be>)
>>
>> Thanks, the series is merged.
>>
>> Thanks to Dario and Michael for the initial work on the HS-FS topic!
>>
>> The initial series showed that it was necessary to rework heavily the TI K3 SoC
>> related packages in Buildroot. This was the opportinity to anticipate on the
>> addition of new TI K3 SoC support.
>>
>> Thanks to Andreas and Bryan from TI for the review and fine details about TI K3
>> SoC familly and the runtime testing.
>>
>> Thanks to all testers and reviewers.
>
> I think my two patches for version 10 were ultimately lost:
>
> [v10,05/12] package/ti-k3: disable HS-FS for AM65 SOC
> [v10,04/12] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope
See the discussion with Heiko and Michael Walle.
http://lists.busybox.net/pipermail/buildroot/2024-April/688953.html
The ti-k3 package is not needed if we let the user to provide the firmware name
he need.
>
> Specifically, patch 4 is necessary for the proper creation of the
> image. Has version 12 actually been tested by anyone?
> I can assure you version 10 has been.
The ATF, uboot, kernel version were keep as is as you tested it already.
I checked if the right firmware was deployed in BINARIES_DIR.
>
> Additionally, it seems that patch
> [v10,02/12] boot/ti-k3-r5-loader: set binman environment
> has been incorporated into your patch "boot/ti-k3-r5-loader: remove
> BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN"
> and I don't understand why.
I tried to explain in the commit log:
The BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option is currently needed
since we are in the middle of the process to switch TI AM62 and AM64
board defconfig to binman. Keep BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN
disabled for them until the u-boot/ti-k3-r5-loader version bump to
2024.01.
Best regards,
Romain
>
> Thanks and regards,
> Dario
>
>>
>> Best regards,
>> Romain
>>
>>>
>>>
>>> Regards,
>>> Arnout
>>>
>>>
>>>>
>>>>
>>>> Regards,
>>>> Arnout
>>>>
>>>>>
>>>>> Config.in.legacy | 15 ++++
>>>>> DEVELOPERS | 2 -
>>>>> board/ti/am62x-sk/genimage.cfg | 7 +-
>>>>> .../arm-trusted-firmware.hash | 2 +
>>>>> .../patches/linux-headers/linux-headers.hash | 1 +
>>>>> board/ti/am62x-sk/patches/linux/linux.hash | 2 +
>>>>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +
>>>>> board/ti/am64x-sk/genimage.cfg | 7 +-
>>>>> .../arm-trusted-firmware.hash | 2 +
>>>>> .../patches/linux-headers/linux-headers.hash | 1 +
>>>>> board/ti/am64x-sk/patches/linux/linux.hash | 2 +
>>>>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 +
>>>>> board/ti/common/am6xx/post-build.sh | 58 ++++++++++++++
>>>>> boot/Config.in | 1 -
>>>>> boot/ti-k3-image-gen/Config.in | 77 -------------------
>>>>> boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 -
>>>>> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 -------------
>>>>> boot/ti-k3-r5-loader/Config.in | 33 ++++++++
>>>>> boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 -
>>>>> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 40 +++++++++-
>>>>> boot/uboot/Config.in | 35 +++++----
>>>>> boot/uboot/uboot.mk | 12 ++-
>>>>> configs/ti_am62x_sk_defconfig | 21 ++---
>>>>> configs/ti_am64x_sk_defconfig | 20 +++--
>>>>> 24 files changed, 221 insertions(+), 178 deletions(-)
>>>>> create mode 100644
>>>>> board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>>>>> create mode 120000 board/ti/am62x-sk/patches/linux-headers/linux-headers.hash
>>>>> create mode 100644 board/ti/am62x-sk/patches/linux/linux.hash
>>>>> create mode 100644
>>>>> board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
>>>>> create mode 100644
>>>>> board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>>>>> create mode 120000 board/ti/am64x-sk/patches/linux-headers/linux-headers.hash
>>>>> create mode 100644 board/ti/am64x-sk/patches/linux/linux.hash
>>>>> create mode 100644
>>>>> board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
>>>>> create mode 100755 board/ti/common/am6xx/post-build.sh
>>>>> delete mode 100644 boot/ti-k3-image-gen/Config.in
>>>>> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash
>>>>> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk
>>>>>
>>>>> --
>>>>> 2.44.0
>>>>>
>>>>> _______________________________________________
>>>>> buildroot mailing list
>>>>> buildroot@buildroot.org
>>>>> https://lists.buildroot.org/mailman/listinfo/buildroot
>>
>
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 45+ messages in thread