From acd18bfaf7d5605124c65e1b94881f4ac295df0d Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Tue, 6 Feb 2024 17:02:33 +0100 Subject: [PATCH] boards: xtensa: intel_adsp_ace20_lnl: move and convert to HWMv2 Move and convert to HWMv2 intel_adsp_ace20_lnl board configuration. Signed-off-by: Dmitrii Golovanov --- .../xtensa/intel_adsp_ace20_lnl/Kconfig.board | 8 -------- .../xtensa/intel_adsp_ace20_lnl/Kconfig.defconfig | 10 ---------- .../intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl | 5 +++++ .../xtensa => intel}/intel_adsp_ace20_lnl/board.cmake | 0 boards/intel/intel_adsp_ace20_lnl/board.yml | 5 +++++ .../intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts | 0 .../intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml | 0 .../intel_adsp_ace20_lnl_defconfig | 4 ---- 8 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.board delete mode 100644 boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.defconfig create mode 100644 boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace20_lnl/board.cmake (100%) create mode 100644 boards/intel/intel_adsp_ace20_lnl/board.yml rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig (70%) diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.board b/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.board deleted file mode 100644 index 26994dfb6c5..00000000000 --- a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_ACE20_LNL - bool "Intel ADSP ACE 2.0 Lunar Lake PCH" - depends on SOC_SERIES_INTEL_ACE diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.defconfig b/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.defconfig deleted file mode 100644 index 756481eba01..00000000000 --- a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_INTEL_ADSP_ACE20_LNL - -config BOARD - default "intel_adsp_ace20_lnl" - -endif # BOARD_INTEL_ADSP_ACE20_LNL diff --git a/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl b/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl new file mode 100644 index 00000000000..49b40b941d1 --- /dev/null +++ b/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl @@ -0,0 +1,5 @@ +# Copyright (c) 2022-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_ACE20_LNL + select SOC_INTEL_ACE20_LNL diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/board.cmake b/boards/intel/intel_adsp_ace20_lnl/board.cmake similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/board.cmake rename to boards/intel/intel_adsp_ace20_lnl/board.cmake diff --git a/boards/intel/intel_adsp_ace20_lnl/board.yml b/boards/intel/intel_adsp_ace20_lnl/board.yml new file mode 100644 index 00000000000..aadbf829f39 --- /dev/null +++ b/boards/intel/intel_adsp_ace20_lnl/board.yml @@ -0,0 +1,5 @@ +board: + name: intel_adsp_ace20_lnl + vendor: intel + socs: + - name: intel_ace20_lnl diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts b/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts rename to boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml b/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml rename to boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig b/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig similarity index 70% rename from boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig rename to boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig index 9be759e2e9a..3d897eb9673 100644 --- a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig +++ b/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig @@ -2,10 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_SERIES_INTEL_ACE=y -CONFIG_SOC_INTEL_ACE20_LNL=y -CONFIG_BOARD_INTEL_ADSP_ACE20_LNL=y - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n