diff mbox series

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

Message ID 20240304153253.732708-23-dario.binacchi@amarulasolutions.com
State Changes Requested
Headers show
Series Add support for AM62x-SK HS-FS devices | expand

Commit Message

Dario Binacchi March 4, 2024, 3:32 p.m. UTC 
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

Comments

Romain Naour March 13, 2024, 11 a.m. UTC | #1 
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))
Michael Nazzareno Trimarchi March 13, 2024, 11:28 a.m. UTC | #2 
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 March 18, 2024, 7:35 a.m. UTC | #3 
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
Dario Binacchi March 24, 2024, 5:20 p.m. UTC | #4 
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))
>
Romain Naour March 27, 2024, 2:55 p.m. UTC | #5 
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))
>>
> 
>
Heiko Thiery March 28, 2024, 2:32 p.m. UTC | #6 
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/
diff mbox series

Patch

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))