Browse Source

boards: arm64: xenvm: Convert to v2

Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
pull/69687/head
Jamie McCrae 2 years ago
parent
commit
1e563b4ca3
  1. 3
      boards/v2/xenvm/Kconfig.defconfig
  2. 4
      boards/v2/xenvm/Kconfig.xenvm
  3. 7
      boards/v2/xenvm/board.yml
  4. 6
      boards/v2/xenvm/doc/index.rst
  5. 0
      boards/v2/xenvm/xenvm.dts
  6. 0
      boards/v2/xenvm/xenvm.yaml
  7. 3
      boards/v2/xenvm/xenvm_defconfig
  8. 2
      boards/v2/xenvm/xenvm_gicv3.yaml
  9. 0
      boards/v2/xenvm/xenvm_xenvm_gicv3.dts
  10. 3
      boards/v2/xenvm/xenvm_xenvm_gicv3_defconfig

3
boards/arm64/xenvm/Kconfig.defconfig → boards/v2/xenvm/Kconfig.defconfig

@ -6,7 +6,4 @@ if BOARD_XENVM
config BUILD_OUTPUT_BIN config BUILD_OUTPUT_BIN
default y default y
config BOARD
default "xenvm"
endif # BOARD_XENVM endif # BOARD_XENVM

4
boards/arm64/xenvm/Kconfig.board → boards/v2/xenvm/Kconfig.xenvm

@ -2,6 +2,4 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
config BOARD_XENVM config BOARD_XENVM
bool "Xen Virtual Machine" select SOC_XENVM
depends on SOC_XENVM
select ARM64

7
boards/v2/xenvm/board.yml

@ -0,0 +1,7 @@
board:
name: xenvm
vendor: Xen
socs:
- name: xenvm
variants:
- name: gicv3

6
boards/arm64/xenvm/doc/index.rst → boards/v2/xenvm/doc/index.rst

@ -60,7 +60,7 @@ Depending on the version of the GIC on your hardware, you may choose one of the
following board configurations: following board configurations:
- ``xenvm_defconfig`` selects GICv2 - ``xenvm_defconfig`` selects GICv2
- ``xenvm_gicv3_defconfig`` selects GICv3 - ``xenvm_xenvm_gicv3_defconfig`` selects GICv3
CPU Core type CPU Core type
------------- -------------
@ -106,7 +106,7 @@ guest, for example, with the :zephyr:code-sample:`synchronization` sample:
.. code-block:: .. code-block::
$ west build -b xenvm_gicv3 samples/synchronization $ west build -b xenvm//gicv3 samples/synchronization
This will build an image with the synchronization sample app. Next, you need to This will build an image with the synchronization sample app. Next, you need to
create guest configuration file :code:`zephyr.conf`. There is example: create guest configuration file :code:`zephyr.conf`. There is example:
@ -120,7 +120,7 @@ create guest configuration file :code:`zephyr.conf`. There is example:
gic_version="v2" gic_version="v2"
on_crash="preserve" on_crash="preserve"
When using ``xenvm_gicv3`` configuration, you need to remove the ``gic_version`` When using ``xenvm//gicv3`` configuration, you need to remove the ``gic_version``
parameter or set it to ``"v3"``. parameter or set it to ``"v3"``.
You need to upload both :code:`zephyr.bin` and :code:`zephyr.conf` to your Dom0 You need to upload both :code:`zephyr.bin` and :code:`zephyr.conf` to your Dom0

0
boards/arm64/xenvm/xenvm.dts → boards/v2/xenvm/xenvm.dts

0
boards/arm64/xenvm/xenvm.yaml → boards/v2/xenvm/xenvm.yaml

3
boards/arm64/xenvm/xenvm_defconfig → boards/v2/xenvm/xenvm_defconfig

@ -1,6 +1,3 @@
CONFIG_SOC_XENVM=y
CONFIG_BOARD_XENVM=y
# Enable UART driver # Enable UART driver
CONFIG_SERIAL=y CONFIG_SERIAL=y

2
boards/arm64/xenvm/xenvm_gicv3.yaml → boards/v2/xenvm/xenvm_gicv3.yaml

@ -1,4 +1,4 @@
identifier: xenvm_gicv3 identifier: xenvm//gicv3
name: ARMv8 Xen Virtual Machine With GICv3 name: ARMv8 Xen Virtual Machine With GICv3
type: mcu type: mcu
arch: arm64 arch: arm64

0
boards/arm64/xenvm/xenvm_gicv3.dts → boards/v2/xenvm/xenvm_xenvm_gicv3.dts

3
boards/arm64/xenvm/xenvm_gicv3_defconfig → boards/v2/xenvm/xenvm_xenvm_gicv3_defconfig

@ -1,6 +1,3 @@
CONFIG_SOC_XENVM=y
CONFIG_BOARD_XENVM=y
# Enable UART driver # Enable UART driver
CONFIG_SERIAL=y CONFIG_SERIAL=y
Loading…
Cancel
Save