[Buildroot] [PATCH v9 00/22] Add support for AM62x-SK HS-FS devices

[Buildroot] [PATCH v9 00/22] Add support for AM62x-SK HS-FS devices

[Dario Binacchi]

The SK-AM62B-P1 is the newest version of SK-AM62 which includes
high-security field-securable (HS-FS) silicon to optionally customize keys
and encryption for security applications.
This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option,
which, however, was buggy. This series fixes the errors and bumps the Linux
kernel and U-Boot required for such a new device.

Furthermore, this version complete the series by updating the
ti_am64x_sk_defconfig too and remove ti-k3-image-gen, as requested by
Romain Naour:
https://patchwork.ozlabs.org/project/buildroot/patch/20240224205654.1546744-17-dario.binacchi@amarulasolutions.com/
I have successfully executed compilation tests for all possible combinations of platform and security type:
am62x -> GP, HS, HS-FS
am64x -> GP, HS, HS-FS

The AM62x HS-FS configuration has also been tested on the SK-AM62B-P1 board.

Dario Binacchi (21):
  configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM
    setting
  configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM
    setting
  configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader
    version
  configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader
    version
  boot/ti-k3-r5-loader: bump to version 2024.01
  package/python-attrs: add host variant
  package/python-rpds-py: add host variant
  package/python-referencing: add host variant
  package/python-jsonschema-specifications: add host variant
  package/python-jsonschema: add host variant
  boot/ti-k3-r5-loader: set binman environment
  boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option
  package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope
  package/ti-k3: disable HS-FS for AM65 SOC
  boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin
  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,image}.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 (1):
  boot/ti-k3-image-gen: remove package

 Config.in.legacy                              |  7 ++
 DEVELOPERS                                    |  2 -
 board/ti/am62x-sk/genimage.cfg                |  7 +-
 board/ti/am64x-sk/genimage.cfg                |  7 +-
 board/ti/common/am6xx/post-build.sh           | 58 ++++++++++++++
 board/ti/common/am6xx/post-image.sh           | 11 +++
 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                |  5 +-
 boot/ti-k3-r5-loader/ti-k3-r5-loader.hash     |  2 +-
 boot/ti-k3-r5-loader/ti-k3-r5-loader.mk       | 12 ++-
 boot/uboot/Config.in                          | 23 +++---
 boot/uboot/uboot.mk                           | 12 ++-
 configs/ti_am62x_sk_defconfig                 | 22 +++---
 configs/ti_am64x_sk_defconfig                 | 22 +++---
 package/Config.in                             |  1 +
 package/python-attrs/python-attrs.mk          |  6 ++
 .../python-jsonschema-specifications.mk       | 10 +++
 .../python-jsonschema/python-jsonschema.mk    | 14 ++++
 .../python-referencing/python-referencing.mk  | 11 +++
 package/python-rpds-py/python-rpds-py.mk      |  1 +
 package/ti-k3/Config.in                       | 61 +++++++++++++++
 package/ti-k3/ti-k3.mk                        |  7 ++
 25 files changed, 263 insertions(+), 173 deletions(-)
 create mode 100755 board/ti/common/am6xx/post-build.sh
 create mode 100755 board/ti/common/am6xx/post-image.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
 create mode 100644 package/ti-k3/Config.in
 create mode 100644 package/ti-k3/ti-k3.mk

-- 
2.43.0

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

[Buildroot] [PATCH v9 01/22] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting

[Dario Binacchi]

Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g.
j721e) because the optee flavor is missing.

We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and
BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am62x but we actually can use
BR2_TARGET_OPTEE_OS_PLATFORM=k3-am62x as explained in the optee-os
Makefile [1]:

  # If $(PLATFORM) is defined and contains a hyphen, parse it as
  # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience

This is how meta-ti set the optee-os platform:

  meta-ti]$ git grep OPTEEMACHINE
  meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx"
  meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx"
  meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x"
  meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx"
  meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x"
  meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x"
  meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x"
  meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x"
  meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x"
  meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e"
  meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e"
  meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4"
  meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x"
  meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4"

  meta-ti uses the OPTEEMACHINE to set optee-os platform [2].

[1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37
[2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23

Suggested-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

Changes in v6:
- Update commit message

Changes in v5
- Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option

Added in v4

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

diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index f88252a89c68..c3ad555a8184 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3"
 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"
+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
-- 
2.43.0

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

[Buildroot] [PATCH v9 02/22] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting

[Dario Binacchi]

Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g.
j721e) because the optee flavor is missing.

We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and
BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am64x but we actually can use
BR2_TARGET_OPTEE_OS_PLATFORM=k3-am64x as explained in the optee-os
Makefile [1]:

  # If $(PLATFORM) is defined and contains a hyphen, parse it as
  # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience

This is how meta-ti set the optee-os platform:

  meta-ti]$ git grep OPTEEMACHINE
  meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx"
  meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx"
  meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x"
  meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx"
  meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x"
  meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x"
  meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x"
  meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x"
  meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x"
  meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e"
  meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e"
  meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4"
  meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x"
  meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4"

  meta-ti uses the OPTEEMACHINE to set optee-os platform [2].

[1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37
[2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23

Suggested-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

Changes in v6:
- Update commit message

Changes in v5:
- Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option

Added in v4

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

diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index 4bfd31f0c8d3..097175bd8f39 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3"
 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"
+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
-- 
2.43.0

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

[Buildroot] [PATCH v9 03/22] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version

[Dario Binacchi]

Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to
specify the ti-k3-r5-loader, so do that now.

When the defconfig was added, the default version was 2022.10, so use it.

Suggested-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

no changes since v4

Added in v4

 configs/ti_am62x_sk_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index c3ad555a8184..a129e216d25b 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -25,6 +25,8 @@ 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_BOARD_DEFCONFIG="am62x_evm_r5"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-- 
2.43.0

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

[Buildroot] [PATCH v9 04/22] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version

[Dario Binacchi]

Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to
specify the ti-k3-r5-loader, so do that now.

When the defconfig was added, the default version was 2022.10, so use it.

Suggested-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

no changes since v4

Added in v4

 configs/ti_am64x_sk_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index 097175bd8f39..26195194c7d6 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -25,6 +25,8 @@ 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_BOARD_DEFCONFIG="am64x_evm_r5"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-- 
2.43.0

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

[Buildroot] [PATCH v9 05/22] boot/ti-k3-r5-loader: bump to version 2024.01

[Dario Binacchi]

All in-tree configs with the ti-k3-r5 bootloader use a custom version,
so this patch is mostly for the menuconfig default version

Suggested-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

no changes since v4

Added in v4

 boot/ti-k3-r5-loader/Config.in            | 4 ++--
 boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in
index 8c8368a1a5a8..5f86c045c99f 100644
--- a/boot/ti-k3-r5-loader/Config.in
+++ b/boot/ti-k3-r5-loader/Config.in
@@ -16,7 +16,7 @@ choice
 	  here as it is used to build the main U-Boot package.
 
 config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION
-	bool "2022.10"
+	bool "2024.01"
 
 config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION
 	bool "Custom version"
@@ -60,7 +60,7 @@ endif
 
 config BR2_TARGET_TI_K3_R5_LOADER_VERSION
 	string
-	default "2022.10"	if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION
+	default "2024.01"	if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION
 	default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \
 		if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL
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 c5d1cb8e09f0..fbe5d215409d 100644
--- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
+++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
@@ -1,3 +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
-- 
2.43.0

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

[Buildroot] [PATCH v9 06/22] package/python-attrs: add host variant

[Dario Binacchi]

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 package is required by binman.

Co-developed-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

no changes since v3

Changes in v3:
- Drop Config.in.host

 package/python-attrs/python-attrs.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk
index 8a1236cc4402..fb1729e62fa2 100644
--- a/package/python-attrs/python-attrs.mk
+++ b/package/python-attrs/python-attrs.mk
@@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \
 	host-python-hatch-fancy-pypi-readme \
 	host-python-hatch-vcs
 
+HOST_PYTHON_ATTRS_DEPENDENCIES = \
+	host-python-hatchling \
+	host-python-hatch-fancy-pypi-readme \
+	host-python-hatch-vcs
+
 $(eval $(python-package))
+$(eval $(host-python-package))
-- 
2.43.0

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

[Buildroot] [PATCH v9 07/22] package/python-rpds-py: add host variant

[Dario Binacchi]

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 package is required by binman

Co-developed-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

no changes since v3

Changes in v3:
- Drop Config.in.host

 package/python-rpds-py/python-rpds-py.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk
index 80670f2e4fde..cee2ff290a4e 100644
--- a/package/python-rpds-py/python-rpds-py.mk
+++ b/package/python-rpds-py/python-rpds-py.mk
@@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT
 PYTHON_RPDS_PY_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
+$(eval $(host-python-package))
-- 
2.43.0

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

[Buildroot] [PATCH v9 08/22] package/python-referencing: add host variant

[Dario Binacchi]

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 package is required by binman.

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>

---

Changes in v5:
- Add runtime dependencies
- Add SOB and COB tags of Romain Naour

no changes in v4

Changes in v3:
- Drop Config.in.host

 package/python-referencing/python-referencing.mk | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk
index 27d1452e913a..66d59ed8091a 100644
--- a/package/python-referencing/python-referencing.mk
+++ b/package/python-referencing/python-referencing.mk
@@ -14,4 +14,15 @@ PYTHON_REFERENCING_DEPENDENCIES = \
 	host-python-hatchling \
 	host-python-hatch-vcs
 
+HOST_PYTHON_REFERENCING_DEPENDENCIES = \
+	host-python-hatchling \
+	host-python-hatch-vcs
+
+# This is a runtime dependency, but we don't have the concept of
+# runtime dependencies for host packages.
+HOST_PYTHON_REFERENCING_DEPENDENCIES += \
+	host-python-attrs \
+	host-python-rpds-py
+
 $(eval $(python-package))
+$(eval $(host-python-package))
-- 
2.43.0

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

[Buildroot] [PATCH v9 09/22] package/python-jsonschema-specifications: add host variant

[Dario Binacchi]

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 package is required by binman.

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>

---

Changes in v6:
- Add runtime dependencies
- Add SOB and COB tags of Romain Naour

no changes since v3

Changes in v3:
- Drop Config.in.host

 package/python-jsonschema-specifications.mk                | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk
index 40879898c9d4..653c839bb450 100644
--- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk
+++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk
@@ -14,4 +14,14 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \
 	host-python-hatchling \
 	host-python-hatch-vcs
 
+HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \
+	host-python-hatchling \
+	host-python-hatch-vcs
+
+# This is a runtime dependency, but we don't have the concept of
+# runtime dependencies for host packages.
+HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES += \
+	host-python-referencing
+
 $(eval $(python-package))
+$(eval $(host-python-package))
-- 
2.43.0

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

[Buildroot] [PATCH v9 10/22] package/python-jsonschema: add host variant

[Dario Binacchi]

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 package is required by binman.

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>

---

Changes in v5:
- Add runtime dependencies
- Add SOB and COB tags of Romain Naour

no changes in v4

Changes in v3:
- Drop Config.in.host

 package/python-jsonschema/python-jsonschema.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk
index 512c92aa7752..9e8b6e18b876 100644
--- a/package/python-jsonschema/python-jsonschema.mk
+++ b/package/python-jsonschema/python-jsonschema.mk
@@ -15,4 +15,18 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \
 	host-python-hatch-fancy-pypi-readme \
 	host-python-hatch-vcs
 
+HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \
+	host-python-hatchling \
+	host-python-hatch-fancy-pypi-readme \
+	host-python-hatch-vcs
+
+# This is a runtime dependency, but we don't have the concept of
+# runtime dependencies for host packages.
+HOST_PYTHON_JSONSCHEMA_DEPENDENCIES += \
+	host-python-attrs \
+	host-python-jsonschema-specifications \
+	host-python-referencing \
+	host-python-rpds-py
+
 $(eval $(python-package))
+$(eval $(host-python-package))
-- 
2.43.0

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

[Buildroot] [PATCH v9 11/22] boot/ti-k3-r5-loader: set binman environment

[Dario Binacchi]

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.

The patch set the BINMAN_INDIRS environment variable to provide the
directory to search for binary blobs and select the packages required by
binman.

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>

---

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          | 1 +
 boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in
index 5f86c045c99f..fc71337e80cc 100644
--- a/boot/ti-k3-r5-loader/Config.in
+++ b/boot/ti-k3-r5-loader/Config.in
@@ -1,6 +1,7 @@
 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
 	help
 	  Separate U-Boot SPL build for R5 core on TI's K3 processors.
 	  Usually used to build tiboot3.bin with k3-image-gen.
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 0ffcb8235f2e..fdb058f3b72a 100644
--- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
+++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
@@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \
 	host-pkgconf \
 	$(BR2_MAKE_HOST_DEPENDENCY) \
 	host-arm-gnu-toolchain \
-	host-openssl
+	host-openssl \
+	host-python-jsonschema \
+	host-python-pyyaml \
+	host-python3 \
+	host-python-setuptools \
+	host-python-pylibfdt
 
 TI_K3_R5_LOADER_MAKE = $(BR2_MAKE)
 TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV)
@@ -58,6 +63,7 @@ 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)))" \
+	BINMAN_INDIRS=$(BINARIES_DIR) \
 	HOSTLDFLAGS="$(HOST_LDFLAGS)"
 
 define TI_K3_R5_LOADER_BUILD_CMDS
