soc: mediatek: mtk_adsp: Fix wrong hwmv2 Kconfigs

nordicjm · nashif · commit 6bc6e4e5c2f7 · 2024-11-16T14:06:37.000-05:00
Fixes Kconfigs for hwmv2 being defined in the wrong files

Signed-off-by: Jamie McCrae &lt;jamie.mccrae@nordicsemi.no&gt;
diff --git a/soc/mediatek/mtk_adsp/Kconfig b/soc/mediatek/mtk_adsp/Kconfig
@@ -2,18 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_FAMILY_MTK_ADSP
-	bool
 	select XTENSA
 	select XTENSA_GEN_HANDLERS
-	help
-	  Mediatek MT8xxx Series Audio DSPs
-
-config SOC_SERIES_MT8195_ADSP
-	bool
-	select SOC_FAMILY_MTK_ADSP
-	help
-	  Mediatek MT8195 Audio DSP
-
-config SOC_MT8195_ADSP
-	bool
-	select SOC_SERIES_MT8195_ADSP
diff --git a/soc/mediatek/mtk_adsp/Kconfig.defconfig b/soc/mediatek/mtk_adsp/Kconfig.defconfig
@@ -5,9 +5,6 @@ orsource "*/Kconfig.defconfig"
 
 if SOC_FAMILY_MTK_ADSP
 
-config SOC_FAMILY
-	default "mtk_adsp"
-
 config INTC_MTK_ADSP
 	default y
 
diff --git a/soc/mediatek/mtk_adsp/Kconfig.soc b/soc/mediatek/mtk_adsp/Kconfig.soc
@@ -1,8 +1,26 @@
 # Copyright 2024 The ChromiumOS Authors
 # SPDX-License-Identifier: Apache-2.0
 
+config SOC_FAMILY_MTK_ADSP
+	bool
+	help
+	  Mediatek MT8xxx Series Audio DSPs
+
+config SOC_SERIES_MT8195_ADSP
+	bool
+	select SOC_FAMILY_MTK_ADSP
+	help
+	  Mediatek MT8195 Audio DSP
+
 config SOC_MT8195_ADSP
 	bool
+	select SOC_SERIES_MT8195_ADSP
+
+config SOC_FAMILY
+	default "mtk_adsp" if SOC_FAMILY_MTK_ADSP
+
+config SOC_SERIES
+	default "mt8195_adsp" if SOC_SERIES_MT8195_ADSP
 
 config SOC
 	default "mt8195_adsp" if SOC_MT8195_ADSP
diff --git a/soc/mediatek/mtk_adsp/mt8195_adsp/Kconfig.defconfig b/soc/mediatek/mtk_adsp/mt8195_adsp/Kconfig.defconfig
@@ -3,12 +3,6 @@
 
 if SOC_SERIES_MT8195_ADSP
 
-config SOC
-	default "mt8195_adsp"
-
-config SOC_SERIES
-	default "mt8195_adsp"
-
 config NUM_2ND_LEVEL_AGGREGATORS
 	default 2
 config 2ND_LVL_INTR_00_OFFSET
