boards: xtensa: Merge intel_adsp_cavs25 variants into one directory

Merges the intel_adsp_cavs25_tgph and intel_adsp_cavs25 board variants into a shared directory to reduce code duplication and align with the layout used by other multicore boards (e.g., lpcxpresso55s69, mimxrt1170_evk, nrf9160). Note that this change does not affect the names of the board definitions and therefore does not affect the west command line parameters needed to build a Zephyr application. Signed-off-by: Maureen Helm <[email protected]>
zephyrproject-rtos · Mar 5, 2022 · c32d10c · c32d10c
1 parent b9c345b
commit c32d10c
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 48 deletions.
diff --git a/boards/xtensa/intel_adsp_cavs25/Kconfig.board b/boards/xtensa/intel_adsp_cavs25/Kconfig.board
@@ -6,3 +6,7 @@
 config  BOARD_INTEL_ADSP_CAVS25
 	bool "Intel ADSP CAVS 2.5"
 	depends on SOC_SERIES_INTEL_CAVS_V25
+
+config  BOARD_INTEL_ADSP_CAVS25_TGPH
+	bool "Intel ADSP CAVS 2.5 for Tiger Lake H PCH"
+	depends on SOC_SERIES_INTEL_CAVS_V25
diff --git a/boards/xtensa/intel_adsp_cavs25/Kconfig.defconfig b/boards/xtensa/intel_adsp_cavs25/Kconfig.defconfig
@@ -2,9 +2,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_INTEL_ADSP_CAVS25
+if BOARD_INTEL_ADSP_CAVS25 || BOARD_INTEL_ADSP_CAVS25_TGPH
 
 config BOARD
-	default "intel_adsp_cavs25"
+	default "intel_adsp_cavs25" if BOARD_INTEL_ADSP_CAVS25
+	default "intel_adsp_cavs25_tgph" if BOARD_INTEL_ADSP_CAVS25_TGPH
 
-endif # BOARD_INTEL_ADSP_CAVS25
+endif # BOARD_INTEL_ADSP_CAVS25 || BOARD_INTEL_ADSP_CAVS25_TGPH
diff --git a/boards/xtensa/intel_adsp_cavs25/board.cmake b/boards/xtensa/intel_adsp_cavs25/board.cmake
@@ -3,4 +3,10 @@
 board_set_flasher_ifnset(misc-flasher)
 board_finalize_runner_args(misc-flasher)
 
+if(CONFIG_BOARD_INTEL_ADSP_CAVS25)
 board_set_rimage_target(tgl)
+endif()
+
+if(CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH)
+board_set_rimage_target(tgl-h)
+endif()
diff --git a/...sp_cavs25_tgph/intel_adsp_cavs25_tgph.dts → ...el_adsp_cavs25/intel_adsp_cavs25_tgph.dts b/...sp_cavs25_tgph/intel_adsp_cavs25_tgph.dts → ...el_adsp_cavs25/intel_adsp_cavs25_tgph.dts
diff --git a/...p_cavs25_tgph/intel_adsp_cavs25_tgph.yaml → ...l_adsp_cavs25/intel_adsp_cavs25_tgph.yaml b/...p_cavs25_tgph/intel_adsp_cavs25_tgph.yaml → ...l_adsp_cavs25/intel_adsp_cavs25_tgph.yaml
diff --git a/...s25_tgph/intel_adsp_cavs25_tgph_defconfig → ...p_cavs25/intel_adsp_cavs25_tgph_defconfig b/...s25_tgph/intel_adsp_cavs25_tgph_defconfig → ...p_cavs25/intel_adsp_cavs25_tgph_defconfig
diff --git a/boards/xtensa/intel_adsp_cavs25_tgph/Kconfig.board b/boards/xtensa/intel_adsp_cavs25_tgph/Kconfig.board
diff --git a/boards/xtensa/intel_adsp_cavs25_tgph/Kconfig.defconfig b/boards/xtensa/intel_adsp_cavs25_tgph/Kconfig.defconfig
diff --git a/boards/xtensa/intel_adsp_cavs25_tgph/board.cmake b/boards/xtensa/intel_adsp_cavs25_tgph/board.cmake
diff --git a/boards/xtensa/intel_adsp_cavs25_tgph/doc/index.rst b/boards/xtensa/intel_adsp_cavs25_tgph/doc/index.rst