NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN

Browse Source 
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.

While at it, add one more like to binman dependencies in comments.

Reviewed-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
Romain Naour 2024-03-03 22:20:46 +01:00
parent 1e6f6252fd
commit e5d8cd5173
4 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
boot/ti-k3-r5-loader/Config.in
View File

@ -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"

31
boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
View File

@ -35,11 +35,21 @@ 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/binman/binman.rst?plain=1#L377
# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt
# Make sure that all binman requirements are built 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 +68,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 +87,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

1
configs/ti_am62x_sk_defconfig
View File

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

1
configs/ti_am64x_sk_defconfig
View File

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