diff --git a/soc/arm64/qemu_virt_arm64/CMakeLists.txt b/soc/v2/arm/qemu_virt_arm64/CMakeLists.txt similarity index 100% rename from soc/arm64/qemu_virt_arm64/CMakeLists.txt rename to soc/v2/arm/qemu_virt_arm64/CMakeLists.txt diff --git a/soc/arm64/qemu_virt_arm64/Kconfig.soc b/soc/v2/arm/qemu_virt_arm64/Kconfig similarity index 78% rename from soc/arm64/qemu_virt_arm64/Kconfig.soc rename to soc/v2/arm/qemu_virt_arm64/Kconfig index 109e8e3270a..7c5f7aee6f9 100644 --- a/soc/arm64/qemu_virt_arm64/Kconfig.soc +++ b/soc/v2/arm/qemu_virt_arm64/Kconfig @@ -2,7 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_QEMU_VIRT_ARM64 - bool "QEMU virt platform (AArch64 for KVM)" select ARM64 select CPU_CORTEX_A select ARMV8_A diff --git a/soc/arm64/qemu_virt_arm64/Kconfig.defconfig b/soc/v2/arm/qemu_virt_arm64/Kconfig.defconfig similarity index 94% rename from soc/arm64/qemu_virt_arm64/Kconfig.defconfig rename to soc/v2/arm/qemu_virt_arm64/Kconfig.defconfig index 14c6c333450..e1a38613040 100644 --- a/soc/arm64/qemu_virt_arm64/Kconfig.defconfig +++ b/soc/v2/arm/qemu_virt_arm64/Kconfig.defconfig @@ -3,9 +3,6 @@ if SOC_QEMU_VIRT_ARM64 -config SOC - default "qemu_virt_arm64" - config NUM_IRQS # must be >= the highest interrupt number used # - include the UART interrupts diff --git a/soc/v2/arm/qemu_virt_arm64/Kconfig.soc b/soc/v2/arm/qemu_virt_arm64/Kconfig.soc new file mode 100644 index 00000000000..e539b4a40cd --- /dev/null +++ b/soc/v2/arm/qemu_virt_arm64/Kconfig.soc @@ -0,0 +1,9 @@ +# Copyright (c) 2022 Huawei France Technologies SAS +# SPDX-License-Identifier: Apache-2.0 + +config SOC_QEMU_VIRT_ARM64 + bool + select SOC_FAMILY_ARM64 + +config SOC + default "qemu_virt_arm64" if SOC_QEMU_VIRT_ARM64 diff --git a/soc/arm64/qemu_virt_arm64/mmu_regions.c b/soc/v2/arm/qemu_virt_arm64/mmu_regions.c similarity index 100% rename from soc/arm64/qemu_virt_arm64/mmu_regions.c rename to soc/v2/arm/qemu_virt_arm64/mmu_regions.c diff --git a/soc/v2/arm/soc.yml b/soc/v2/arm/soc.yml index 0b2be152b4e..f4c198873dc 100644 --- a/soc/v2/arm/soc.yml +++ b/soc/v2/arm/soc.yml @@ -9,3 +9,4 @@ family: - name: fvp_aemv8r_aarch64 socs: - name: qemu_cortex_a53 + - name: qemu_virt_arm64