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

boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support

Browse Source 
BR2_TARGET_UBOOT_NEEDS_TI_K3_DM option has been introduced initially to
support certain TI K3 devices such as AM62x and AM62Ax that require a
Device Manager (DM) firmware.

This option needs to be renamed to use a more generic name in order
to cover further TI K3 SoCs support along with the new u-boot binman
tool that will be added in followup patch. With binman enabled in
u-boot on TI K3 SoC, ti-k3-boot-firmware is needed at buildtime to
provide ti-sysfw (System Firmware) for all TI K3 SoC along with Device
Manager (DM) firmware for AM62x and AM62Ax devices.

With binman support enabled, we don't need to provide the path of the
Device Manager firmware anymore (see [2]).
We can remove DM="<DM firmware>.xer5f" from UBOOT_MAKE_OPTS.
It also means that we can also remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
used to define DM path.

  DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f

For now, keep BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME and DM only when
ti-k3-image-gen is used. We need to update ti_am62x_sk_defconfig
to use binman before removing them along with ti-k3-image-gen.

[1] 52ce606c05
[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

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
Romain Naour 2024-04-07 12:34:56 +02:00 committed by Arnout Vandecappelle
parent ae1d482a3d
commit 182756a032
4 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Config.in.legacy
View File

@ -146,6 +146,14 @@ endif
comment "Legacy options removed in 2024.05"
config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
bool "u-boot TI K3 DM option has been renamed."
select BR2_LEGACY
select BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
help
The TI K3 Device Manager is already included in
ti-k3-boot-firmware.
config BR2_PACKAGE_FLUTTER_GALLERY
bool "flutter-gallery removed"
select BR2_LEGACY

23
boot/uboot/Config.in
View File

@ -240,18 +240,23 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE
U-Boot, and that the TEE variable pointing to OPTEE's
tee.elf, is passed during the Buildroot build.
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
config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
bool "U-Boot needs ti-k3-boot-firmware"
depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE
help
Some TI K3 devices need the Device Manager (DM) firmware to
be available for the U-Boot build.
TI K3 devices needs at least ti-sysfw (System Firmware) when
built with u-boot's binman tool.
if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
Some TI K3 devices using a split firmware boot flow (AM62,
j721e) also need the Device Manager (DM) firmware to be
available for the U-Boot build.
if BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
# TI_K3_DM_SOCNAME is only needed when ti-k3-image-gen is used for
# TI K3 devices using the Device Manager (DM) firmware.
# We use the SoC selection defined for the ti-k3-image-gen
# package.
config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME
string
default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX

4
boot/uboot/uboot.mk
View File

@ -194,11 +194,13 @@ UBOOT_DEPENDENCIES += optee-os
UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf
endif
ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y)
ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE),y)
UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME))
UBOOT_DEPENDENCIES += ti-k3-boot-firmware
ifneq ($(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

2
configs/ti_am62x_sk_defconfig
View File

@ -37,7 +37,7 @@ 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_NEEDS_TI_K3_BOOT_FIRMWARE=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y