-- 
2.43.0

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

[Buildroot] [PATCH v9 12/22] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option

[Dario Binacchi]

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].

Furthermore, the use of Binman no longer makes it necessary to set
`UBOOT_MAKE_OPTS += DM=...'. We had the explanation from [2]:

BINMAN_INDIRS is used to fetch the DM binary from <path to
ti-linux-firmware>/ti-dm/ and SYSFW binaries from <path to
ti-linux-firmware>/ti-sysfw/.

[1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot
[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
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>

---

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  | 12 +++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index beafb38930db..e6e7956adccb 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -290,6 +290,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 dda606a88059..35a41d96a12d 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -187,10 +187,12 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf
 endif
 
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y)
-UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME))
 UBOOT_DEPENDENCIES += ti-k3-boot-firmware
+ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),)
+UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_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
@@ -269,6 +271,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.43.0

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

[Buildroot] [PATCH v9 13/22] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope

[Dario Binacchi]

Recent versions of U-Boot can use Binman to compile and sign the generated
binaries, thus making the use of custom tools like ti-k3-image-gen no
longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were
configured and used outside of it. This patch allows setting such options
even if the package is not enabled.

The patch makes an exception to the Buildroot rule "no subdirectory in
package directory".

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

Changes in v7:
- Revert change disabling BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for
  BR2_PACKAGE_TI_K3_SOC_AM65X. The change is moved in a separate patch.

Changes in v6:
- Move BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME to ti-k3 (BR2_PACKAGE_TI_K3_DM).
- Disable BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for BR2_PACKAGE_TI_K3_SOC_AM65X

Changes in v5:
- Add SOB tag
- Move the new ti-k3 from boot to package

Added in v4

 boot/ti-k3-image-gen/Config.in          | 61 ++-----------------------
 boot/ti-k3-image-gen/ti-k3-image-gen.mk |  4 +-
 boot/uboot/Config.in                    | 12 +----
 boot/uboot/uboot.mk                     |  2 +-
 configs/ti_am62x_sk_defconfig           |  3 +-
 configs/ti_am64x_sk_defconfig           |  3 +-
 package/Config.in                       |  1 +
 package/ti-k3/Config.in                 | 59 ++++++++++++++++++++++++
 package/ti-k3/ti-k3.mk                  |  7 +++
 9 files changed, 79 insertions(+), 73 deletions(-)
 create mode 100644 package/ti-k3/Config.in
 create mode 100644 package/ti-k3/ti-k3.mk

diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in
index d76cef82e911..a57319f4be6d 100644
--- a/boot/ti-k3-image-gen/Config.in
+++ b/boot/ti-k3-image-gen/Config.in
@@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN
 	  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
+	default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62AX
+	default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62X
+	default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X
+	default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X
 
 endif
diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk
index 64be9a18f2c4..aca29bcf1bd4 100644
--- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk
+++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk
@@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \
 	$(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_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC))
+TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE))
 
 TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin
 
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index e6e7956adccb..821854d08acc 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -244,21 +244,11 @@ 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
+	depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X
 	help
 	  Some TI K3 devices need the Device Manager (DM) firmware to
 	  be available for the U-Boot build.
 
-if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
-
-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 35a41d96a12d..7cd4636aa292 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -189,7 +189,7 @@ endif
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y)
 UBOOT_DEPENDENCIES += ti-k3-boot-firmware
 ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),)
-UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME))
+UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_PACKAGE_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
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index a129e216d25b..2835404a57df 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -11,6 +11,8 @@ 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_PACKAGE_TI_K3=y
+BR2_PACKAGE_TI_K3_SOC_AM62X=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="256M"
@@ -23,7 +25,6 @@ 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"
diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index 26195194c7d6..566cbbe4824f 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -11,6 +11,8 @@ 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_PACKAGE_TI_K3=y
+BR2_PACKAGE_TI_K3_SOC_AM64X=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
@@ -23,7 +25,6 @@ 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"
diff --git a/package/Config.in b/package/Config.in
index 33039331f7dc..b1638243790d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -629,6 +629,7 @@ endmenu
 	source "package/sysstat/Config.in"
 	source "package/targetcli-fb/Config.in"
 	source "package/ti-gfx/Config.in"
+	source "package/ti-k3/Config.in"
 	source "package/ti-sgx-demos/Config.in"
 	source "package/ti-sgx-km/Config.in"
 	source "package/ti-sgx-um/Config.in"
diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in
new file mode 100644
index 000000000000..2a51b1531487
--- /dev/null
+++ b/package/ti-k3/Config.in
@@ -0,0 +1,59 @@
+config BR2_PACKAGE_TI_K3
+	bool "TI K3"
+	help
+	  The TI K3 SOC specific selections.
+
+if BR2_PACKAGE_TI_K3
+
+choice
+	prompt "SoC family"
+
+config BR2_PACKAGE_TI_K3_SOC_AM62AX
+	bool "am62ax"
+
+config BR2_PACKAGE_TI_K3_SOC_AM62X
+	bool "am62x"
+
+config BR2_PACKAGE_TI_K3_SOC_AM64X
+	bool "am64x"
+
+config BR2_PACKAGE_TI_K3_SOC_AM65X
+	bool "am65x"
+
+endchoice
+
+choice
+	prompt "Security type"
+	help
+	  The target SoC security type option.
+
+config BR2_PACKAGE_TI_K3_SECTYPE_GP
+	bool "gp"
+
+config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS
+	bool "hs-fs"
+
+config BR2_PACKAGE_TI_K3_SECTYPE_HS
+	bool "hs"
+
+endchoice
+
+config BR2_PACKAGE_TI_K3_SOC
+	string
+	default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX
+	default "am62x"  if BR2_PACKAGE_TI_K3_SOC_AM62X
+	default "am64x"  if BR2_PACKAGE_TI_K3_SOC_AM64X
+	default "am65x"  if BR2_PACKAGE_TI_K3_SOC_AM65X
+
+config BR2_PACKAGE_TI_K3_SECTYPE
+	string
+	default "gp"    if BR2_PACKAGE_TI_K3_SECTYPE_GP
+	default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS
+	default "hs"    if BR2_PACKAGE_TI_K3_SECTYPE_HS
+
+config BR2_PACKAGE_TI_K3_DM_SOCNAME
+	string
+	default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX
+	default "am62xx"  if BR2_PACKAGE_TI_K3_SOC_AM62X
+
+endif
diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk
new file mode 100644
index 000000000000..a2da29f5148c
--- /dev/null
+++ b/package/ti-k3/ti-k3.mk
@@ -0,0 +1,7 @@
+################################################################################
+#
+# ti-k3
+#
+################################################################################
+
+include $(sort $(wildcard package/ti-k3/*/*.mk))
-- 
2.43.0

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

[Buildroot] [PATCH v9 14/22] package/ti-k3: disable HS-FS for AM65 SOC

[Dario Binacchi]

It seems that some TI K3 SoC variant doesn't provide all SECTYPE.

For example: AM65 provide only GP or HS, there is no HS-FS.

This can be checked in meta-ti:

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"

So BR2_PACKAGE_TI_K3_SECTYPE_HS_FS must not be selected if
BR2_PACKAGE_TI_K3_SOC_AM65X is used.

Suggested-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

Added in v7

 package/ti-k3/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in
index 2a51b1531487..b8545b7bca62 100644
--- a/package/ti-k3/Config.in
+++ b/package/ti-k3/Config.in
@@ -32,6 +32,7 @@ config BR2_PACKAGE_TI_K3_SECTYPE_GP
 
 config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS
 	bool "hs-fs"
+	depends on !BR2_PACKAGE_TI_K3_SOC_AM65X
 
 config BR2_PACKAGE_TI_K3_SECTYPE_HS
 	bool "hs"
-- 
2.43.0

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

[Buildroot] [PATCH v9 15/22] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin

[Dario Binacchi]

Recent versions of U-Boot are capable of building tiboot3.bin using
Binman. In this case, let's copy it to the binaries directory.

The use of `find' command is justified by the need to use a regex
expression to select the correct file. This is not possible with a
simple `cp' command.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

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/ti-k3-r5-loader.mk | 4 ++++
 1 file changed, 4 insertions(+)

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 fdb058f3b72a..9a05d005067a 100644
--- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
+++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
@@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS)
 endef
 
+TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE))
+TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC))
+
 define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS
 	cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin
+	cd $(@D); find ./ -type f -regex "\.\/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-[^-]*..bin" -exec cp {} $(BINARIES_DIR)/tiboot3.bin \;
 endef
 
 $(eval $(kconfig-package))
-- 
2.43.0

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

[Buildroot] [PATCH v9 16/22] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01

[Dario Binacchi]

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.

Tested on SK-AM62B-P1.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

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 ++++-
 board/ti/am62x-sk/post-build.sh | 54 +++++++++++++++++++++++++++++++++
 board/ti/am62x-sk/post-image.sh |  5 +++
 configs/ti_am62x_sk_defconfig   | 13 ++++----
 4 files changed, 72 insertions(+), 7 deletions(-)
 create mode 100755 board/ti/am62x-sk/post-build.sh
 create mode 100755 board/ti/am62x-sk/post-image.sh

diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg
index 26304fe98f99..398209f4d831 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/post-build.sh b/board/ti/am62x-sk/post-build.sh
new file mode 100755
index 000000000000..4f19f4d6cf91
--- /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/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh
new file mode 100755
index 000000000000..34f732c091ad
--- /dev/null
+++ b/board/ti/am62x-sk/post-image.sh
@@ -0,0 +1,5 @@
+#!/bin/sh -x
+
+BOARD_DIR="$(dirname "$0")"
+
+support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg"
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index 2835404a57df..7d9912024a16 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -1,14 +1,14 @@
 BR2_aarch64=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
 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_PACKAGE_TI_K3=y
@@ -24,20 +24,21 @@ 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_BOOT_FIRMWARE=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_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_DM=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.43.0

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

[Buildroot] [PATCH v9 17/22] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18

[Dario Binacchi]

Tested on SK-AM62B-P1.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

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

 configs/ti_am62x_sk_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index 7d9912024a16..877f88899af9 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -1,11 +1,11 @@
 BR2_aarch64=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
 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.43.0

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

[Buildroot] [PATCH v9 18/22] board/ti/am62x-sk: generalize post-build.sh

[Dario Binacchi]

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>

---

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 4f19f4d6cf91..d066e28fd0d5 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 877f88899af9..bd294bb712ee 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_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18"
-- 
2.43.0

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

[Buildroot] [PATCH v9 19/22] board/ti/am62x-sk: move post-{build, image}.sh to board/ti/common/am6xx

[Dario Binacchi]

The patch makes it clear that the moved scripts can be used by the
am6{2,4}x platforms.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

Added in v8

 board/ti/am62x-sk/post-image.sh                   |  5 -----
 board/ti/{am62x-sk => common/am6xx}/post-build.sh |  0
 board/ti/common/am6xx/post-image.sh               | 11 +++++++++++
 configs/ti_am62x_sk_defconfig                     |  4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)
 delete mode 100755 board/ti/am62x-sk/post-image.sh
 rename board/ti/{am62x-sk => common/am6xx}/post-build.sh (100%)
 create mode 100755 board/ti/common/am6xx/post-image.sh

diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh
deleted file mode 100755
index 34f732c091ad..000000000000
--- a/board/ti/am62x-sk/post-image.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -x
-
-BOARD_DIR="$(dirname "$0")"
-
-support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg"
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/board/ti/common/am6xx/post-image.sh b/board/ti/common/am6xx/post-image.sh
new file mode 100755
index 000000000000..917ca238aa78
--- /dev/null
+++ b/board/ti/common/am6xx/post-image.sh
@@ -0,0 +1,11 @@
+#!/bin/sh -x
+
+board_dir() {
+    if grep -Eq "^BR2_DEFCONFIG=.*/ti_am64x_sk_defconfig\"$" "${BR2_CONFIG}"; then
+        echo "am64x-sk"
+    else
+        echo "am62x-sk"
+    fi
+}
+
+support/scripts/genimage.sh -c "board/ti/$(board_dir)/genimage.cfg"
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index bd294bb712ee..310ba6fb6453 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -1,7 +1,7 @@
 BR2_aarch64=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/common/am6xx/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-- 
2.43.0

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

[Buildroot] [PATCH v9 20/22] configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01

[Dario Binacchi]

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.

Furthermore, ti-k3-r5-loader creates the following tiboot3.bin files:
- GP    -> tiboot3_am64x-gp-evm.bin
- HS    -> tiboot3_am64x_sr2-hs-evm.bin
- HS_FS -> tiboot3_am64x_sr2-hs-fs-evm.bin

The patch also allows you to identify the correct file based on the
SEC_TYPE option.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

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 ++++++-
 configs/ti_am64x_sk_defconfig  | 13 +++++++------
 package/ti-k3/Config.in        |  3 ++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/board/ti/am64x-sk/genimage.cfg b/board/ti/am64x-sk/genimage.cfg
index 26304fe98f99..88dff8fe23dc 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/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index 566cbbe4824f..9b92b645dd21 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -1,14 +1,14 @@
 BR2_aarch64=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/common/am6xx/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am642-sk.dtb -l am64x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
 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_PACKAGE_TI_K3=y
@@ -24,19 +24,20 @@ 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_BOOT_FIRMWARE=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_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_USE_BINMAN=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in
index b8545b7bca62..9c61f8880a15 100644
--- a/package/ti-k3/Config.in
+++ b/package/ti-k3/Config.in
@@ -43,7 +43,8 @@ config BR2_PACKAGE_TI_K3_SOC
 	string
 	default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX
 	default "am62x"  if BR2_PACKAGE_TI_K3_SOC_AM62X
-	default "am64x"  if BR2_PACKAGE_TI_K3_SOC_AM64X
+	default "am64x"  if BR2_PACKAGE_TI_K3_SOC_AM64X && BR2_PACKAGE_TI_K3_SECTYPE_GP
+	default "am64x_sr2"  if BR2_PACKAGE_TI_K3_SOC_AM64X && !BR2_PACKAGE_TI_K3_SECTYPE_GP
 	default "am65x"  if BR2_PACKAGE_TI_K3_SOC_AM65X
 
 config BR2_PACKAGE_TI_K3_SECTYPE
-- 
2.43.0

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

[Buildroot] [PATCH v9 21/22] configs/ti_am64x_sk_defconfig: bump Linux version to 6.6.18

[Dario Binacchi]

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

Added in v8

 configs/ti_am64x_sk_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index 9b92b645dd21..6c1b5d824a7d 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -1,11 +1,11 @@
 BR2_aarch64=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/common/am6xx/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am642-sk.dtb -l am64x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
 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.43.0

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

[Buildroot] [PATCH v9 22/22] boot/ti-k3-image-gen: remove package

[Dario Binacchi]

From: Romain Naour <romain.naour@smile.fr>

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>

---

Changes in v9:
- Fixed conflicts on rebasing on master (Config.in.legacy).

Added in v8

 Config.in.legacy                          |  7 +++
 DEVELOPERS                                |  2 -
 boot/Config.in                            |  1 -
 boot/ti-k3-image-gen/Config.in            | 24 ----------
 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(+), 84 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 1b15d25d6bf1..304f369da7b2 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2024.02"
 
+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 >= 2024.01).
+
 config BR2_PACKAGE_MYSQL
 	bool "mysql virtual package removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 0bfe91f064a9..fb9555915ec1 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -151,7 +151,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
@@ -3219,7 +3218,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 e5fdf7ad439e..87e1b7c00e35 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 a57319f4be6d..000000000000
--- a/boot/ti-k3-image-gen/Config.in
+++ /dev/null
@@ -1,24 +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
-
-config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE
-	string
-	default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62AX
-	default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62X
-	default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X
-	default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X
-
-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 c968c5648f71..000000000000
--- 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 aca29bcf1bd4..000000000000
--- 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_PACKAGE_TI_K3_SOC))
-TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_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.43.0

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

Re: [Buildroot] [PATCH v9 00/22] Add support for AM62x-SK HS-FS devices

[Andreas Dannenberg via buildroot]

Hi Dario, All,

On Mon, Mar 04, 2024 at 04:32:31PM +0100, Dario Binacchi wrote:
> The SK-AM62B-P1 is the newest version of SK-AM62 which includes
> high-security field-securable (HS-FS) silicon to optionally customize keys
> and encryption for security applications.
> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option,
> which, however, was buggy. This series fixes the errors and bumps the Linux
> kernel and U-Boot required for such a new device.
> 
> Furthermore, this version complete the series by updating the
> ti_am64x_sk_defconfig too and remove ti-k3-image-gen, as requested by
> Romain Naour:
> https://patchwork.ozlabs.org/project/buildroot/patch/20240224205654.1546744-17-dario.binacchi@amarulasolutions.com/
> I have successfully executed compilation tests for all possible combinations of platform and security type:
> am62x -> GP, HS, HS-FS
> am64x -> GP, HS, HS-FS

I just applied your v9 series on top of today's master...
bb8766cc54 ("{linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series")
...without any issues, and successfully built SD card mages for the following
platforms:

1) AM62 GP
2) AM62 HS-FS
3) AM64 GP
4) AM64 HS-FS

Then, I burned 4 individual SD cards and also boot-tested on those 4
distinct platforms (all TI SK boards). They all booted without issues,
and in all cases the entire boot log looked clean with no apparent
anomalies.  Systems all seemed to operate as expected.

So for the series:

Tested-by: Andreas Dannenberg <dannenberg@ti.com>



> 
> The AM62x HS-FS configuration has also been tested on the SK-AM62B-P1 board.
> 
> Dario Binacchi (21):
>   configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM
>     setting
>   configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM
>     setting
>   configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader
>     version
>   configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader
>     version
>   boot/ti-k3-r5-loader: bump to version 2024.01
>   package/python-attrs: add host variant
>   package/python-rpds-py: add host variant
>   package/python-referencing: add host variant
>   package/python-jsonschema-specifications: add host variant
>   package/python-jsonschema: add host variant
>   boot/ti-k3-r5-loader: set binman environment
>   boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option
>   package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope
>   package/ti-k3: disable HS-FS for AM65 SOC
>   boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin
>   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,image}.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 (1):
>   boot/ti-k3-image-gen: remove package
> 
>  Config.in.legacy                              |  7 ++
>  DEVELOPERS                                    |  2 -
>  board/ti/am62x-sk/genimage.cfg                |  7 +-
>  board/ti/am64x-sk/genimage.cfg                |  7 +-
>  board/ti/common/am6xx/post-build.sh           | 58 ++++++++++++++
>  board/ti/common/am6xx/post-image.sh           | 11 +++
>  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                |  5 +-
>  boot/ti-k3-r5-loader/ti-k3-r5-loader.hash     |  2 +-
>  boot/ti-k3-r5-loader/ti-k3-r5-loader.mk       | 12 ++-
>  boot/uboot/Config.in                          | 23 +++---
>  boot/uboot/uboot.mk                           | 12 ++-
>  configs/ti_am62x_sk_defconfig                 | 22 +++---
>  configs/ti_am64x_sk_defconfig                 | 22 +++---
>  package/Config.in                             |  1 +
>  package/python-attrs/python-attrs.mk          |  6 ++
>  .../python-jsonschema-specifications.mk       | 10 +++
>  .../python-jsonschema/python-jsonschema.mk    | 14 ++++
>  .../python-referencing/python-referencing.mk  | 11 +++
>  package/python-rpds-py/python-rpds-py.mk      |  1 +
>  package/ti-k3/Config.in                       | 61 +++++++++++++++
>  package/ti-k3/ti-k3.mk                        |  7 ++
>  25 files changed, 263 insertions(+), 173 deletions(-)
>  create mode 100755 board/ti/common/am6xx/post-build.sh
>  create mode 100755 board/ti/common/am6xx/post-image.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
>  create mode 100644 package/ti-k3/Config.in
>  create mode 100644 package/ti-k3/ti-k3.mk
> 
> -- 
> 2.43.0
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 19/22] board/ti/am62x-sk: move post-{build, image}.sh to board/ti/common/am6xx

[Romain Naour]

Hello Dario,

Le 04/03/2024 à 16:32, Dario Binacchi a écrit :
> The patch makes it clear that the moved scripts can be used by the
> am6{2,4}x platforms.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> 
> ---
> 
> Added in v8
> 
>  board/ti/am62x-sk/post-image.sh                   |  5 -----
>  board/ti/{am62x-sk => common/am6xx}/post-build.sh |  0
>  board/ti/common/am6xx/post-image.sh               | 11 +++++++++++
>  configs/ti_am62x_sk_defconfig                     |  4 ++--
>  4 files changed, 13 insertions(+), 7 deletions(-)
>  delete mode 100755 board/ti/am62x-sk/post-image.sh
>  rename board/ti/{am62x-sk => common/am6xx}/post-build.sh (100%)
>  create mode 100755 board/ti/common/am6xx/post-image.sh
> 
> diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh
> deleted file mode 100755
> index 34f732c091ad..000000000000
> --- a/board/ti/am62x-sk/post-image.sh
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -#!/bin/sh -x
> -
> -BOARD_DIR="$(dirname "$0")"
> -
> -support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg"
> 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/board/ti/common/am6xx/post-image.sh b/board/ti/common/am6xx/post-image.sh
> new file mode 100755
> index 000000000000..917ca238aa78
> --- /dev/null
> +++ b/board/ti/common/am6xx/post-image.sh
> @@ -0,0 +1,11 @@
> +#!/bin/sh -x
> +
> +board_dir() {
> +    if grep -Eq "^BR2_DEFCONFIG=.*/ti_am64x_sk_defconfig\"$" "${BR2_CONFIG}"; then
> +        echo "am64x-sk"
> +    else
> +        echo "am62x-sk"

What if we add a new board based on am62 SoC like the beagleplay [1] ?

I believe it's fine to have tiny post-image.sh script in each board directory
instead of generic script that is aware of boards names (actually board
directory name in Buildroot).

[1] https://www.beagleboard.org/boards/beagleplay

Best regards,
Romain


> +    fi
> +}
> +
> +support/scripts/genimage.sh -c "board/ti/$(board_dir)/genimage.cfg"
> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
> index bd294bb712ee..310ba6fb6453 100644
> --- a/configs/ti_am62x_sk_defconfig
> +++ b/configs/ti_am62x_sk_defconfig
> @@ -1,7 +1,7 @@
>  BR2_aarch64=y
>  BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
> -BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
> -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh"
> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh"
> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/common/am6xx/post-image.sh"
>  BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_VERSION=y

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

Re: [Buildroot] [PATCH v9 22/22] boot/ti-k3-image-gen: remove package

[Romain Naour]

Hello Dario,

Le 04/03/2024 à 16:32, Dario Binacchi a écrit :
> From: Romain Naour <romain.naour@smile.fr>
> 
> 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.

The AM65 support is still broken since we need to copy sysfw*.itb binary that
was provided by ti-k3-image-gen.

Best regards,
Romain


> 
> [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>
> 
> ---
> 
> Changes in v9:
> - Fixed conflicts on rebasing on master (Config.in.legacy).
> 
> Added in v8
> 
>  Config.in.legacy                          |  7 +++
>  DEVELOPERS                                |  2 -
>  boot/Config.in                            |  1 -
>  boot/ti-k3-image-gen/Config.in            | 24 ----------
>  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(+), 84 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 1b15d25d6bf1..304f369da7b2 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>  
>  comment "Legacy options removed in 2024.02"
>  
> +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 >= 2024.01).
> +
>  config BR2_PACKAGE_MYSQL
>  	bool "mysql virtual package removed"
>  	select BR2_LEGACY
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 0bfe91f064a9..fb9555915ec1 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -151,7 +151,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
> @@ -3219,7 +3218,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 e5fdf7ad439e..87e1b7c00e35 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 a57319f4be6d..000000000000
> --- a/boot/ti-k3-image-gen/Config.in
> +++ /dev/null
> @@ -1,24 +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
> -
> -config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE
> -	string
> -	default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62AX
> -	default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62X
> -	default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X
> -	default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X
> -
> -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 c968c5648f71..000000000000
> --- 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 aca29bcf1bd4..000000000000
> --- 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_PACKAGE_TI_K3_SOC))
> -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_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))

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

Re: [Buildroot] [PATCH v9 22/22] boot/ti-k3-image-gen: remove package

[Michael Nazzareno Trimarchi]

Hi Romain

On Wed, Mar 13, 2024 at 12:00 PM Romain Naour <romain.naour@smile.fr> wrote:
>
> Hello Dario,
>
> Le 04/03/2024 à 16:32, Dario Binacchi a écrit :
> > From: Romain Naour <romain.naour@smile.fr>
> >
> > 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.
>
> The AM65 support is still broken since we need to copy sysfw*.itb binary that
> was provided by ti-k3-image-gen.
>

We are working to have all the other platforms supported on this pull
request. According to comments
they are working for all of us, including me with a different am62x board

Michael


> Best regards,
> Romain
>
>
> >
> > [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>
> >
> > ---
> >
> > Changes in v9:
> > - Fixed conflicts on rebasing on master (Config.in.legacy).
> >
> > Added in v8
> >
> >  Config.in.legacy                          |  7 +++
> >  DEVELOPERS                                |  2 -
> >  boot/Config.in                            |  1 -
> >  boot/ti-k3-image-gen/Config.in            | 24 ----------
> >  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(+), 84 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 1b15d25d6bf1..304f369da7b2 100644
> > --- a/Config.in.legacy
> > +++ b/Config.in.legacy
> > @@ -146,6 +146,13 @@ endif
> >
> >  comment "Legacy options removed in 2024.02"
> >
> > +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 >= 2024.01).
> > +
> >  config BR2_PACKAGE_MYSQL
> >       bool "mysql virtual package removed"
> >       select BR2_LEGACY
> > diff --git a/DEVELOPERS b/DEVELOPERS
> > index 0bfe91f064a9..fb9555915ec1 100644
> > --- a/DEVELOPERS
> > +++ b/DEVELOPERS
> > @@ -151,7 +151,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
> > @@ -3219,7 +3218,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 e5fdf7ad439e..87e1b7c00e35 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 a57319f4be6d..000000000000
> > --- a/boot/ti-k3-image-gen/Config.in
> > +++ /dev/null
> > @@ -1,24 +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
> > -
> > -config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE
> > -     string
> > -     default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62AX
> > -     default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62X
> > -     default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X
> > -     default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X
> > -
> > -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 c968c5648f71..000000000000
> > --- 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 aca29bcf1bd4..000000000000
> > --- 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_PACKAGE_TI_K3_SOC))
> > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_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))
>


-- 
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
michael@amarulasolutions.com
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
info@amarulasolutions.com
www.amarulasolutions.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 19/22] board/ti/am62x-sk: move post-{build, image}.sh to board/ti/common/am6xx

[Michael Nazzareno Trimarchi]

Hi Romain

On Wed, Mar 13, 2024 at 11:56 AM Romain Naour <romain.naour@smile.fr> wrote:
>
> Hello Dario,
>
> Le 04/03/2024 à 16:32, Dario Binacchi a écrit :
> > The patch makes it clear that the moved scripts can be used by the
> > am6{2,4}x platforms.
> >
> > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> >
> > ---
> >
> > Added in v8
> >
> >  board/ti/am62x-sk/post-image.sh                   |  5 -----
> >  board/ti/{am62x-sk => common/am6xx}/post-build.sh |  0
> >  board/ti/common/am6xx/post-image.sh               | 11 +++++++++++
> >  configs/ti_am62x_sk_defconfig                     |  4 ++--
> >  4 files changed, 13 insertions(+), 7 deletions(-)
> >  delete mode 100755 board/ti/am62x-sk/post-image.sh
> >  rename board/ti/{am62x-sk => common/am6xx}/post-build.sh (100%)
> >  create mode 100755 board/ti/common/am6xx/post-image.sh
> >
> > diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh
> > deleted file mode 100755
> > index 34f732c091ad..000000000000
> > --- a/board/ti/am62x-sk/post-image.sh
> > +++ /dev/null
> > @@ -1,5 +0,0 @@
> > -#!/bin/sh -x
> > -
> > -BOARD_DIR="$(dirname "$0")"
> > -
> > -support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg"
> > 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/board/ti/common/am6xx/post-image.sh b/board/ti/common/am6xx/post-image.sh
> > new file mode 100755
> > index 000000000000..917ca238aa78
> > --- /dev/null
> > +++ b/board/ti/common/am6xx/post-image.sh
> > @@ -0,0 +1,11 @@
> > +#!/bin/sh -x
> > +
> > +board_dir() {
> > +    if grep -Eq "^BR2_DEFCONFIG=.*/ti_am64x_sk_defconfig\"$" "${BR2_CONFIG}"; then
> > +        echo "am64x-sk"
> > +    else
> > +        echo "am62x-sk"
>
> What if we add a new board based on am62 SoC like the beagleplay [1] ?
>
> I believe it's fine to have tiny post-image.sh script in each board directory
> instead of generic script that is aware of boards names (actually board
> directory name in Buildroot).
>

This is TI common, other vendor can have their own script. Why all the
boards thould keep from there?

Michael

> [1] https://www.beagleboard.org/boards/beagleplay
>
> Best regards,
> Romain
>
>
> > +    fi
> > +}
> > +
> > +support/scripts/genimage.sh -c "board/ti/$(board_dir)/genimage.cfg"
> > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
> > index bd294bb712ee..310ba6fb6453 100644
> > --- a/configs/ti_am62x_sk_defconfig
> > +++ b/configs/ti_am62x_sk_defconfig
> > @@ -1,7 +1,7 @@
> >  BR2_aarch64=y
> >  BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
> > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
> > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh"
> > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh"
> > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/common/am6xx/post-image.sh"
> >  BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
> >  BR2_LINUX_KERNEL=y
> >  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
>


-- 
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
michael@amarulasolutions.com
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
info@amarulasolutions.com
www.amarulasolutions.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 22/22] boot/ti-k3-image-gen: remove package

[Michael Nazzareno Trimarchi]

Hi Romain and all

On Mon, Mar 4, 2024 at 4:34 PM Dario Binacchi
<dario.binacchi@amarulasolutions.com> wrote:
>
> From: Romain Naour <romain.naour@smile.fr>
>
> 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>
>
> ---
>
> Changes in v9:
> - Fixed conflicts on rebasing on master (Config.in.legacy).
>
> Added in v8
>
>  Config.in.legacy                          |  7 +++
>  DEVELOPERS                                |  2 -
>  boot/Config.in                            |  1 -
>  boot/ti-k3-image-gen/Config.in            | 24 ----------
>  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(+), 84 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 1b15d25d6bf1..304f369da7b2 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
>  comment "Legacy options removed in 2024.02"
>
> +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 >= 2024.01).
> +
>  config BR2_PACKAGE_MYSQL
>         bool "mysql virtual package removed"
>         select BR2_LEGACY
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 0bfe91f064a9..fb9555915ec1 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -151,7 +151,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
> @@ -3219,7 +3218,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 e5fdf7ad439e..87e1b7c00e35 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 a57319f4be6d..000000000000
> --- a/boot/ti-k3-image-gen/Config.in
> +++ /dev/null
> @@ -1,24 +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
> -
> -config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE
> -       string
> -       default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62AX
> -       default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62X
> -       default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X
> -       default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X
> -
> -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 c968c5648f71..000000000000
> --- 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 aca29bcf1bd4..000000000000
> --- 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_PACKAGE_TI_K3_SOC))
> -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_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.43.0
>
>

Tested-by: Michael Trimarchi <michael@amarulasolutions.com>

We are fine with V9.

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

Re: [Buildroot] [PATCH v9 15/22] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin

[Bryan Brattlof via buildroot]

On March  4, 2024 thus sayeth Dario Binacchi:
> Recent versions of U-Boot are capable of building tiboot3.bin using
> Binman. In this case, let's copy it to the binaries directory.
> 
> The use of `find' command is justified by the need to use a regex
> expression to select the correct file. This is not possible with a
> simple `cp' command.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> 
> ---
> 
> 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/ti-k3-r5-loader.mk | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> 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 fdb058f3b72a..9a05d005067a 100644
> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS
>  	$(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS)
>  endef
>  
> +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE))
> +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC))
> +
>  define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS
>  	cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin
> +	cd $(@D); find ./ -type f -regex "\.\/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-[^-]*..bin" -exec cp {} $(BINARIES_DIR)/tiboot3.bin \;
>  endef

Some devices like the j721e and am65x family will need the sysfw-*.itb 
copied over to boot. Thankfully binman will generate these automatically 
depending on the defconfig we gave to U-Boot.

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

Re: [Buildroot] [PATCH v9 11/22] boot/ti-k3-r5-loader: set binman environment

[Bryan Brattlof via buildroot]

Hi Dario,

On March  4, 2024 thus sayeth Dario Binacchi:
> 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.
> 
> The patch set the BINMAN_INDIRS environment variable to provide the
> directory to search for binary blobs and select the packages required by
> binman.
> 
> 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>
> 
> ---
> 

...

> 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 0ffcb8235f2e..fdb058f3b72a 100644
> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \
>  	host-pkgconf \
>  	$(BR2_MAKE_HOST_DEPENDENCY) \
>  	host-arm-gnu-toolchain \
> -	host-openssl
> +	host-openssl \
> +	host-python-jsonschema \
> +	host-python-pyyaml \
> +	host-python3 \
> +	host-python-setuptools \
> +	host-python-pylibfdt

Just a question on how boot dependencies are resolved. Do we need to add 
ti-k3-boot-firmware to this list? How does ti-k3-r5-loader know to 
'build' the firmware before we build tiboot3.bin?

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

Re: [Buildroot] [PATCH v9 01/22] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting

[Yann E. MORIN]

Dario, All,

On 2024-03-04 16:32 +0100, Dario Binacchi spake thusly:
> Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g.
> j721e) because the optee flavor is missing.
> 
> We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and
> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am62x but we actually can use
> BR2_TARGET_OPTEE_OS_PLATFORM=k3-am62x as explained in the optee-os
> Makefile [1]:
> 
>   # If $(PLATFORM) is defined and contains a hyphen, parse it as
>   # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience
> 
> This is how meta-ti set the optee-os platform:
> 
>   meta-ti]$ git grep OPTEEMACHINE
>   meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx"
>   meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx"
>   meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x"
>   meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx"
>   meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x"
>   meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x"
>   meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x"
>   meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x"
>   meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x"
>   meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e"
>   meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e"
>   meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4"
>   meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x"
>   meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4"
> 
>   meta-ti uses the OPTEEMACHINE to set optee-os platform [2].
> 
> [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37
> [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23
> 
> Suggested-by: Romain Naour <romain.naour@smile.fr>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> 
> Changes in v6:
> - Update commit message
> 
> Changes in v5
> - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option
> 
> Added in v4
> 
>  configs/ti_am62x_sk_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
> index f88252a89c68..c3ad555a8184 100644
> --- a/configs/ti_am62x_sk_defconfig
> +++ b/configs/ti_am62x_sk_defconfig
> @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3"
>  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"
> +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
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 02/22] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting

[Yann E. MORIN]

Dario, All,

On 2024-03-04 16:32 +0100, Dario Binacchi spake thusly:
> Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g.
> j721e) because the optee flavor is missing.
> 
> We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and
> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am64x but we actually can use
> BR2_TARGET_OPTEE_OS_PLATFORM=k3-am64x as explained in the optee-os
> Makefile [1]:
> 
>   # If $(PLATFORM) is defined and contains a hyphen, parse it as
>   # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience
> 
> This is how meta-ti set the optee-os platform:
> 
>   meta-ti]$ git grep OPTEEMACHINE
>   meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx"
>   meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx"
>   meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x"
>   meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx"
>   meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x"
>   meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x"
>   meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x"
>   meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x"
>   meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x"
>   meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e"
>   meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e"
>   meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4"
>   meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x"
>   meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4"
> 
>   meta-ti uses the OPTEEMACHINE to set optee-os platform [2].
> 
> [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37
> [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23
> 
> Suggested-by: Romain Naour <romain.naour@smile.fr>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> 
> Changes in v6:
> - Update commit message
> 
> Changes in v5:
> - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option
> 
> Added in v4
> 
>  configs/ti_am64x_sk_defconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
> index 4bfd31f0c8d3..097175bd8f39 100644
> --- a/configs/ti_am64x_sk_defconfig
> +++ b/configs/ti_am64x_sk_defconfig
> @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3"
>  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"
> +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
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 03/22] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version

[Yann E. MORIN]

Dario, All,

On 2024-03-04 16:32 +0100, Dario Binacchi spake thusly:
> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to
> specify the ti-k3-r5-loader, so do that now.
> 
> When the defconfig was added, the default version was 2022.10, so use it.

Yes, that's a good change, so: applied to master, thanks.

However, this opens a little issue with hash checking. I'll address that
in the review of path 5, which does actually bump the version.

Regards,
Yann E. MORIN.

> Suggested-by: Romain Naour <romain.naour@smile.fr>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> 
> ---
> 
> no changes since v4
> 
> Added in v4
> 
>  configs/ti_am62x_sk_defconfig | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
> index c3ad555a8184..a129e216d25b 100644
> --- a/configs/ti_am62x_sk_defconfig
> +++ b/configs/ti_am62x_sk_defconfig
> @@ -25,6 +25,8 @@ 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_BOARD_DEFCONFIG="am62x_evm_r5"
>  BR2_TARGET_UBOOT=y
>  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 04/22] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version

[Yann E. MORIN]

Dario, All,

On 2024-03-04 16:32 +0100, Dario Binacchi spake thusly:
> Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to
> specify the ti-k3-r5-loader, so do that now.
> 
> When the defconfig was added, the default version was 2022.10, so use it.
> 
> Suggested-by: Romain Naour <romain.naour@smile.fr>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

Applied to master, thanks.

(and ditto the hash check issue as for the am62x...)

Regards,
Yann E. MORIN.

> ---
> 
> no changes since v4
> 
> Added in v4
> 
>  configs/ti_am64x_sk_defconfig | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
> index 097175bd8f39..26195194c7d6 100644
> --- a/configs/ti_am64x_sk_defconfig
> +++ b/configs/ti_am64x_sk_defconfig
> @@ -25,6 +25,8 @@ 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_BOARD_DEFCONFIG="am64x_evm_r5"
>  BR2_TARGET_UBOOT=y
>  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 05/22] boot/ti-k3-r5-loader: bump to version 2024.01

[Yann E. MORIN]

Dario, All,

On 2024-03-04 16:32 +0100, Dario Binacchi spake thusly:
> All in-tree configs with the ti-k3-r5 bootloader use a custom version,
> so this patch is mostly for the menuconfig default version
> 
> Suggested-by: Romain Naour <romain.naour@smile.fr>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
[--SNIP--]
> 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 c5d1cb8e09f0..fbe5d215409d 100644
> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
> @@ -1,3 +1,3 @@
>  # Locally computed:
> -sha256  50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8  u-boot-2022.10.tar.bz2

Removing this hash means that defconfigs that still reference the
2022.10 version, no longer have a hash to validate the download against,
which make it susceptible to CVE-2023-43608 [0] [1].

That was already the case for the two ti-am6?x defconfig in the the two
previous patches, as they already used a custom kernel, a custm ATF, a
custom u-boot: the hashes can't be checked for those versions, so the
two ti am?x defconfigs already hit CVE-2023-43608.

We already fixed another defconfig for a similar issue, see commit
9ebbfeff387 (configs/rock5b: add hash for custom kernel).

Could you look into doing the same for those to TI am6?x defconfig,
please?

In the meantime, I kept the hash for 2022.10 for ti-k3-r5-loader
(really, for uboot), to abvoid the issue at least for ti-k3-r5-loader.

Speaking of that, by the way, ti-k3-r5-loader really is uboot, so I
think that it should share:

 1. the same DL_DIR:   TI_K3_R5_LOADER_DL_SUBDIR = uboot

 2. the same hash file:  have ti-k3-r5-loader.hash be a symlink to
    uboot.hash  (and have a xomment at the top of that hash file that it
    is shared and that old hashes should/can be kept)

Do you think that makes sense? If so, would you like to look into it?

[0] https://cve.mitre.org/cgi-bin/cvename.cgi?name=2023-43608
[1] https://talosintelligence.com/vulnerability_reports/TALOS-2023-1844

Regards,
Yann E. MORIN.

> +sha256  b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3  u-boot-2024.01.tar.bz2
>  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 00/22] Add support for AM62x-SK HS-FS devices

[Yann E. MORIN]

Dario, All,

On 2024-03-04 16:32 +0100, Dario Binacchi spake thusly:
>   package/python-attrs: add host variant
>   package/python-rpds-py: add host variant
>   package/python-referencing: add host variant
>   package/python-jsonschema-specifications: add host variant
>   package/python-jsonschema: add host variant

Those 5 patches, applied to master, thanks.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 05/22] boot/ti-k3-r5-loader: bump to version 2024.01

[Andreas Dannenberg via buildroot]

Hi Yann,

On Tue, Mar 19, 2024 at 11:09:32PM +0100, Yann E. MORIN wrote:
> Dario, All,
> 
> On 2024-03-04 16:32 +0100, Dario Binacchi spake thusly:
> > All in-tree configs with the ti-k3-r5 bootloader use a custom version,
> > so this patch is mostly for the menuconfig default version
> > 
> > Suggested-by: Romain Naour <romain.naour@smile.fr>
> > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> [--SNIP--]
> > 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 c5d1cb8e09f0..fbe5d215409d 100644
> > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
> > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
> > @@ -1,3 +1,3 @@
> >  # Locally computed:
> > -sha256  50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8  u-boot-2022.10.tar.bz2
> 
> Removing this hash means that defconfigs that still reference the
> 2022.10 version, no longer have a hash to validate the download against,
> which make it susceptible to CVE-2023-43608 [0] [1].
> 
> That was already the case for the two ti-am6?x defconfig in the the two
> previous patches, as they already used a custom kernel, a custm ATF, a
> custom u-boot: the hashes can't be checked for those versions, so the
> two ti am?x defconfigs already hit CVE-2023-43608.
> 
> We already fixed another defconfig for a similar issue, see commit
> 9ebbfeff387 (configs/rock5b: add hash for custom kernel).
> 
> Could you look into doing the same for those to TI am6?x defconfig,
> please?
> 
> In the meantime, I kept the hash for 2022.10 for ti-k3-r5-loader
> (really, for uboot), to abvoid the issue at least for ti-k3-r5-loader.
> 
> Speaking of that, by the way, ti-k3-r5-loader really is uboot, so I
> think that it should share:
> 
>  1. the same DL_DIR:   TI_K3_R5_LOADER_DL_SUBDIR = uboot
> 
>  2. the same hash file:  have ti-k3-r5-loader.hash be a symlink to
>     uboot.hash  (and have a xomment at the top of that hash file that it
>     is shared and that old hashes should/can be kept)
>

The entire boot chain for TI K3 devices (like all of AM62x) comprising
what's known as ti-k3-r5-loaer in Buildroot as well as U-Boot SPL/U-Boot
[proper] should _always_ be built from the same U-Boot source commit, as
this is how it's developed, tested, and used by pretty much everybody.
So your suggestion to more closely tie those things together makes a lot
of sense IMHO.

--
Andreas Dannenberg
Texas Instruments Inc



> Do you think that makes sense? If so, would you like to look into it?
> 
> [0] https://cve.mitre.org/cgi-bin/cvename.cgi?name=2023-43608
> [1] https://talosintelligence.com/vulnerability_reports/TALOS-2023-1844
> 
> Regards,
> Yann E. MORIN.
> 
> > +sha256  b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3  u-boot-2024.01.tar.bz2
> >  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
> > -- 
> > 2.43.0
> > 
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
> 
> -- 
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 05/22] boot/ti-k3-r5-loader: bump to version 2024.01

[Yann E. MORIN]

Andreas, All,

On 2024-03-19 21:18 -0500, Andreas Dannenberg via buildroot spake thusly:
> On Tue, Mar 19, 2024 at 11:09:32PM +0100, Yann E. MORIN wrote:
> > On 2024-03-04 16:32 +0100, Dario Binacchi spake thusly:
> > > All in-tree configs with the ti-k3-r5 bootloader use a custom version,
> > > so this patch is mostly for the menuconfig default version
[--SNIP--]
> > Speaking of that, by the way, ti-k3-r5-loader really is uboot, so I
> > think that it should share:
> >  1. the same DL_DIR:   TI_K3_R5_LOADER_DL_SUBDIR = uboot
> >  2. the same hash file:  have ti-k3-r5-loader.hash be a symlink to
> >     uboot.hash  (and have a xomment at the top of that hash file that it
> >     is shared and that old hashes should/can be kept)
> The entire boot chain for TI K3 devices (like all of AM62x) comprising
> what's known as ti-k3-r5-loaer in Buildroot as well as U-Boot SPL/U-Boot
> [proper] should _always_ be built from the same U-Boot source commit, as
> this is how it's developed, tested, and used by pretty much everybody.
> So your suggestion to more closely tie those things together makes a lot
> of sense IMHO.

Ah, interesting, thanks for the feedback.

So, it looks like for the situation for ti-k3-r5-loaer vs. U-Boot is
very similar to the one for barebox: it can build a "base" barebox, and
an "aux" barebox; they both share the same implementation (the
barebox-package mini-infra), they each provide their own (def|.)config
file, and they each have their own set of (Buildroot) options (the aux
one has fewer options).

So it looks like this is what we should have done for ti-k3-r5-loaer,
no?

Also, does it make sense to use ti-k3-r5-loaer without U-Boot?

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 05/22] boot/ti-k3-r5-loader: bump to version 2024.01

[Andreas Dannenberg via buildroot]

Hi Yann,

On Wed, Mar 20, 2024 at 07:14:06AM +0100, Yann E. MORIN wrote:
> Andreas, All,
> 
> On 2024-03-19 21:18 -0500, Andreas Dannenberg via buildroot spake thusly:
> > On Tue, Mar 19, 2024 at 11:09:32PM +0100, Yann E. MORIN wrote:
> > > On 2024-03-04 16:32 +0100, Dario Binacchi spake thusly:
> > > > All in-tree configs with the ti-k3-r5 bootloader use a custom version,
> > > > so this patch is mostly for the menuconfig default version
> [--SNIP--]
> > > Speaking of that, by the way, ti-k3-r5-loader really is uboot, so I
> > > think that it should share:
> > >  1. the same DL_DIR:   TI_K3_R5_LOADER_DL_SUBDIR = uboot
> > >  2. the same hash file:  have ti-k3-r5-loader.hash be a symlink to
> > >     uboot.hash  (and have a xomment at the top of that hash file that it
> > >     is shared and that old hashes should/can be kept)
> > The entire boot chain for TI K3 devices (like all of AM62x) comprising
> > what's known as ti-k3-r5-loaer in Buildroot as well as U-Boot SPL/U-Boot
> > [proper] should _always_ be built from the same U-Boot source commit, as
> > this is how it's developed, tested, and used by pretty much everybody.
> > So your suggestion to more closely tie those things together makes a lot
> > of sense IMHO.
> 
> Ah, interesting, thanks for the feedback.
> 
> So, it looks like for the situation for ti-k3-r5-loaer vs. U-Boot is
> very similar to the one for barebox: it can build a "base" barebox, and
> an "aux" barebox; they both share the same implementation (the
> barebox-package mini-infra), they each provide their own (def|.)config
> file, and they each have their own set of (Buildroot) options (the aux
> one has fewer options).
> 
> So it looks like this is what we should have done for ti-k3-r5-loaer,
> no?

I'm not familiar with barebox but what you are describing looks similar.
Note that ti-k3-r5-loader (building the initial boot binary) is building
for 32-bit ARMv7, and the next boot stages (U-Boot SPL, U-Boot) are all
64-bit ARMv8, so this might complicate any possible unification efforts.
 
> Also, does it make sense to use ti-k3-r5-loaer without U-Boot?

Yes, you could do "Falcon Boot" where the ti-k3-r5-loader would directly
load the Linux kernel, greatly simplifing the boot flow and booting much
MUCH faster. Actually it's a much-requested feature from our customers
(you know, the real world use cases :) so I wrote a technical note [1]
about that last year on how to set this up manually but it would be
great if we could bring this into Buildroot as a package/option somehow
at some point, after we get the base support accepted into the tree.

[1]
https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1205638/faq-am625-how-to-boot-from-r5-u-boot-spl-directly-into-the-linux-kernel-skipping-a53-spl-and-a53-u-boot-falcon-mode


--
Andreas Dannenberg
Texas Instruments Inc




> 
> Regards,
> Yann E. MORIN.
> 
> -- 
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 15/22] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin

[Andreas Dannenberg via buildroot]

Hi Bryan,

On Tue, Mar 19, 2024 at 10:11:24AM -0500, Bryan Brattlof wrote:
> On March  4, 2024 thus sayeth Dario Binacchi:
> > Recent versions of U-Boot are capable of building tiboot3.bin using
> > Binman. In this case, let's copy it to the binaries directory.
> > 
> > The use of `find' command is justified by the need to use a regex
> > expression to select the correct file. This is not possible with a
> > simple `cp' command.
> > 
> > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> > 
> > ---
> > 
> > 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/ti-k3-r5-loader.mk | 4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > 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 fdb058f3b72a..9a05d005067a 100644
> > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> > @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS
> >  	$(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS)
> >  endef
> >  
> > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE))
> > +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC))
> > +
> >  define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS
> >  	cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin
> > +	cd $(@D); find ./ -type f -regex "\.\/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-[^-]*..bin" -exec cp {} $(BINARIES_DIR)/tiboot3.bin \;
> >  endef
> 
> Some devices like the j721e and am65x family will need the sysfw-*.itb 
> copied over to boot. Thankfully binman will generate these automatically 
> depending on the defconfig we gave to U-Boot.

This was discussed before, actually I signed myself up to add AM65x
support once we have base support in with this series fully merged. At
that time I'd take care of the copy step. Dario doesn't have a way to
test on hardware, and at some point we need to limit the scope if this
series here.

--
Andreas Dannenberg
Texas Instruments Inc






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

Re: [Buildroot] [PATCH v9 05/22] boot/ti-k3-r5-loader: bump to version 2024.01

[Dario Binacchi]

Hi Yann,

On Tue, Mar 19, 2024 at 11:09 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Dario, All,
>
> On 2024-03-04 16:32 +0100, Dario Binacchi spake thusly:
> > All in-tree configs with the ti-k3-r5 bootloader use a custom version,
> > so this patch is mostly for the menuconfig default version
> >
> > Suggested-by: Romain Naour <romain.naour@smile.fr>
> > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> [--SNIP--]
> > 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 c5d1cb8e09f0..fbe5d215409d 100644
> > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
> > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
> > @@ -1,3 +1,3 @@
> >  # Locally computed:
> > -sha256  50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8  u-boot-2022.10.tar.bz2
>
> Removing this hash means that defconfigs that still reference the
> 2022.10 version, no longer have a hash to validate the download against,
> which make it susceptible to CVE-2023-43608 [0] [1].
>
> That was already the case for the two ti-am6?x defconfig in the the two
> previous patches, as they already used a custom kernel, a custm ATF, a
> custom u-boot: the hashes can't be checked for those versions, so the
> two ti am?x defconfigs already hit CVE-2023-43608.
>
> We already fixed another defconfig for a similar issue, see commit
> 9ebbfeff387 (configs/rock5b: add hash for custom kernel).
>
> Could you look into doing the same for those to TI am6?x defconfig,
> please?

Thanks for the info.
Yes I will add a patch for this point in version 10 of the series.

>
> In the meantime, I kept the hash for 2022.10 for ti-k3-r5-loader
> (really, for uboot), to abvoid the issue at least for ti-k3-r5-loader.
>
> Speaking of that, by the way, ti-k3-r5-loader really is uboot, so I
> think that it should share:
>
>  1. the same DL_DIR:   TI_K3_R5_LOADER_DL_SUBDIR = uboot
>
>  2. the same hash file:  have ti-k3-r5-loader.hash be a symlink to
>     uboot.hash  (and have a xomment at the top of that hash file that it
>     is shared and that old hashes should/can be kept)
>
> Do you think that makes sense? If so, would you like to look into it?

I think like you that where possible it is better not to replicate code.
This series has been ongoing since November 2023, started to fix the
compilation for the HS_FS device for the ti_am62x_sk_defconfig configuration.
During the review process, it has added additional patches
(ti_am64x_sk_defconfig,
and removal of the ti-k3-image-gen package) which still today have not
allowed the
series to be merged and therefore to fix the issue.
So, I would prefer to address this aspect in a separate series from
this one in order
not to further slow it down.
Do you agree?

Thanks and regards,
Dario
>
> [0] https://cve.mitre.org/cgi-bin/cvename.cgi?name=2023-43608
> [1] https://talosintelligence.com/vulnerability_reports/TALOS-2023-1844
>
> Regards,
> Yann E. MORIN.
>
> > +sha256  b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3  u-boot-2024.01.tar.bz2
> >  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
> > --
> > 2.43.0
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'



-- 

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

Re: [Buildroot] [PATCH v9 22/22] boot/ti-k3-image-gen: remove package

[Dario Binacchi]

Hi Romain,

On Wed, Mar 13, 2024 at 12:00 PM Romain Naour <romain.naour@smile.fr> wrote:
>
> Hello Dario,
>
> Le 04/03/2024 à 16:32, Dario Binacchi a écrit :
> > From: Romain Naour <romain.naour@smile.fr>
> >
> > 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.
>
> The AM65 support is still broken since we need to copy sysfw*.itb binary that
> was provided by ti-k3-image-gen.

Could you kindly indicate the Buildroot configuration for am65 that
you are referring to regarding the issue you are indicating?
It seems to me that the configurations of interest, and therefore
those that have been tested, are ti_am62x_sk_defconfig and
ti_am64x_sk_defconfig.

Here https://lore.kernel.org/all/96a71705-dceb-4417-9edd-1f962edd66f4@smile.fr/,
you also mention BeaglePlay.
Is there a BeaglePlay configuration in Buildroot?

In version 6 you wrote to me that except for "minor improvement, this
series is ok for me" and that "I'm planning on testing
the entire series here pretty soon and will provide feedback":

https://lore.kernel.org/all/383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr/
https://lore.kernel.org/all/28040f8a-c68e-4966-9e81-804f723f2100@smile.fr/#t

I am currently running tests for version 10 since Yann E. Morin has
highlighted an aspect that I believe should be addressed
by this series:
https://lore.kernel.org/all/ZfoNHD-DlqkkYCRh@landeda/

As already written on several occasions and also shared by Andreas
Dannenberg and Michael Trimarchi, it is necessary to
conclude and merge this series as soon as possible to fix the
compilation error for the HS_FS device of the ti_am62x_sk_defconfig
configuration, an error reported since November 2023, and from there,
proceed with the many developments that the new platform
requires. My tests, like those of Andreas Dannenberg, Alexander
Sverdlin and Michael Trimarchi, have all yielded positive results.
Have your tests perhaps revealed any regressions?

Please let me know and help me understand what still isn't working in
this series.

Thanks and regards,
Dario

>
> Best regards,
> Romain
>
>
> >
> > [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>
> >
> > ---
> >
> > Changes in v9:
> > - Fixed conflicts on rebasing on master (Config.in.legacy).
> >
> > Added in v8
> >
> >  Config.in.legacy                          |  7 +++
> >  DEVELOPERS                                |  2 -
> >  boot/Config.in                            |  1 -
> >  boot/ti-k3-image-gen/Config.in            | 24 ----------
> >  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(+), 84 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 1b15d25d6bf1..304f369da7b2 100644
> > --- a/Config.in.legacy
> > +++ b/Config.in.legacy
> > @@ -146,6 +146,13 @@ endif
> >
> >  comment "Legacy options removed in 2024.02"
> >
> > +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 >= 2024.01).
> > +
> >  config BR2_PACKAGE_MYSQL
> >       bool "mysql virtual package removed"
> >       select BR2_LEGACY
> > diff --git a/DEVELOPERS b/DEVELOPERS
> > index 0bfe91f064a9..fb9555915ec1 100644
> > --- a/DEVELOPERS
> > +++ b/DEVELOPERS
> > @@ -151,7 +151,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
> > @@ -3219,7 +3218,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 e5fdf7ad439e..87e1b7c00e35 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 a57319f4be6d..000000000000
> > --- a/boot/ti-k3-image-gen/Config.in
> > +++ /dev/null
> > @@ -1,24 +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
> > -
> > -config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE
> > -     string
> > -     default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62AX
> > -     default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62X
> > -     default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X
> > -     default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X
> > -
> > -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 c968c5648f71..000000000000
> > --- 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 aca29bcf1bd4..000000000000
> > --- 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_PACKAGE_TI_K3_SOC))
> > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_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))
>


-- 

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

Re: [Buildroot] [PATCH v9 05/22] boot/ti-k3-r5-loader: bump to version 2024.01

[Andreas Dannenberg via buildroot]

Hi Yann,

On Sun, Mar 24, 2024 at 05:22:33PM +0100, Dario Binacchi wrote:
> Hi Yann,
> 
> On Tue, Mar 19, 2024 at 11:09 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> >
> > Dario, All,
> >
> > On 2024-03-04 16:32 +0100, Dario Binacchi spake thusly:
> > > All in-tree configs with the ti-k3-r5 bootloader use a custom version,
> > > so this patch is mostly for the menuconfig default version
> > >
> > > Suggested-by: Romain Naour <romain.naour@smile.fr>
> > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> > [--SNIP--]
> > > 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 c5d1cb8e09f0..fbe5d215409d 100644
> > > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
> > > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash
> > > @@ -1,3 +1,3 @@
> > >  # Locally computed:
> > > -sha256  50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8  u-boot-2022.10.tar.bz2
> >
> > Removing this hash means that defconfigs that still reference the
> > 2022.10 version, no longer have a hash to validate the download against,
> > which make it susceptible to CVE-2023-43608 [0] [1].
> >
> > That was already the case for the two ti-am6?x defconfig in the the two
> > previous patches, as they already used a custom kernel, a custm ATF, a
> > custom u-boot: the hashes can't be checked for those versions, so the
> > two ti am?x defconfigs already hit CVE-2023-43608.
> >
> > We already fixed another defconfig for a similar issue, see commit
> > 9ebbfeff387 (configs/rock5b: add hash for custom kernel).
> >
> > Could you look into doing the same for those to TI am6?x defconfig,
> > please?
> 
> Thanks for the info.
> Yes I will add a patch for this point in version 10 of the series.
> 
> >
> > In the meantime, I kept the hash for 2022.10 for ti-k3-r5-loader
> > (really, for uboot), to abvoid the issue at least for ti-k3-r5-loader.
> >
> > Speaking of that, by the way, ti-k3-r5-loader really is uboot, so I
> > think that it should share:
> >
> >  1. the same DL_DIR:   TI_K3_R5_LOADER_DL_SUBDIR = uboot
> >
> >  2. the same hash file:  have ti-k3-r5-loader.hash be a symlink to
> >     uboot.hash  (and have a xomment at the top of that hash file that it
> >     is shared and that old hashes should/can be kept)
> >
> > Do you think that makes sense? If so, would you like to look into it?
> 
> I think like you that where possible it is better not to replicate code.
> This series has been ongoing since November 2023, started to fix the
> compilation for the HS_FS device for the ti_am62x_sk_defconfig configuration.
> During the review process, it has added additional patches
> (ti_am64x_sk_defconfig,
> and removal of the ti-k3-image-gen package) which still today have not
> allowed the
> series to be merged and therefore to fix the issue.
> So, I would prefer to address this aspect in a separate series from
> this one in order
> not to further slow it down.

I'd like to finish GPU support for AM6xx too and push this here, but as
long as we don't have base support I'm kind of blocked on this. And
that's probably just one example. I think as long as there are no
regressions in what this series is trying to do why not agree to merge &
iterate to get the base support out of the way. But definitely
appreciating all your great feedback here for further improvement so
please don't mis-interpret my comment.

--
Andreas Dannenberg
Texas Instruments Inc



> Do you agree?
> 
> Thanks and regards,
> Dario
> >
> > [0] https://cve.mitre.org/cgi-bin/cvename.cgi?name=2023-43608
> > [1] https://talosintelligence.com/vulnerability_reports/TALOS-2023-1844
> >
> > Regards,
> > Yann E. MORIN.
> >
> > > +sha256  b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3  u-boot-2024.01.tar.bz2
> > >  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
> > > --
> > > 2.43.0
> > >
> > > _______________________________________________
> > > buildroot mailing list
> > > buildroot@buildroot.org
> > > https://lists.buildroot.org/mailman/listinfo/buildroot
> >
> > --
> > .-----------------.--------------------.------------------.--------------------.
> > |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> > | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> > | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> > '------------------------------^-------^------------------^--------------------'
> 
> 
> 
> -- 
> 
> 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

Re: [Buildroot] [PATCH v9 22/22] boot/ti-k3-image-gen: remove package

[Romain Naour]

Hello Dario, All,

Le 24/03/2024 à 18:20, Dario Binacchi a écrit :
> Hi Romain,
> 
> On Wed, Mar 13, 2024 at 12:00 PM Romain Naour <romain.naour@smile.fr> wrote:
>>
>> Hello Dario,
>>
>> Le 04/03/2024 à 16:32, Dario Binacchi a écrit :
>>> From: Romain Naour <romain.naour@smile.fr>
>>>
>>> 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.
>>
>> The AM65 support is still broken since we need to copy sysfw*.itb binary that
>> was provided by ti-k3-image-gen.
> 
> Could you kindly indicate the Buildroot configuration for am65 that
> you are referring to regarding the issue you are indicating?
> It seems to me that the configurations of interest, and therefore
> those that have been tested, are ti_am62x_sk_defconfig and
> ti_am64x_sk_defconfig.

The AM65 support is currently provided by ti-k3-image-gen option
BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X and we should try to not break it.

ti-k3-image-gen is meant to be used by all TI's K3 family not only AM62/AM64.

See http://lists.busybox.net/pipermail/buildroot/2024-March/687817.html

Note: I can help testing the AM65 case using the J721e SoC support on top of
this series.

> 
> Here https://lore.kernel.org/all/96a71705-dceb-4417-9edd-1f962edd66f4@smile.fr/,
> you also mention BeaglePlay.
> Is there a BeaglePlay configuration in Buildroot?

I'm not sure about this new script board/ti/common/am6xx/post-image.sh, the
board_dir() function looks questionable. I would like a second opinion.

About the BeaglePlay, I believe Andreas would like to add the support for it soon.

> 
> In version 6 you wrote to me that except for "minor improvement, this
> series is ok for me" and that "I'm planning on testing
> the entire series here pretty soon and will provide feedback":
> 
> https://lore.kernel.org/all/383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr/
> https://lore.kernel.org/all/28040f8a-c68e-4966-9e81-804f723f2100@smile.fr/#t
> 
> I am currently running tests for version 10 since Yann E. Morin has
> highlighted an aspect that I believe should be addressed
> by this series:
> https://lore.kernel.org/all/ZfoNHD-DlqkkYCRh@landeda/
> 
> As already written on several occasions and also shared by Andreas
> Dannenberg and Michael Trimarchi, it is necessary to
> conclude and merge this series as soon as possible to fix the
> compilation error for the HS_FS device of the ti_am62x_sk_defconfig
> configuration, an error reported since November 2023, and from there,
> proceed with the many developments that the new platform
> requires. My tests, like those of Andreas Dannenberg, Alexander
> Sverdlin and Michael Trimarchi, have all yielded positive results.
> Have your tests perhaps revealed any regressions?

I'm still not conviced by the "find -regex -exec cp" to install the tiboot3.bin
and I would like a second review from maintainers.

http://lists.busybox.net/pipermail/buildroot/2024-March/687015.html

About AM62/AM64 HS_FS devices, Andreas suggested that HS-FS should be the
default for all TI AM6x devices.

http://lists.busybox.net/pipermail/buildroot/2024-February/685967.html

See the detailed post in the TI forum:
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

Maybe this is something you could do at the end of the series?

> 
> Please let me know and help me understand what still isn't working in
> this series.

Sorry for my late reply, I was not available for Buildroot as I had planned to be...

Best regards,
Romain


> 
> Thanks and regards,
> Dario
> 
>>
>> Best regards,
>> Romain
>>
>>
>>>
>>> [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>
>>>
>>> ---
>>>
>>> Changes in v9:
>>> - Fixed conflicts on rebasing on master (Config.in.legacy).
>>>
>>> Added in v8
>>>
>>>  Config.in.legacy                          |  7 +++
>>>  DEVELOPERS                                |  2 -
>>>  boot/Config.in                            |  1 -
>>>  boot/ti-k3-image-gen/Config.in            | 24 ----------
>>>  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(+), 84 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 1b15d25d6bf1..304f369da7b2 100644
>>> --- a/Config.in.legacy
>>> +++ b/Config.in.legacy
>>> @@ -146,6 +146,13 @@ endif
>>>
>>>  comment "Legacy options removed in 2024.02"
>>>
>>> +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 >= 2024.01).
>>> +
>>>  config BR2_PACKAGE_MYSQL
>>>       bool "mysql virtual package removed"
>>>       select BR2_LEGACY
>>> diff --git a/DEVELOPERS b/DEVELOPERS
>>> index 0bfe91f064a9..fb9555915ec1 100644
>>> --- a/DEVELOPERS
>>> +++ b/DEVELOPERS
>>> @@ -151,7 +151,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
>>> @@ -3219,7 +3218,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 e5fdf7ad439e..87e1b7c00e35 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 a57319f4be6d..000000000000
>>> --- a/boot/ti-k3-image-gen/Config.in
>>> +++ /dev/null
>>> @@ -1,24 +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
>>> -
>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE
>>> -     string
>>> -     default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62AX
>>> -     default "ti-fs"  if BR2_PACKAGE_TI_K3_SOC_AM62X
>>> -     default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X
>>> -     default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X
>>> -
>>> -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 c968c5648f71..000000000000
>>> --- 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 aca29bcf1bd4..000000000000
>>> --- 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_PACKAGE_TI_K3_SOC))
>>> -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_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))
>>
> 
> 

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

Re: [Buildroot] [PATCH v9 22/22] boot/ti-k3-image-gen: remove package

[Heiko Thiery]

Hi Romain, Hi Dario, All,

Am Mi., 27. März 2024 um 15:55 Uhr schrieb Romain Naour <romain.naour@smile.fr>:
>
> Hello Dario, All,
>
> Le 24/03/2024 à 18:20, Dario Binacchi a écrit :
> > Hi Romain,
> >
> > On Wed, Mar 13, 2024 at 12:00 PM Romain Naour <romain.naour@smile.fr> wrote:
> >>
> >> Hello Dario,
> >>
> >> Le 04/03/2024 à 16:32, Dario Binacchi a écrit :
> >>> From: Romain Naour <romain.naour@smile.fr>
> >>>
> >>> 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.
> >>
> >> The AM65 support is still broken since we need to copy sysfw*.itb binary that
> >> was provided by ti-k3-image-gen.
> >
> > Could you kindly indicate the Buildroot configuration for am65 that
> > you are referring to regarding the issue you are indicating?
> > It seems to me that the configurations of interest, and therefore
> > those that have been tested, are ti_am62x_sk_defconfig and
> > ti_am64x_sk_defconfig.
>
> The AM65 support is currently provided by ti-k3-image-gen option
> BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X and we should try to not break it.
>
> ti-k3-image-gen is meant to be used by all TI's K3 family not only AM62/AM64.
>
> See http://lists.busybox.net/pipermail/buildroot/2024-March/687817.html
>
> Note: I can help testing the AM65 case using the J721e SoC support on top of
> this series.
>
> >
> > Here https://lore.kernel.org/all/96a71705-dceb-4417-9edd-1f962edd66f4@smile.fr/,
> > you also mention BeaglePlay.
> > Is there a BeaglePlay configuration in Buildroot?
>
> I'm not sure about this new script board/ti/common/am6xx/post-image.sh, the
> board_dir() function looks questionable. I would like a second opinion.

I just prepared a patch [1] that introduces the capability to add
specific arguments to POST_BUILD and POST_IMAGE scripts.

With this you can completely dispense with this post-build script and
use the support/scripts/genimage.sh directly.

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"

---- snip 8< ---

[1] https://patchwork.ozlabs.org/project/buildroot/patch/20240328140919.157664-1-heiko.thiery@gmail.com/
-- 
Heiko
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 11/22] boot/ti-k3-r5-loader: set binman environment

[Romain Naour]

Hello Bryan, All,

Le 19/03/2024 à 16:16, Bryan Brattlof a écrit :
> Hi Dario,
> 
> On March  4, 2024 thus sayeth Dario Binacchi:
>> 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.
>>
>> The patch set the BINMAN_INDIRS environment variable to provide the
>> directory to search for binary blobs and select the packages required by
>> binman.
>>
>> 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>
>>
>> ---
>>
> 
> ...
> 
>> 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 0ffcb8235f2e..fdb058f3b72a 100644
>> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
>> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
>> @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \
>>  	host-pkgconf \
>>  	$(BR2_MAKE_HOST_DEPENDENCY) \
>>  	host-arm-gnu-toolchain \
>> -	host-openssl
>> +	host-openssl \
>> +	host-python-jsonschema \
>> +	host-python-pyyaml \
>> +	host-python3 \
>> +	host-python-setuptools \
>> +	host-python-pylibfdt
> 
> Just a question on how boot dependencies are resolved. Do we need to add 
> ti-k3-boot-firmware to this list? How does ti-k3-r5-loader know to 
> 'build' the firmware before we build tiboot3.bin?

Indeed, without ti-k3-boot-firmware package installed, binman warn about
"Missing blob"

make ti_am62x_sk_defconfig
make ti-k3-r5-loader

  BINMAN  .binman_stamp
Image 'tiboot3-am62x-hs-evm.bin' is missing optional external blobs but is still
functional: ti-fs-enc.bin sysfw-inner-cert

/binman/tiboot3-am62x-hs-evm.bin/ti-fs-enc.bin
(ti-sysfw/ti-fs-firmware-am62x-hs-enc.bin):
   Missing blob

/binman/tiboot3-am62x-hs-evm.bin/sysfw-inner-cert
(ti-sysfw/ti-fs-firmware-am62x-hs-cert.bin):
   Missing blob

Image 'tiboot3-am62x-hs-fs-evm.bin' is missing optional external blobs but is
still functional: ti-fs-enc.bin sysfw-inner-cert

/binman/tiboot3-am62x-hs-fs-evm.bin/ti-fs-enc.bin
(ti-sysfw/ti-fs-firmware-am62x-hs-fs-enc.bin):
   Missing blob

/binman/tiboot3-am62x-hs-fs-evm.bin/sysfw-inner-cert
(ti-sysfw/ti-fs-firmware-am62x-hs-fs-cert.bin):
   Missing blob

Image 'tiboot3-am62x-gp-evm.bin' is missing optional external blobs but is still
functional: ti-fs-gp.bin

/binman/tiboot3-am62x-gp-evm.bin/ti-fs-gp.bin
(ti-sysfw/ti-fs-firmware-am62x-gp.bin):
   Missing blob

  OFCHK   .config

So, we should add ti-k3-boot-firmware in dependencies to avoid building
ti-k3-r5-loader before ti-k3-boot-firmware.

When building the AM6 defconfig, the build order is ordered alphabetically by
default and ti-k3-boot-firmware is installed before ti-k3-r5-loader.

Best regards,
Romain


> 
> ~Bryan

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

Re: [Buildroot] [PATCH v9 11/22] boot/ti-k3-r5-loader: set binman environment

[Michael Nazzareno Trimarchi]

Hi Romain

On Wed, Apr 3, 2024 at 10:28 AM Romain Naour <romain.naour@smile.fr> wrote:
>
> Hello Bryan, All,
>
> Le 19/03/2024 à 16:16, Bryan Brattlof a écrit :
> > Hi Dario,
> >
> > On March  4, 2024 thus sayeth Dario Binacchi:
> >> 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.
> >>
> >> The patch set the BINMAN_INDIRS environment variable to provide the
> >> directory to search for binary blobs and select the packages required by
> >> binman.
> >>
> >> 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>
> >>
> >> ---
> >>
> >
> > ...
> >
> >> 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 0ffcb8235f2e..fdb058f3b72a 100644
> >> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> >> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> >> @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \
> >>      host-pkgconf \
> >>      $(BR2_MAKE_HOST_DEPENDENCY) \
> >>      host-arm-gnu-toolchain \
> >> -    host-openssl
> >> +    host-openssl \
> >> +    host-python-jsonschema \
> >> +    host-python-pyyaml \
> >> +    host-python3 \
> >> +    host-python-setuptools \
> >> +    host-python-pylibfdt
> >
> > Just a question on how boot dependencies are resolved. Do we need to add
> > ti-k3-boot-firmware to this list? How does ti-k3-r5-loader know to
> > 'build' the firmware before we build tiboot3.bin?
>
> Indeed, without ti-k3-boot-firmware package installed, binman warn about
> "Missing blob"
>
> make ti_am62x_sk_defconfig
> make ti-k3-r5-loader
>
>   BINMAN  .binman_stamp
> Image 'tiboot3-am62x-hs-evm.bin' is missing optional external blobs but is still
> functional: ti-fs-enc.bin sysfw-inner-cert
>
> /binman/tiboot3-am62x-hs-evm.bin/ti-fs-enc.bin
> (ti-sysfw/ti-fs-firmware-am62x-hs-enc.bin):
>    Missing blob
>
> /binman/tiboot3-am62x-hs-evm.bin/sysfw-inner-cert
> (ti-sysfw/ti-fs-firmware-am62x-hs-cert.bin):
>    Missing blob
>
> Image 'tiboot3-am62x-hs-fs-evm.bin' is missing optional external blobs but is
> still functional: ti-fs-enc.bin sysfw-inner-cert
>
> /binman/tiboot3-am62x-hs-fs-evm.bin/ti-fs-enc.bin
> (ti-sysfw/ti-fs-firmware-am62x-hs-fs-enc.bin):
>    Missing blob
>
> /binman/tiboot3-am62x-hs-fs-evm.bin/sysfw-inner-cert
> (ti-sysfw/ti-fs-firmware-am62x-hs-fs-cert.bin):
>    Missing blob
>
> Image 'tiboot3-am62x-gp-evm.bin' is missing optional external blobs but is still
> functional: ti-fs-gp.bin
>
> /binman/tiboot3-am62x-gp-evm.bin/ti-fs-gp.bin
> (ti-sysfw/ti-fs-firmware-am62x-gp.bin):
>    Missing blob
>
>   OFCHK   .config
>
> So, we should add ti-k3-boot-firmware in dependencies to avoid building
> ti-k3-r5-loader before ti-k3-boot-firmware.
>
> When building the AM6 defconfig, the build order is ordered alphabetically by
> default and ti-k3-boot-firmware is installed before ti-k3-r5-loader.
>

OK, this is a valid point. Anyway what you suggest force select or a
depend. If you have more points, is better to write down all of
them in one review, and not split as now every new patcheset. What do you think?

Michael

> Best regards,
> Romain
>
>
> >
> > ~Bryan
>


-- 
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
michael@amarulasolutions.com
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
info@amarulasolutions.com
www.amarulasolutions.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v9 11/22] boot/ti-k3-r5-loader: set binman environment

[Romain Naour]

Hi Michael,

Le 03/04/2024 à 10:34, Michael Nazzareno Trimarchi a écrit :
> Hi Romain
> 
> On Wed, Apr 3, 2024 at 10:28 AM Romain Naour <romain.naour@smile.fr> wrote:
>>
>> Hello Bryan, All,
>>
>> Le 19/03/2024 à 16:16, Bryan Brattlof a écrit :
>>> Hi Dario,
>>>
>>> On March  4, 2024 thus sayeth Dario Binacchi:
>>>> 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.
>>>>
>>>> The patch set the BINMAN_INDIRS environment variable to provide the
>>>> directory to search for binary blobs and select the packages required by
>>>> binman.
>>>>
>>>> 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>
>>>>
>>>> ---
>>>>
>>>
>>> ...
>>>
>>>> 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 0ffcb8235f2e..fdb058f3b72a 100644
>>>> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
>>>> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
>>>> @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \
>>>>      host-pkgconf \
>>>>      $(BR2_MAKE_HOST_DEPENDENCY) \
>>>>      host-arm-gnu-toolchain \
>>>> -    host-openssl
>>>> +    host-openssl \
>>>> +    host-python-jsonschema \
>>>> +    host-python-pyyaml \
>>>> +    host-python3 \
>>>> +    host-python-setuptools \
>>>> +    host-python-pylibfdt
>>>
>>> Just a question on how boot dependencies are resolved. Do we need to add
>>> ti-k3-boot-firmware to this list? How does ti-k3-r5-loader know to
>>> 'build' the firmware before we build tiboot3.bin?
>>
>> Indeed, without ti-k3-boot-firmware package installed, binman warn about
>> "Missing blob"
>>
>> make ti_am62x_sk_defconfig
>> make ti-k3-r5-loader
>>
>>   BINMAN  .binman_stamp
>> Image 'tiboot3-am62x-hs-evm.bin' is missing optional external blobs but is still
>> functional: ti-fs-enc.bin sysfw-inner-cert
>>
>> /binman/tiboot3-am62x-hs-evm.bin/ti-fs-enc.bin
>> (ti-sysfw/ti-fs-firmware-am62x-hs-enc.bin):
>>    Missing blob
>>
>> /binman/tiboot3-am62x-hs-evm.bin/sysfw-inner-cert
>> (ti-sysfw/ti-fs-firmware-am62x-hs-cert.bin):
>>    Missing blob
>>
>> Image 'tiboot3-am62x-hs-fs-evm.bin' is missing optional external blobs but is
>> still functional: ti-fs-enc.bin sysfw-inner-cert
>>
>> /binman/tiboot3-am62x-hs-fs-evm.bin/ti-fs-enc.bin
>> (ti-sysfw/ti-fs-firmware-am62x-hs-fs-enc.bin):
>>    Missing blob
>>
>> /binman/tiboot3-am62x-hs-fs-evm.bin/sysfw-inner-cert
>> (ti-sysfw/ti-fs-firmware-am62x-hs-fs-cert.bin):
>>    Missing blob
>>
>> Image 'tiboot3-am62x-gp-evm.bin' is missing optional external blobs but is still
>> functional: ti-fs-gp.bin
>>
>> /binman/tiboot3-am62x-gp-evm.bin/ti-fs-gp.bin
>> (ti-sysfw/ti-fs-firmware-am62x-gp.bin):
>>    Missing blob
>>
>>   OFCHK   .config
>>
>> So, we should add ti-k3-boot-firmware in dependencies to avoid building
>> ti-k3-r5-loader before ti-k3-boot-firmware.
>>
>> When building the AM6 defconfig, the build order is ordered alphabetically by
>> default and ti-k3-boot-firmware is installed before ti-k3-r5-loader.
>>
> 
> OK, this is a valid point. Anyway what you suggest force select or a
> depend. If you have more points, is better to write down all of
> them in one review, and not split as now every new patcheset. What do you think?
> 

I reviewed the series already and make some suggestions that were not included.
Same about the review from Bryan (this one) and Andreas (make HS-FS the default
for AM62 and AM64).

I'm working on a V11 including some Buildroot rework, the BSP itself is ok.

Best regards,
Romain


> Michael
> 
>> Best regards,
>> Romain
>>
>>
>>>
>>> ~Bryan
>>
> 
> 

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

Re: [Buildroot] [PATCH v9 11/22] boot/ti-k3-r5-loader: set binman environment

[Michael Nazzareno Trimarchi]

Hi Romain

On Wed, Apr 3, 2024 at 11:38 AM Romain Naour <romain.naour@smile.fr> wrote:
>
> Hi Michael,
>
> Le 03/04/2024 à 10:34, Michael Nazzareno Trimarchi a écrit :
> > Hi Romain
> >
> > On Wed, Apr 3, 2024 at 10:28 AM Romain Naour <romain.naour@smile.fr> wrote:
> >>
> >> Hello Bryan, All,
> >>
> >> Le 19/03/2024 à 16:16, Bryan Brattlof a écrit :
> >>> Hi Dario,
> >>>
> >>> On March  4, 2024 thus sayeth Dario Binacchi:
> >>>> 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.
> >>>>
> >>>> The patch set the BINMAN_INDIRS environment variable to provide the
> >>>> directory to search for binary blobs and select the packages required by
> >>>> binman.
> >>>>
> >>>> 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>
> >>>>
> >>>> ---
> >>>>
> >>>
> >>> ...
> >>>
> >>>> 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 0ffcb8235f2e..fdb058f3b72a 100644
> >>>> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> >>>> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> >>>> @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \
> >>>>      host-pkgconf \
> >>>>      $(BR2_MAKE_HOST_DEPENDENCY) \
> >>>>      host-arm-gnu-toolchain \
> >>>> -    host-openssl
> >>>> +    host-openssl \
> >>>> +    host-python-jsonschema \
> >>>> +    host-python-pyyaml \
> >>>> +    host-python3 \
> >>>> +    host-python-setuptools \
> >>>> +    host-python-pylibfdt
> >>>
> >>> Just a question on how boot dependencies are resolved. Do we need to add
> >>> ti-k3-boot-firmware to this list? How does ti-k3-r5-loader know to
> >>> 'build' the firmware before we build tiboot3.bin?
> >>
> >> Indeed, without ti-k3-boot-firmware package installed, binman warn about
> >> "Missing blob"
> >>
> >> make ti_am62x_sk_defconfig
> >> make ti-k3-r5-loader
> >>
> >>   BINMAN  .binman_stamp
> >> Image 'tiboot3-am62x-hs-evm.bin' is missing optional external blobs but is still
> >> functional: ti-fs-enc.bin sysfw-inner-cert
> >>
> >> /binman/tiboot3-am62x-hs-evm.bin/ti-fs-enc.bin
> >> (ti-sysfw/ti-fs-firmware-am62x-hs-enc.bin):
> >>    Missing blob
> >>
> >> /binman/tiboot3-am62x-hs-evm.bin/sysfw-inner-cert
> >> (ti-sysfw/ti-fs-firmware-am62x-hs-cert.bin):
> >>    Missing blob
> >>
> >> Image 'tiboot3-am62x-hs-fs-evm.bin' is missing optional external blobs but is
> >> still functional: ti-fs-enc.bin sysfw-inner-cert
> >>
> >> /binman/tiboot3-am62x-hs-fs-evm.bin/ti-fs-enc.bin
> >> (ti-sysfw/ti-fs-firmware-am62x-hs-fs-enc.bin):
> >>    Missing blob
> >>
> >> /binman/tiboot3-am62x-hs-fs-evm.bin/sysfw-inner-cert
> >> (ti-sysfw/ti-fs-firmware-am62x-hs-fs-cert.bin):
> >>    Missing blob
> >>
> >> Image 'tiboot3-am62x-gp-evm.bin' is missing optional external blobs but is still
> >> functional: ti-fs-gp.bin
> >>
> >> /binman/tiboot3-am62x-gp-evm.bin/ti-fs-gp.bin
> >> (ti-sysfw/ti-fs-firmware-am62x-gp.bin):
> >>    Missing blob
> >>
> >>   OFCHK   .config
> >>
> >> So, we should add ti-k3-boot-firmware in dependencies to avoid building
> >> ti-k3-r5-loader before ti-k3-boot-firmware.
> >>
> >> When building the AM6 defconfig, the build order is ordered alphabetically by
> >> default and ti-k3-boot-firmware is installed before ti-k3-r5-loader.
> >>
> >
> > OK, this is a valid point. Anyway what you suggest force select or a
> > depend. If you have more points, is better to write down all of
> > them in one review, and not split as now every new patcheset. What do you think?
> >
>
> I reviewed the series already and make some suggestions that were not included.
> Same about the review from Bryan (this one) and Andreas (make HS-FS the default
> for AM62 and AM64).
>
> I'm working on a V11 including some Buildroot rework, the BSP itself is ok.
>

Ok, this way you make again all the people testing, when your patches
can be on top of this series that already
was proven that it was working. It's even important that you consider
the effort of the people on testing series and
patches that are on going on the TI side to include gpu. Hope that
your V11 will come soon and not include too many changes.
All your suggestions come from SoC or boards that are not even
included in buildroot and on platforms where they are not yet
supported.
People are contributing on what they can test and include and patches
that are not part of a series that state to support some architecture
should not be forced in the same series. Sometimes we can even accept
that a series is supposed to do what is in the series description.

Michael



> Best regards,
> Romain
>
>
> > Michael
> >
> >> Best regards,
> >> Romain
> >>
> >>
> >>>
> >>> ~Bryan
> >>
> >
> >
>


-- 
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
michael@amarulasolutions.com
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
info@amarulasolutions.com
www.amarulasolutions.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot