From 364e153e6a25ff8c0de348b0c5244ef17b3a1b57 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 6 Apr 2024 17:05:15 +0200 Subject: [PATCH] boot/uboot: remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME Previoulsy (without binman), when a TI K3 SoC using Combined binary with a split firmware boot method was used (am62ax or am62x) [1], the user had to select BR2_TARGET_UBOOT_NEEDS_TI_K3_DM in the defconfig to provide Device Manager firmware provided by ti-k3-boot-firmware. With binman, this option is no longer necessary since ti-k3-boot-firmware package is already in the u-boot dependency and the path to DM and SYSFW binaries are provided by BINMAN_INDIRS. We are going to remove ti-k3-image-gen, so binman is now mandatory on all TI K3 SoCs. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/52ce606c05ee3ac869f8087292bc3dbb0d25b79b Reviewed-by: Arnout Vandecappelle Signed-off-by: Romain Naour --- boot/uboot/Config.in | 13 ------------- boot/uboot/uboot.mk | 4 ---- 2 files changed, 17 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 39e49d681b..8d2228dc7d 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -251,19 +251,6 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE 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 - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - -endif - config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 398485195e..a894654698 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -195,11 +195,7 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif 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)