diff --git a/boards/boards_legacy/x86/acrn/CMakeLists.txt b/boards/acrn/CMakeLists.txt similarity index 100% rename from boards/boards_legacy/x86/acrn/CMakeLists.txt rename to boards/acrn/CMakeLists.txt diff --git a/boards/acrn/Kconfig b/boards/acrn/Kconfig new file mode 100644 index 00000000000..7d7b97605a4 --- /dev/null +++ b/boards/acrn/Kconfig @@ -0,0 +1,17 @@ +# Copyright (c) 2019-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACRN + bool + select CPU_HAS_FPU + select X86_64 + help + "ACRN User OS" + +config BOARD_ACRN_EHL_CRB + bool + select CPU_HAS_FPU + select X86_64 + help + "ACRN User OS on ElkhartLake CRB" diff --git a/boards/acrn/Kconfig.acrn b/boards/acrn/Kconfig.acrn new file mode 100644 index 00000000000..5076ce64538 --- /dev/null +++ b/boards/acrn/Kconfig.acrn @@ -0,0 +1,6 @@ +# Copyright (c) 2019-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACRN + select SOC_IA32 diff --git a/boards/acrn/Kconfig.acrn_ehl_crb b/boards/acrn/Kconfig.acrn_ehl_crb new file mode 100644 index 00000000000..da0a8c65069 --- /dev/null +++ b/boards/acrn/Kconfig.acrn_ehl_crb @@ -0,0 +1,6 @@ +# Copyright (c) 2019-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ACRN_EHL_CRB + select SOC_IA32 diff --git a/boards/boards_legacy/x86/acrn/Kconfig.defconfig b/boards/acrn/Kconfig.defconfig similarity index 55% rename from boards/boards_legacy/x86/acrn/Kconfig.defconfig rename to boards/acrn/Kconfig.defconfig index a1a8936e38b..678c8a5e378 100644 --- a/boards/boards_legacy/x86/acrn/Kconfig.defconfig +++ b/boards/acrn/Kconfig.defconfig @@ -1,17 +1,10 @@ -# Copyright (c) 2021 Intel Corporation +# Copyright (c) 2021-2024 Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 -if BOARD_ACRN - -config BOARD - default "acrn" - depends on BOARD_ACRN - config MP_MAX_NUM_CPUS default 2 config HEAP_MEM_POOL_ADD_SIZE_ACPI default 32768 depends on ACPI - -endif diff --git a/boards/boards_legacy/x86/acrn/acrn.dts b/boards/acrn/acrn.dts similarity index 100% rename from boards/boards_legacy/x86/acrn/acrn.dts rename to boards/acrn/acrn.dts diff --git a/boards/boards_legacy/x86/acrn/acrn.yaml b/boards/acrn/acrn.yaml similarity index 100% rename from boards/boards_legacy/x86/acrn/acrn.yaml rename to boards/acrn/acrn.yaml diff --git a/boards/boards_legacy/x86/acrn/acrn_defconfig b/boards/acrn/acrn_defconfig similarity index 88% rename from boards/boards_legacy/x86/acrn/acrn_defconfig rename to boards/acrn/acrn_defconfig index 2f72c30dce8..0ec5c2b2564 100644 --- a/boards/boards_legacy/x86/acrn/acrn_defconfig +++ b/boards/acrn/acrn_defconfig @@ -1,7 +1,7 @@ +# Copyright (c) 2019-2024 Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_ACRN=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_APIC_TSC_DEADLINE_TIMER=y diff --git a/boards/boards_legacy/x86/acrn/acrn_ehl_crb.dts b/boards/acrn/acrn_ehl_crb.dts similarity index 100% rename from boards/boards_legacy/x86/acrn/acrn_ehl_crb.dts rename to boards/acrn/acrn_ehl_crb.dts diff --git a/boards/boards_legacy/x86/acrn/acrn_ehl_crb.yaml b/boards/acrn/acrn_ehl_crb.yaml similarity index 100% rename from boards/boards_legacy/x86/acrn/acrn_ehl_crb.yaml rename to boards/acrn/acrn_ehl_crb.yaml diff --git a/boards/boards_legacy/x86/acrn/acrn_ehl_crb_defconfig b/boards/acrn/acrn_ehl_crb_defconfig similarity index 90% rename from boards/boards_legacy/x86/acrn/acrn_ehl_crb_defconfig rename to boards/acrn/acrn_ehl_crb_defconfig index 5e3af1f8be3..f7b256d2c84 100644 --- a/boards/boards_legacy/x86/acrn/acrn_ehl_crb_defconfig +++ b/boards/acrn/acrn_ehl_crb_defconfig @@ -1,7 +1,7 @@ +# Copyright (c) 2019-2024 Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_IA32=y -CONFIG_BOARD_ACRN=y CONFIG_PIC_DISABLE=y CONFIG_LOAPIC=y CONFIG_X2APIC=y diff --git a/boards/boards_legacy/x86/acrn/board.cmake b/boards/acrn/board.cmake similarity index 100% rename from boards/boards_legacy/x86/acrn/board.cmake rename to boards/acrn/board.cmake diff --git a/boards/acrn/board.yml b/boards/acrn/board.yml new file mode 100644 index 00000000000..f98a4053506 --- /dev/null +++ b/boards/acrn/board.yml @@ -0,0 +1,9 @@ +boards: + + - name: acrn + socs: + - name: ia32 + + - name: acrn_ehl_crb + socs: + - name: elkhart_lake diff --git a/boards/boards_legacy/x86/acrn/board_acrn.c b/boards/acrn/board_acrn.c similarity index 100% rename from boards/boards_legacy/x86/acrn/board_acrn.c rename to boards/acrn/board_acrn.c diff --git a/boards/boards_legacy/x86/acrn/doc/ACRN-Hybrid.jpg b/boards/acrn/doc/ACRN-Hybrid.jpg similarity index 100% rename from boards/boards_legacy/x86/acrn/doc/ACRN-Hybrid.jpg rename to boards/acrn/doc/ACRN-Hybrid.jpg diff --git a/boards/boards_legacy/x86/acrn/doc/index.rst b/boards/acrn/doc/index.rst similarity index 100% rename from boards/boards_legacy/x86/acrn/doc/index.rst rename to boards/acrn/doc/index.rst diff --git a/boards/boards_legacy/x86/acrn/Kconfig.board b/boards/boards_legacy/x86/acrn/Kconfig.board deleted file mode 100644 index e8fa3f42987..00000000000 --- a/boards/boards_legacy/x86/acrn/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2019 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ACRN - bool "ACRN User OS" - depends on SOC_IA32 - select CPU_HAS_FPU - select X86_64