From 7e711a5bef7fe6fa53d7564bf9003718cbc8b20d Mon Sep 17 00:00:00 2001 From: Yidi Lin Date: Sat, 7 Jun 2025 07:10:59 +0000 Subject: [PATCH] Reland "soc/mediatek/mt8196: Specify MTKLIB_PATH for building BL31" This reverts commit 7814b8a6bec6e7777033bfd9785b9012b52a73f6. Reason for revert: The dependent patches are landed. CB:87976 da54093bb9 "Update arm-trusted-firmware submodule to upstream master" CB:87882 5dc4b47 "soc/mediatek/mt8196: Update libbl31.a to version 16297.0.0" BUG=b:412560091, b:414543140 Change-Id: Ie34683118f99940185f9d637f5e1953b5250cde0 Signed-off-by: Yidi Lin Reviewed-on: https://review.coreboot.org/c/coreboot/+/87994 Tested-by: build bot (Jenkins) Reviewed-by: Yu-Ping Wu Reviewed-by: Matt DeVillier --- src/soc/mediatek/mt8196/Makefile.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/soc/mediatek/mt8196/Makefile.mk b/src/soc/mediatek/mt8196/Makefile.mk index 5240fbb2bb..9cf46ac809 100644 --- a/src/soc/mediatek/mt8196/Makefile.mk +++ b/src/soc/mediatek/mt8196/Makefile.mk @@ -96,6 +96,12 @@ CPPFLAGS_common += -Isrc/soc/mediatek/common/dp/include MT8196_BLOB_DIR := 3rdparty/blobs/soc/mediatek/mt8196 +BL31_LIB := $(top)/$(MT8196_BLOB_DIR)/libbl31.a + +ifneq ($(wildcard $(BL31_LIB)),) +BL31_MAKEARGS += MTKLIB_PATH=$(BL31_LIB) +endif + PI_IMG := $(MT8196_BLOB_DIR)/$(call strip_quotes,$(CONFIG_PI_IMG_FIRMWARE)) .PHONY: check_pi_img