From 62ae90eac240e3312bf4ea46279c5df206cb4dbf Mon Sep 17 00:00:00 2001 From: Yu-Ping Wu Date: Fri, 23 Aug 2024 16:07:15 +0800 Subject: soc/mediatek: Require MCU and DRAM blobs to exist When the config of MCU firmware blob such as CONFIG_SPM_FIRMWARE is non-empty, we should always expect the file to exist. Similarly, since the device is unlikely to boot without the DRAM blob (assuming MRC_CACHE doesn't contain valid memory training data), dram.elf should always exist as well. Therefore, remove the check for the existence of the blobs. Build would fail if any of the blobs is missing. Change-Id: I755e7c5a70b34b0c3d3915ab339c65263688aad7 Signed-off-by: Yu-Ping Wu Reviewed-on: https://review.coreboot.org/c/coreboot/+/84053 Reviewed-by: Yidi Lin Tested-by: build bot (Jenkins) --- src/soc/mediatek/mt8183/Makefile.mk | 4 +--- src/soc/mediatek/mt8186/Makefile.mk | 6 ++---- src/soc/mediatek/mt8188/Makefile.mk | 6 ++---- src/soc/mediatek/mt8192/Makefile.mk | 6 ++---- src/soc/mediatek/mt8195/Makefile.mk | 6 ++---- 5 files changed, 9 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/soc/mediatek/mt8183/Makefile.mk b/src/soc/mediatek/mt8183/Makefile.mk index 775cdea7c9..c346d176cc 100644 --- a/src/soc/mediatek/mt8183/Makefile.mk +++ b/src/soc/mediatek/mt8183/Makefile.mk @@ -88,9 +88,7 @@ DRAM_CBFS := $(CONFIG_CBFS_PREFIX)/dram $(DRAM_CBFS)-file := $(MT8183_BLOB_DIR)/dram.elf $(DRAM_CBFS)-type := stage $(DRAM_CBFS)-compression := $(CBFS_PRERAM_COMPRESS_FLAG) -ifneq ($(wildcard $($(DRAM_CBFS)-file)),) - cbfs-files-y += $(DRAM_CBFS) -endif +cbfs-files-y += $(DRAM_CBFS) BL31_MAKEARGS += PLAT=mt8183 diff --git a/src/soc/mediatek/mt8186/Makefile.mk b/src/soc/mediatek/mt8186/Makefile.mk index f637dcf0f6..f790d2af17 100644 --- a/src/soc/mediatek/mt8186/Makefile.mk +++ b/src/soc/mediatek/mt8186/Makefile.mk @@ -69,16 +69,14 @@ $(foreach fw, $(call strip_quotes,$(mcu-firmware-files)), \ $(eval $(fw)-file := $(MT8186_BLOB_DIR)/$(fw)) \ $(eval $(fw)-type := raw) \ $(eval $(fw)-compression := LZ4) \ - $(if $(wildcard $($(fw)-file)), $(eval cbfs-files-y += $(fw)), ) \ + $(eval cbfs-files-y += $(fw)) \ ) DRAM_CBFS := $(CONFIG_CBFS_PREFIX)/dram $(DRAM_CBFS)-file := $(MT8186_BLOB_DIR)/dram.elf $(DRAM_CBFS)-type := stage $(DRAM_CBFS)-compression := $(CBFS_PRERAM_COMPRESS_FLAG) -ifneq ($(wildcard $($(DRAM_CBFS)-file)),) - cbfs-files-y += $(DRAM_CBFS) -endif +cbfs-files-y += $(DRAM_CBFS) $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin ./util/mtkheader/gen-bl-img.py mt8183 sf $< $@ diff --git a/src/soc/mediatek/mt8188/Makefile.mk b/src/soc/mediatek/mt8188/Makefile.mk index 6a57da49db..727b3f8c7c 100644 --- a/src/soc/mediatek/mt8188/Makefile.mk +++ b/src/soc/mediatek/mt8188/Makefile.mk @@ -78,16 +78,14 @@ $(foreach fw, $(call strip_quotes,$(mcu-firmware-files)), \ $(eval $(fw)-file := $(MT8188_BLOB_DIR)/$(fw)) \ $(eval $(fw)-type := raw) \ $(eval $(fw)-compression := LZ4) \ - $(if $(wildcard $($(fw)-file)), $(eval cbfs-files-y += $(fw)), ) \ + $(eval cbfs-files-y += $(fw)) \ ) DRAM_CBFS := $(CONFIG_CBFS_PREFIX)/dram $(DRAM_CBFS)-file := $(MT8188_BLOB_DIR)/dram.elf $(DRAM_CBFS)-type := stage $(DRAM_CBFS)-compression := $(CBFS_PRERAM_COMPRESS_FLAG) -ifneq ($(wildcard $($(DRAM_CBFS)-file)),) - cbfs-files-y += $(DRAM_CBFS) -endif +cbfs-files-y += $(DRAM_CBFS) $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin ./util/mtkheader/gen-bl-img.py mt8183 sf $< $@ diff --git a/src/soc/mediatek/mt8192/Makefile.mk b/src/soc/mediatek/mt8192/Makefile.mk index 4e35fe104f..081a9a99a3 100644 --- a/src/soc/mediatek/mt8192/Makefile.mk +++ b/src/soc/mediatek/mt8192/Makefile.mk @@ -71,16 +71,14 @@ $(foreach fw, $(call strip_quotes,$(mcu-firmware-files)), \ $(eval $(fw)-file := $(MT8192_BLOB_DIR)/$(fw)) \ $(eval $(fw)-type := raw) \ $(eval $(fw)-compression := LZ4) \ - $(if $(wildcard $($(fw)-file)), $(eval cbfs-files-y += $(fw)), ) \ + $(eval cbfs-files-y += $(fw)) \ ) DRAM_CBFS := $(CONFIG_CBFS_PREFIX)/dram $(DRAM_CBFS)-file := $(MT8192_BLOB_DIR)/dram.elf $(DRAM_CBFS)-type := stage $(DRAM_CBFS)-compression := $(CBFS_PRERAM_COMPRESS_FLAG) -ifneq ($(wildcard $($(DRAM_CBFS)-file)),) - cbfs-files-y += $(DRAM_CBFS) -endif +cbfs-files-y += $(DRAM_CBFS) $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin ./util/mtkheader/gen-bl-img.py mt8183 sf $< $@ diff --git a/src/soc/mediatek/mt8195/Makefile.mk b/src/soc/mediatek/mt8195/Makefile.mk index d1c1920482..f91372aeb9 100644 --- a/src/soc/mediatek/mt8195/Makefile.mk +++ b/src/soc/mediatek/mt8195/Makefile.mk @@ -87,16 +87,14 @@ $(foreach fw, $(call strip_quotes,$(mcu-firmware-files)), \ $(eval $(fw)-file := $(MT8195_BLOB_DIR)/$(fw)) \ $(eval $(fw)-type := raw) \ $(eval $(fw)-compression := LZ4) \ - $(if $(wildcard $($(fw)-file)), $(eval cbfs-files-y += $(fw)), ) \ + $(eval cbfs-files-y += $(fw)) \ ) DRAM_CBFS := $(CONFIG_CBFS_PREFIX)/dram $(DRAM_CBFS)-file := $(MT8195_BLOB_DIR)/dram.elf $(DRAM_CBFS)-type := stage $(DRAM_CBFS)-compression := $(CBFS_PRERAM_COMPRESS_FLAG) -ifneq ($(wildcard $($(DRAM_CBFS)-file)),) - cbfs-files-y += $(DRAM_CBFS) -endif +cbfs-files-y += $(DRAM_CBFS) $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin ./util/mtkheader/gen-bl-img.py mt8183 sf $< $@ -- cgit v1.2.3