diff --git a/boards/arm64/qemu_cortex_a53/Kconfig.board b/boards/v2/qemu/qemu_cortex_a53/Kconfig similarity index 63% rename from boards/arm64/qemu_cortex_a53/Kconfig.board rename to boards/v2/qemu/qemu_cortex_a53/Kconfig index c14d70c2b72..13f79db59cb 100644 --- a/boards/arm64/qemu_cortex_a53/Kconfig.board +++ b/boards/v2/qemu/qemu_cortex_a53/Kconfig @@ -1,14 +1,8 @@ # Copyright (c) 2019 Carlo Caione # SPDX-License-Identifier: Apache-2.0 -config BOARD_QEMU_CORTEX_A53 - bool "Cortex-A53 Emulation (QEMU)" - depends on SOC_QEMU_CORTEX_A53 - select ARM64 - select QEMU_TARGET - config QEMU_CORTEX_A53_ETH_E1000 - bool "Use Intel e1000 Ethernet driver for networking" + bool default y if !NET_TEST depends on BOARD_QEMU_CORTEX_A53 && NETWORKING && DT_HAS_INTEL_E1000_ENABLED select ETH_E1000 diff --git a/boards/arm64/qemu_cortex_a53/Kconfig.defconfig b/boards/v2/qemu/qemu_cortex_a53/Kconfig.defconfig similarity index 94% rename from boards/arm64/qemu_cortex_a53/Kconfig.defconfig rename to boards/v2/qemu/qemu_cortex_a53/Kconfig.defconfig index 8f10806f7ba..6788fda8ebb 100644 --- a/boards/arm64/qemu_cortex_a53/Kconfig.defconfig +++ b/boards/v2/qemu/qemu_cortex_a53/Kconfig.defconfig @@ -6,9 +6,6 @@ if BOARD_QEMU_CORTEX_A53 config BUILD_OUTPUT_BIN default y -config BOARD - default "qemu_cortex_a53" - config MAX_THREAD_BYTES default 3 diff --git a/boards/v2/qemu/qemu_cortex_a53/Kconfig.qemu_cortex_a53 b/boards/v2/qemu/qemu_cortex_a53/Kconfig.qemu_cortex_a53 new file mode 100644 index 00000000000..a7d876a9e55 --- /dev/null +++ b/boards/v2/qemu/qemu_cortex_a53/Kconfig.qemu_cortex_a53 @@ -0,0 +1,5 @@ +# Copyright (c) 2019 Carlo Caione +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_CORTEX_A53 + select SOC_QEMU_CORTEX_A53 diff --git a/boards/arm64/qemu_cortex_a53/board.cmake b/boards/v2/qemu/qemu_cortex_a53/board.cmake similarity index 88% rename from boards/arm64/qemu_cortex_a53/board.cmake rename to boards/v2/qemu/qemu_cortex_a53/board.cmake index 4935438e4b7..7cc424e4544 100644 --- a/boards/arm64/qemu_cortex_a53/board.cmake +++ b/boards/v2/qemu/qemu_cortex_a53/board.cmake @@ -7,9 +7,9 @@ set(QEMU_ARCH aarch64) set(QEMU_CPU_TYPE_${ARCH} cortex-a53) if(CONFIG_ARMV8_A_NS) -set(QEMU_MACH virt,gic-version=3) + set(QEMU_MACH virt,gic-version=3) else() -set(QEMU_MACH virt,secure=on,gic-version=3) + set(QEMU_MACH virt,secure=on,gic-version=3) endif() set(QEMU_FLAGS_${ARCH} diff --git a/boards/v2/qemu/qemu_cortex_a53/board.yml b/boards/v2/qemu/qemu_cortex_a53/board.yml new file mode 100644 index 00000000000..220417cb321 --- /dev/null +++ b/boards/v2/qemu/qemu_cortex_a53/board.yml @@ -0,0 +1,8 @@ +board: + name: qemu_cortex_a53 + vendor: ARM + socs: + - name: qemu_cortex_a53 + variants: + - name: smp + - name: xip diff --git a/boards/arm64/qemu_cortex_a53/doc/index.rst b/boards/v2/qemu/qemu_cortex_a53/doc/index.rst similarity index 100% rename from boards/arm64/qemu_cortex_a53/doc/index.rst rename to boards/v2/qemu/qemu_cortex_a53/doc/index.rst diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53.dts b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53.dts similarity index 100% rename from boards/arm64/qemu_cortex_a53/qemu_cortex_a53.dts rename to boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53.dts diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53.yaml b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53.yaml similarity index 100% rename from boards/arm64/qemu_cortex_a53/qemu_cortex_a53.yaml rename to boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53.yaml diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_defconfig b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_defconfig similarity index 84% rename from boards/arm64/qemu_cortex_a53/qemu_cortex_a53_defconfig rename to boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_defconfig index e697012a690..b80f76646d2 100644 --- a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_defconfig +++ b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_CORTEX_A53=y -CONFIG_BOARD_QEMU_CORTEX_A53=y CONFIG_ARM_ARCH_TIMER=y # Cache management diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp.dts b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_smp.dts similarity index 100% rename from boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp.dts rename to boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_smp.dts diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp.yaml b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_smp.yaml similarity index 87% rename from boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp.yaml rename to boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_smp.yaml index 9a6e87c0a70..d0c5677ee3e 100644 --- a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp.yaml +++ b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_smp.yaml @@ -1,4 +1,4 @@ -identifier: qemu_cortex_a53_smp +identifier: qemu_cortex_a53//smp name: QEMU Emulation for Cortex-A53 SMP type: qemu simulation: qemu diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp_defconfig b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_smp_defconfig similarity index 89% rename from boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp_defconfig rename to boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_smp_defconfig index ad9011aa3b7..63099649065 100644 --- a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_smp_defconfig +++ b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_smp_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_CORTEX_A53=y -CONFIG_BOARD_QEMU_CORTEX_A53=y CONFIG_ARM_ARCH_TIMER=y # Cache management diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip.dts b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_xip.dts similarity index 100% rename from boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip.dts rename to boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_xip.dts diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip.yaml b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_xip.yaml similarity index 85% rename from boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip.yaml rename to boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_xip.yaml index 5654908d3d2..38d4e6e9cc6 100644 --- a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip.yaml +++ b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_xip.yaml @@ -1,4 +1,4 @@ -identifier: qemu_cortex_a53_xip +identifier: qemu_cortex_a53//xip name: QEMU Emulation for Cortex-A53 (XIP) type: qemu simulation: qemu diff --git a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip_defconfig b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_xip_defconfig similarity index 85% rename from boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip_defconfig rename to boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_xip_defconfig index d2dbdc1fc51..f4d5f85dd55 100644 --- a/boards/arm64/qemu_cortex_a53/qemu_cortex_a53_xip_defconfig +++ b/boards/v2/qemu/qemu_cortex_a53/qemu_cortex_a53_qemu_cortex_a53_xip_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_CORTEX_A53=y -CONFIG_BOARD_QEMU_CORTEX_A53=y CONFIG_ARM_ARCH_TIMER=y # Cache management