boards: x86: acrn: move and convert to HWMv2

Move and convert to HWMv2 `acrn` and `acrn_ehl_crb` board
configurations.

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
This commit is contained in:
Dmitrii Golovanov 2024-02-12 16:28:43 +01:00 committed by Jamie McCrae
parent ec7f7b3c30
commit d2f001e320
17 changed files with 44 additions and 21 deletions

17
boards/acrn/Kconfig Normal file
View File

@ -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"

6
boards/acrn/Kconfig.acrn Normal file
View File

@ -0,0 +1,6 @@
# Copyright (c) 2019-2024 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
config BOARD_ACRN
select SOC_IA32

View File

@ -0,0 +1,6 @@
# Copyright (c) 2019-2024 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
config BOARD_ACRN_EHL_CRB
select SOC_IA32

View File

@ -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

View File

@ -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

View File

@ -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

9
boards/acrn/board.yml Normal file
View File

@ -0,0 +1,9 @@
boards:
- name: acrn
socs:
- name: ia32
- name: acrn_ehl_crb
socs:
- name: elkhart_lake

View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -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