| Message ID | 20240407103512.1112712-16-romain.naour@smile.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Add support for AM62x-SK HS-FS devices | expand |
On 07/04/2024 12:35, Romain Naour wrote: > Since all AM62 and AM64 defconfig has been updated to use binman > and ti-k3-image-gen has been removed, binman is now mandatory > for all TI K3 SoC. So remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN > option since since it can't be disabled anymore. > > We can remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN without > legacy handling since this option is not part of any Buildroot > release. > > Signed-off-by: Romain Naour <romain.naour@smile.fr> > --- > boot/ti-k3-r5-loader/Config.in | 11 ++------- > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 30 ++++++++++--------------- > configs/ti_am62x_sk_defconfig | 1 - > configs/ti_am64x_sk_defconfig | 1 - > 4 files changed, 14 insertions(+), 29 deletions(-) > > diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in > index c0c7222a10..d91aefed79 100644 > --- a/boot/ti-k3-r5-loader/Config.in > +++ b/boot/ti-k3-r5-loader/Config.in > @@ -1,6 +1,8 @@ > config BR2_TARGET_TI_K3_R5_LOADER > bool "ti-k3-r5-loader" > depends on BR2_aarch64 > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema > + select BR2_TARGET_TI_K3_BOOT_FIRMWARE # binman > help > Separate U-Boot SPL build for R5 core on TI's K3 processors. > Usually used to build tiboot3.bin with k3-image-gen. > @@ -93,15 +95,6 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE > help > Path to the TI K3 R5 Loader configuration file. > > -config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN > - bool "ti-k3-r5-loader use binman" > - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema > - select BR2_TARGET_TI_K3_BOOT_FIRMWARE > - help > - Use binman tool for generation and signing of boot images. > - > - https://docs.u-boot.org/en/v2024.01/develop/package/binman.html > - > config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN > string "tiboot3.bin binary name" > default "tiboot3.bin" > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 0191a2501c..93d9e0b134 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -35,11 +35,20 @@ TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt > TI_K3_R5_LOADER_CPE_ID_VENDOR = denx > TI_K3_R5_LOADER_CPE_ID_PRODUCT = u-boot > TI_K3_R5_LOADER_INSTALL_IMAGES = YES > +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt In patch 4/16 you have another URL, it would be best to add that one here as well, because the URL above has just 2 dependencies. # https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377 I didn't change that when applying patch 4/16 because it would anyway lead to a conflict here. > +# Make sure that all binman requirements are build before ti-k3-r5-loader. build -> built Regards, Arnout > TI_K3_R5_LOADER_DEPENDENCIES = \ > host-pkgconf \ > $(BR2_MAKE_HOST_DEPENDENCY) \ > host-arm-gnu-toolchain \ > - host-openssl > + host-openssl \ > + host-python3 \ > + host-python-jsonschema \ > + host-python-pyelftools \ > + host-python-pylibfdt \ > + host-python-pyyaml \ > + host-python-setuptools \ > + ti-k3-boot-firmware > > TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) > TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) > @@ -58,21 +67,8 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > ARCH=arm \ > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > - HOSTLDFLAGS="$(HOST_LDFLAGS)" > - > -ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) > -# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt > -TI_K3_R5_LOADER_DEPENDENCIES += \ > - host-python-jsonschema \ > - host-python-pyyaml \ > - ti-k3-boot-firmware > -# Make sure that all binman requirements are build before ti-k3-r5-loader. > -TI_K3_R5_LOADER_DEPENDENCIES += \ > - host-python3 \ > - host-python-pyelftools \ > - host-python-pylibfdt \ > - host-python-setuptools > -TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) > + HOSTLDFLAGS="$(HOST_LDFLAGS)" \ > + BINMAN_INDIRS=$(BINARIES_DIR) > > TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN)) > > @@ -90,8 +86,6 @@ define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB > fi > endef > > -endif # BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN > - > define TI_K3_R5_LOADER_BUILD_CMDS > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > endef > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index b62f624d82..fa2c008d4c 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" > BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" > -BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 56e1b23335..f7c6d16b35 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" > BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin" > -BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index c0c7222a10..d91aefed79 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,8 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_TI_K3_BOOT_FIRMWARE # binman help Separate U-Boot SPL build for R5 core on TI's K3 processors. Usually used to build tiboot3.bin with k3-image-gen. @@ -93,15 +95,6 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE help Path to the TI K3 R5 Loader configuration file. -config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN - bool "ti-k3-r5-loader use binman" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema - select BR2_TARGET_TI_K3_BOOT_FIRMWARE - help - Use binman tool for generation and signing of boot images. - - https://docs.u-boot.org/en/v2024.01/develop/package/binman.html - config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN string "tiboot3.bin binary name" default "tiboot3.bin" diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0191a2501c..93d9e0b134 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -35,11 +35,20 @@ TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt TI_K3_R5_LOADER_CPE_ID_VENDOR = denx TI_K3_R5_LOADER_CPE_ID_PRODUCT = u-boot TI_K3_R5_LOADER_INSTALL_IMAGES = YES +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +# Make sure that all binman requirements are build before ti-k3-r5-loader. TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ - host-openssl + host-openssl \ + host-python3 \ + host-python-jsonschema \ + host-python-pyelftools \ + host-python-pylibfdt \ + host-python-pyyaml \ + host-python-setuptools \ + ti-k3-boot-firmware TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -58,21 +67,8 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ ARCH=arm \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ - HOSTLDFLAGS="$(HOST_LDFLAGS)" - -ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) -# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt -TI_K3_R5_LOADER_DEPENDENCIES += \ - host-python-jsonschema \ - host-python-pyyaml \ - ti-k3-boot-firmware -# Make sure that all binman requirements are build before ti-k3-r5-loader. -TI_K3_R5_LOADER_DEPENDENCIES += \ - host-python3 \ - host-python-pyelftools \ - host-python-pylibfdt \ - host-python-setuptools -TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) + HOSTLDFLAGS="$(HOST_LDFLAGS)" \ + BINMAN_INDIRS=$(BINARIES_DIR) TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN)) @@ -90,8 +86,6 @@ define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB fi endef -endif # BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN - define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index b62f624d82..fa2c008d4c 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" -BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 56e1b23335..f7c6d16b35 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin" -BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y
Since all AM62 and AM64 defconfig has been updated to use binman and ti-k3-image-gen has been removed, binman is now mandatory for all TI K3 SoC. So remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option since since it can't be disabled anymore. We can remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN without legacy handling since this option is not part of any Buildroot release. Signed-off-by: Romain Naour <romain.naour@smile.fr> --- boot/ti-k3-r5-loader/Config.in | 11 ++------- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 30 ++++++++++--------------- configs/ti_am62x_sk_defconfig | 1 - configs/ti_am64x_sk_defconfig | 1 - 4 files changed, 14 insertions(+), 29 deletions(-)