From 61385c4976d6f4574defa54ccaa948387869cf18 Mon Sep 17 00:00:00 2001 From: Yidi Lin Date: Tue, 17 Dec 2024 19:38:21 +0800 Subject: [PATCH] soc/mediatek/common: Move SPM_SYSTEM_BASE_OFFSET to soc folders MT8196's SPM_SYSTEM_BASE_OFFSET has a different offset due to the hardware design. To avoid adding a new kconfig for differentiation, migrate this definition into SoC specific value. BUG=none TEST=emerge-geralt coreboot && emerge-corsola coreboot Change-Id: I5df510d5d05a0594d87e7e96e1e03e20a018785f Signed-off-by: Yidi Lin Reviewed-on: https://review.coreboot.org/c/coreboot/+/85625 Reviewed-by: Yu-Ping Wu Tested-by: build bot (Jenkins) --- src/soc/mediatek/common/include/soc/spm_common.h | 2 -- src/soc/mediatek/mt8186/include/soc/spm.h | 1 + src/soc/mediatek/mt8188/include/soc/spm.h | 2 ++ src/soc/mediatek/mt8192/include/soc/spm.h | 2 ++ src/soc/mediatek/mt8195/include/soc/spm.h | 2 ++ 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/soc/mediatek/common/include/soc/spm_common.h b/src/soc/mediatek/common/include/soc/spm_common.h index 6a65b2c9dc..f45b59e836 100644 --- a/src/soc/mediatek/common/include/soc/spm_common.h +++ b/src/soc/mediatek/common/include/soc/spm_common.h @@ -5,8 +5,6 @@ #include -#define SPM_SYSTEM_BASE_OFFSET 0x40000000 - struct pcm_desc { u32 pmem_words; u32 total_words; diff --git a/src/soc/mediatek/mt8186/include/soc/spm.h b/src/soc/mediatek/mt8186/include/soc/spm.h index cffc52301d..9368916031 100644 --- a/src/soc/mediatek/mt8186/include/soc/spm.h +++ b/src/soc/mediatek/mt8186/include/soc/spm.h @@ -14,6 +14,7 @@ #include #include +#define SPM_SYSTEM_BASE_OFFSET 0x40000000 #define SPM_INIT_DONE_US 20 #define CLK_SCP_CFG_0 (IO_PHYS + 0x200) diff --git a/src/soc/mediatek/mt8188/include/soc/spm.h b/src/soc/mediatek/mt8188/include/soc/spm.h index 043a102078..529ad18895 100644 --- a/src/soc/mediatek/mt8188/include/soc/spm.h +++ b/src/soc/mediatek/mt8188/include/soc/spm.h @@ -9,6 +9,8 @@ #include #include +#define SPM_SYSTEM_BASE_OFFSET 0x40000000 + /* SPM READ/WRITE CFG */ #define SPM_PROJECT_CODE 0xb16 #define SPM_REGWR_CFG_KEY (SPM_PROJECT_CODE << 16) diff --git a/src/soc/mediatek/mt8192/include/soc/spm.h b/src/soc/mediatek/mt8192/include/soc/spm.h index cc5052b9ff..065053a307 100644 --- a/src/soc/mediatek/mt8192/include/soc/spm.h +++ b/src/soc/mediatek/mt8192/include/soc/spm.h @@ -9,6 +9,8 @@ #include #include +#define SPM_SYSTEM_BASE_OFFSET 0x40000000 + /* SPM READ/WRITE CFG */ #define SPM_PROJECT_CODE 0xb16 #define SPM_REGWR_CFG_KEY (SPM_PROJECT_CODE << 16) diff --git a/src/soc/mediatek/mt8195/include/soc/spm.h b/src/soc/mediatek/mt8195/include/soc/spm.h index c118f063cc..67873ec907 100644 --- a/src/soc/mediatek/mt8195/include/soc/spm.h +++ b/src/soc/mediatek/mt8195/include/soc/spm.h @@ -9,6 +9,8 @@ #include #include +#define SPM_SYSTEM_BASE_OFFSET 0x40000000 + /* SPM READ/WRITE CFG */ #define SPM_PROJECT_CODE 0xb16 #define SPM_REGWR_CFG_KEY (SPM_PROJECT_CODE << 16)