@@ -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.
@@ -93,14 +94,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
- 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
default "tiboot3-am62ax-gp-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM62AX && BR2_PACKAGE_TI_K3_SECTYPE_GP
@@ -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,31 +67,15 @@ 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)"
+ HOSTLDFLAGS="$(HOST_LDFLAGS)" \
+ BINMAN_INDIRS=$(BINARIES_DIR)
-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)
-define TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN
- cp $(@D)/$(TI_K3_R5_LOADER_TIBOOT3_BIN) $(BINARIES_DIR)/tiboot3.bin
-endef
# sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e)
ifneq ($(BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB),)
define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB
cp $(@D)/$(BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB) $(BINARIES_DIR)/sysfw.itb
endef
endif
-endif
define TI_K3_R5_LOADER_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS)
@@ -92,7 +85,7 @@ TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3
define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS
cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin
- $(TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN)
+ cp $(@D)/$(TI_K3_R5_LOADER_TIBOOT3_BIN) $(BINARIES_DIR)/tiboot3.bin
$(TI_K3_R5_LOADER_INSTALL_SWSFW_ITB)
endef
@@ -32,7 +32,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
-BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
@@ -32,7 +32,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5"
-BR2_TARGET_TI_K3_R5_LOADER_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 | 9 +------ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 33 ++++++++++--------------- configs/ti_am62x_sk_defconfig | 1 - configs/ti_am64x_sk_defconfig | 1 - 4 files changed, 14 insertions(+), 30 deletions(-)