From c107a6abeb6dfec2983c820a74ac7d1836603e83 Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Fri, 14 Feb 2025 12:43:29 -0800 Subject: [PATCH] boards: intel_adsp: move MAIN_STACK_SIZE to Kconfig.defconfig This moves CONFIG_MAIN_STACK_SIZE from _defconfig into Kconfig.defconfig. Signed-off-by: Daniel Leung --- boards/intel/adsp/Kconfig.defconfig | 15 +++++++++++++++ boards/intel/adsp/intel_adsp_ace15_mtpm_defconfig | 2 -- .../adsp/intel_adsp_ace15_mtpm_sim_defconfig | 2 -- boards/intel/adsp/intel_adsp_ace20_lnl_defconfig | 2 -- .../intel/adsp/intel_adsp_ace20_lnl_sim_defconfig | 1 - boards/intel/adsp/intel_adsp_ace30_defconfig | 2 -- boards/intel/adsp/intel_adsp_ace30_ptl_defconfig | 2 -- .../intel/adsp/intel_adsp_ace30_ptl_sim_defconfig | 2 -- boards/intel/adsp/intel_adsp_cavs25_defconfig | 2 -- .../intel/adsp/intel_adsp_cavs25_tgph_defconfig | 2 -- 10 files changed, 15 insertions(+), 17 deletions(-) diff --git a/boards/intel/adsp/Kconfig.defconfig b/boards/intel/adsp/Kconfig.defconfig index eafedb0c550..8c804c48c75 100644 --- a/boards/intel/adsp/Kconfig.defconfig +++ b/boards/intel/adsp/Kconfig.defconfig @@ -8,3 +8,18 @@ config DAI_SSP_HAS_POWER_CONTROL def_bool y endif + +if BOARD_INTEL_ADSP + +config MAIN_STACK_SIZE + default 2048 if BOARD_INTEL_ADSP_CAVS25 + default 2048 if BOARD_INTEL_ADSP_CAVS25_TGPH + default 2048 if BOARD_INTEL_ADSP_ACE15_MTPM + default 2048 if BOARD_INTEL_ADSP_ACE15_MTPM_SIM + default 2048 if BOARD_INTEL_ADSP_ACE20_LNL + default 2048 if BOARD_INTEL_ADSP_ACE20_LNL_SIM + default 4096 if BOARD_INTEL_ADSP_ACE30 + default 4096 if BOARD_INTEL_ADSP_ACE30_PTL + default 4096 if BOARD_INTEL_ADSP_ACE30_PTL_SIM + +endif # BOARD_INTEL_ADSP diff --git a/boards/intel/adsp/intel_adsp_ace15_mtpm_defconfig b/boards/intel/adsp/intel_adsp_ace15_mtpm_defconfig index 2237dfb963a..9c0d2ca0cda 100644 --- a/boards/intel/adsp/intel_adsp_ace15_mtpm_defconfig +++ b/boards/intel/adsp/intel_adsp_ace15_mtpm_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_MAIN_STACK_SIZE=2048 - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/intel/adsp/intel_adsp_ace15_mtpm_sim_defconfig b/boards/intel/adsp/intel_adsp_ace15_mtpm_sim_defconfig index 7a051327234..8c36c0e39dd 100644 --- a/boards/intel/adsp/intel_adsp_ace15_mtpm_sim_defconfig +++ b/boards/intel/adsp/intel_adsp_ace15_mtpm_sim_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_MAIN_STACK_SIZE=2048 - CONFIG_INTEL_ADSP_SIM=y CONFIG_INTEL_ADSP_SIM_NO_SECONDARY_CORE_FLOW=y diff --git a/boards/intel/adsp/intel_adsp_ace20_lnl_defconfig b/boards/intel/adsp/intel_adsp_ace20_lnl_defconfig index 3d897eb9673..4f2503e2afc 100644 --- a/boards/intel/adsp/intel_adsp_ace20_lnl_defconfig +++ b/boards/intel/adsp/intel_adsp_ace20_lnl_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_MAIN_STACK_SIZE=2048 - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/intel/adsp/intel_adsp_ace20_lnl_sim_defconfig b/boards/intel/adsp/intel_adsp_ace20_lnl_sim_defconfig index 5f03e403e3c..6acb302da0b 100644 --- a/boards/intel/adsp/intel_adsp_ace20_lnl_sim_defconfig +++ b/boards/intel/adsp/intel_adsp_ace20_lnl_sim_defconfig @@ -1,6 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_MAIN_STACK_SIZE=2048 CONFIG_INTEL_ADSP_SIM=y CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/intel/adsp/intel_adsp_ace30_defconfig b/boards/intel/adsp/intel_adsp_ace30_defconfig index 913d2a8c3e3..85f377409f7 100644 --- a/boards/intel/adsp/intel_adsp_ace30_defconfig +++ b/boards/intel/adsp/intel_adsp_ace30_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_MAIN_STACK_SIZE=4096 - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/intel/adsp/intel_adsp_ace30_ptl_defconfig b/boards/intel/adsp/intel_adsp_ace30_ptl_defconfig index 913d2a8c3e3..85f377409f7 100644 --- a/boards/intel/adsp/intel_adsp_ace30_ptl_defconfig +++ b/boards/intel/adsp/intel_adsp_ace30_ptl_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_MAIN_STACK_SIZE=4096 - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/intel/adsp/intel_adsp_ace30_ptl_sim_defconfig b/boards/intel/adsp/intel_adsp_ace30_ptl_sim_defconfig index 429223286bf..5373f0c0bf8 100644 --- a/boards/intel/adsp/intel_adsp_ace30_ptl_sim_defconfig +++ b/boards/intel/adsp/intel_adsp_ace30_ptl_sim_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_MAIN_STACK_SIZE=2048 - CONFIG_INTEL_ADSP_SIM=y CONFIG_INTEL_ADSP_SIM_NO_SECONDARY_CORE_FLOW=y diff --git a/boards/intel/adsp/intel_adsp_cavs25_defconfig b/boards/intel/adsp/intel_adsp_cavs25_defconfig index 24443bce131..37aab5b06d4 100644 --- a/boards/intel/adsp/intel_adsp_cavs25_defconfig +++ b/boards/intel/adsp/intel_adsp_cavs25_defconfig @@ -2,8 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_MAIN_STACK_SIZE=2048 - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig b/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig index 7e79840a033..d842740df75 100644 --- a/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig +++ b/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig @@ -2,8 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_MAIN_STACK_SIZE=2048 - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n