[XS] Change in coreboot[main]: soc/mediatek/mt8188: Respect ARM64_BL31_OPTEE_WITH_SMC option

[Yu-Ping Wu (Code Review)]

Yu-Ping Wu has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83128?usp=email )

Change subject: soc/mediatek/mt8188: Respect ARM64_BL31_OPTEE_WITH_SMC option
......................................................................

soc/mediatek/mt8188: Respect ARM64_BL31_OPTEE_WITH_SMC option

Since BL31_MAKEARGS is already handled in arm64/Makefile.mk, remove the
duplication from mt8188/Makefile.mk. In addition, reserve the memory
range for running OP-TEE only if ARM64_BL31_OPTEE_WITH_SMC is enabled.

BUG=b:347851571
TEST=emerge-geralt coreboot
BRANCH=geralt

Change-Id: I88a9a07a685a6c9fe9739b6101ccb8a5ce23fd8b
Signed-off-by: Yu-Ping Wu 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83128
Tested-by: build bot (Jenkins) 
Reviewed-by: Julius Werner 
---
M src/soc/mediatek/mt8188/Makefile.mk
M src/soc/mediatek/mt8188/soc.c
2 files changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Julius Werner: Looks good to me, approved
  build bot (Jenkins): Verified

diff --git a/src/soc/mediatek/mt8188/Makefile.mk b/src/soc/mediatek/mt8188/Makefile.mk
index 11c3ca88..f67c827 100644
--- a/src/soc/mediatek/mt8188/Makefile.mk
+++ b/src/soc/mediatek/mt8188/Makefile.mk
@@ -59,9 +59,7 @@
 ramstage-y += ../common/tps65132s.c
 ramstage-y += ../common/usb.c usb.c

-BL31_MAKEARGS += PLAT=mt8188 SPD=opteed
-BL31_MAKEARGS += OPTEE_ALLOW_SMC_LOAD=1 PLAT_XLAT_TABLES_DYNAMIC=1
-BL31_MAKEARGS += CROS_WIDEVINE_SMC=1
+BL31_MAKEARGS += PLAT=mt8188

CPPFLAGS_common += -Isrc/soc/mediatek/mt8188/include
 CPPFLAGS_common += -Isrc/soc/mediatek/common/dp/include
diff --git a/src/soc/mediatek/mt8188/soc.c b/src/soc/mediatek/mt8188/soc.c
index e7124ba..f2911ae 100644
--- a/src/soc/mediatek/mt8188/soc.c
+++ b/src/soc/mediatek/mt8188/soc.c
@@ -21,7 +21,8 @@
 {
    if (CONFIG(MTK_DFD))
    	bootmem_add_range(DFD_DUMP_ADDRESS, DFD_DUMP_SIZE, BM_MEM_RESERVED);
-	bootmem_add_range(OPTEE_ADDRESS, OPTEE_SIZE, BM_MEM_RESERVED);
+	if (CONFIG(ARM64_BL31_OPTEE_WITH_SMC))
+		bootmem_add_range(OPTEE_ADDRESS, OPTEE_SIZE, BM_MEM_RESERVED);
 }

static void soc_read_resources(struct device *dev)