diff --git a/boards/arm64/fvp_baser_aemv8r/Kconfig.defconfig b/boards/v2/arm/fvp_baser_aemv8r/Kconfig.defconfig similarity index 83% rename from boards/arm64/fvp_baser_aemv8r/Kconfig.defconfig rename to boards/v2/arm/fvp_baser_aemv8r/Kconfig.defconfig index 89a9b373803..980b88283d4 100644 --- a/boards/arm64/fvp_baser_aemv8r/Kconfig.defconfig +++ b/boards/v2/arm/fvp_baser_aemv8r/Kconfig.defconfig @@ -6,7 +6,4 @@ if BOARD_FVP_BASER_AEMV8R config BUILD_OUTPUT_BIN default y -config BOARD - default "fvp_baser_aemv8r" - endif # BOARD_FVP_BASER_AEMV8R diff --git a/boards/arm64/fvp_baser_aemv8r/Kconfig.board b/boards/v2/arm/fvp_baser_aemv8r/Kconfig.fvp_baser_aemv8r similarity index 65% rename from boards/arm64/fvp_baser_aemv8r/Kconfig.board rename to boards/v2/arm/fvp_baser_aemv8r/Kconfig.fvp_baser_aemv8r index 3b0c7ba7081..678939217eb 100644 --- a/boards/arm64/fvp_baser_aemv8r/Kconfig.board +++ b/boards/v2/arm/fvp_baser_aemv8r/Kconfig.fvp_baser_aemv8r @@ -2,5 +2,5 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_FVP_BASER_AEMV8R - bool "FVP BaseR AEMv8R simulation board" - depends on SOC_FVP_AEMV8R_AARCH64 + select SOC_SERIES_FVP_AEMV8R + select SOC_FVP_AEMV8R_AARCH64 diff --git a/boards/arm64/fvp_baser_aemv8r/board.cmake b/boards/v2/arm/fvp_baser_aemv8r/board.cmake similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/board.cmake rename to boards/v2/arm/fvp_baser_aemv8r/board.cmake diff --git a/boards/v2/arm/fvp_baser_aemv8r/board.yml b/boards/v2/arm/fvp_baser_aemv8r/board.yml new file mode 100644 index 00000000000..b6c979371ae --- /dev/null +++ b/boards/v2/arm/fvp_baser_aemv8r/board.yml @@ -0,0 +1,7 @@ +board: + name: fvp_baser_aemv8r + vendor: ARM + socs: + - name: fvp_aemv8r_aarch64 + variants: + - name: 'smp' diff --git a/boards/arm64/fvp_baser_aemv8r/doc/debug-with-arm-ds.rst b/boards/v2/arm/fvp_baser_aemv8r/doc/debug-with-arm-ds.rst similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/debug-with-arm-ds.rst rename to boards/v2/arm/fvp_baser_aemv8r/doc/debug-with-arm-ds.rst diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/DS-debug-working.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/DS-debug-working.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/DS-debug-working.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/DS-debug-working.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-configuration-database.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-configuration-database.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_database-name.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-configuration-database_database-name.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_database-name.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-configuration-database_database-name.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_shown-in-project-explorer.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-configuration-database_shown-in-project-explorer.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/create-new-configuration-database_shown-in-project-explorer.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-configuration-database_shown-in-project-explorer.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_connection.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_connection.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_connection.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_connection.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_context-menu.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_context-menu.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_context-menu.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_context-menu.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_debugger.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_debugger.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_debugger.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_debugger.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_files.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_files.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_files.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-launch-configuration_files.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-model-configuration.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-model-configuration.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-path.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-path.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-path.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-path.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-use-V8R64-Generic.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-use-V8R64-Generic.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-use-V8R64-Generic.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/create-new-model-configuration_model-use-V8R64-Generic.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-ds.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/perspective-choose-ds.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-ds.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/perspective-choose-ds.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-other.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/perspective-choose-other.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/perspective-choose-other.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/perspective-choose-other.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/images/version-info.jpg b/boards/v2/arm/fvp_baser_aemv8r/doc/images/version-info.jpg similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/images/version-info.jpg rename to boards/v2/arm/fvp_baser_aemv8r/doc/images/version-info.jpg diff --git a/boards/arm64/fvp_baser_aemv8r/doc/index.rst b/boards/v2/arm/fvp_baser_aemv8r/doc/index.rst similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/doc/index.rst rename to boards/v2/arm/fvp_baser_aemv8r/doc/index.rst diff --git a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r.dts b/boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r.dts similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r.dts rename to boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r.dts diff --git a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r.yaml b/boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r.yaml similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r.yaml rename to boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r.yaml diff --git a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_defconfig b/boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_defconfig similarity index 81% rename from boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_defconfig rename to boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_defconfig index 7876a745327..fb029e44ab5 100644 --- a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_defconfig +++ b/boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_FVP_AEMV8R=y -CONFIG_SOC_FVP_AEMV8R_AARCH64=y -CONFIG_BOARD_FVP_BASER_AEMV8R=y - # Cache management CONFIG_CACHE_MANAGEMENT=y diff --git a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp.dts b/boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_fvp_aemv8r_aarch64_smp.dts similarity index 100% rename from boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp.dts rename to boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_fvp_aemv8r_aarch64_smp.dts diff --git a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp.yaml b/boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_fvp_aemv8r_aarch64_smp.yaml similarity index 89% rename from boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp.yaml rename to boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_fvp_aemv8r_aarch64_smp.yaml index ed63f35d101..c9032f91f1e 100644 --- a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp.yaml +++ b/boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_fvp_aemv8r_aarch64_smp.yaml @@ -1,7 +1,7 @@ # Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved. # SPDX-License-Identifier: Apache-2.0 -identifier: fvp_baser_aemv8r_smp +identifier: fvp_baser_aemv8r//smp name: FVP Emulation FVP_BaseR_AEMv8R (SMP) arch: arm64 type: sim diff --git a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp_defconfig b/boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_fvp_aemv8r_aarch64_smp_defconfig similarity index 87% rename from boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp_defconfig rename to boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_fvp_aemv8r_aarch64_smp_defconfig index 9a96f0b3d4f..f4d84e08113 100644 --- a/boards/arm64/fvp_baser_aemv8r/fvp_baser_aemv8r_smp_defconfig +++ b/boards/v2/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_fvp_aemv8r_aarch64_smp_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved. # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_FVP_AEMV8R=y -CONFIG_SOC_FVP_AEMV8R_AARCH64=y -CONFIG_BOARD_FVP_BASER_AEMV8R=y - # Cache management CONFIG_CACHE_MANAGEMENT=y