diff --git a/.ostc-ci/machines-and-flavours.yaml b/.ostc-ci/machines-and-flavours.yaml index 49210caea4ac60d5e31d053b1985b35a136319dc..f4dc5f66240c6234cd4d4eca8f672a680146f709 100644 --- a/.ostc-ci/machines-and-flavours.yaml +++ b/.ostc-ci/machines-and-flavours.yaml @@ -33,22 +33,6 @@ linux-qemu-x86_64: OHOS_BUILD_CACHE: "pub" OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1 -linux-qemu-arm: - extends: .build-linux - variables: - MACHINE: qemuarm - # See the note on linux-qemu-x86. - OHOS_BUILD_CACHE: "pub" - OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1 - -linux-qemu-arm64: - extends: .build-linux - variables: - MACHINE: qemuarm64 - # See the note on linux-qemu-x86. - OHOS_BUILD_CACHE: "pub" - OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1 - linux-seco-intel-b68: extends: .build-linux variables: diff --git a/docs/ci/machines-and-flavours.rst b/docs/ci/machines-and-flavours.rst index f546394d6a126492feddff2482b424ccc2e29b17..80bbcc9f659b22f5d38446b2eec62322554d6d71 100644 --- a/docs/ci/machines-and-flavours.rst +++ b/docs/ci/machines-and-flavours.rst @@ -35,26 +35,6 @@ All Scenarios OS software can be built for a basic 64bit x86 virtual machine. The cache for this job is publicly available. -linux-qemu-arm -.............. - -This job extends `.build-linux` job from the manifest repository and builds -``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using -the Linux flavour of All Scenarios OS and ``MACHINE=qemuarm``. This job checks that -All Scenarios OS software can be built for a basic 32bit ARMv7 virtual machine. - -The cache for this job is publicly available. - -linux-qemu-arm64 -................ - -This job extends `.build-linux` job from the manifest repository and builds -``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using -the Linux flavour of All Scenarios OS and ``MACHINE=qemuarm64``. This job checks that -All Scenarios OS software can be built for a basic 64bit ARMv8 virtual machine. - -The cache for this job is publicly available. - linux-seco-intel-b68 .................... diff --git a/docs/hardware-support/virtual-boards/index.rst b/docs/hardware-support/virtual-boards/index.rst index 134dfff22257a039b8549ed5a4c6506ced0563f2..8864f5a577c552e0f5530adbae2d3eb31ca5ca1f 100644 --- a/docs/hardware-support/virtual-boards/index.rst +++ b/docs/hardware-support/virtual-boards/index.rst @@ -12,5 +12,3 @@ This section details the support for virtual targets in All Scenario OS. qemux86-64 qemux86 - qemuarm - qemuarm64 diff --git a/docs/hardware-support/virtual-boards/qemuarm.rst b/docs/hardware-support/virtual-boards/qemuarm.rst deleted file mode 100644 index b0e8da860689e2aa5cdd55392af6d1e65514b8f0..0000000000000000000000000000000000000000 --- a/docs/hardware-support/virtual-boards/qemuarm.rst +++ /dev/null @@ -1,49 +0,0 @@ -.. SPDX-FileCopyrightText: Huawei Inc. -.. -.. SPDX-License-Identifier: CC-BY-4.0 - -Qemu ARM -######## - -.. contents:: - :depth: 4 - -Overview -******** - -All Scenarios OS supports running the software stack into an virtual environment using Qemu. - -Building OHOS image -=================== - -To clone the source code, perform the procedure in: :ref:`Setting up a repo workspace <RepoWorkspace>`. - -Building a Linux image -====================== - -Build steps ------------ - -1. Source the environment with proper template settings, flavour being *linux* - and target machine being *qemuarm*. Pay attention to how relative paths are - constructed. The value of *TEMPLATECONF* is relative to the location of the - build directory *./build-ohos-linux*, that is going to be created after - this step: - -.. code-block:: console - - $ TEMPLATECONF=../sources/meta-ohos/flavours/linux . ./sources/poky/oe-init-build-env build-ohos-linux - -2. You will find yourself in the newly created build directory. Call *bitbake* - to build the image. For example, if you are using *allscenarios-image-base* - run the following command: - -.. code-block:: console - - $ MACHINE=qemuarm bitbake allscenarios-image-base - -Once the image is done, you can run the Qemu using the provided script wrapper: - -.. code-block:: console - - $ MACHINE=qemuarm runqemu diff --git a/docs/hardware-support/virtual-boards/qemuarm64.rst b/docs/hardware-support/virtual-boards/qemuarm64.rst deleted file mode 100644 index 471f3dce1bba0b66d7482074d66298f61229799a..0000000000000000000000000000000000000000 --- a/docs/hardware-support/virtual-boards/qemuarm64.rst +++ /dev/null @@ -1,49 +0,0 @@ -.. SPDX-FileCopyrightText: Huawei Inc. -.. -.. SPDX-License-Identifier: CC-BY-4.0 - -Qemu ARM64 -########## - -.. contents:: - :depth: 4 - -Overview -******** - -All Scenarios OS supports running the software stack into an virtual environment using Qemu. - -Building OHOS image -=================== - -To clone the source code, perform the procedure in: :ref:`Setting up a repo workspace <RepoWorkspace>`. - -Building a Linux image -====================== - -Build steps ------------ - -1. Source the environment with proper template settings, flavour being *linux* - and target machine being *qemuarm64*. Pay attention to how relative paths are - constructed. The value of *TEMPLATECONF* is relative to the location of the - build directory *./build-ohos-linux*, that is going to be created after - this step: - -.. code-block:: console - - $ TEMPLATECONF=../sources/meta-ohos/flavours/linux . ./sources/poky/oe-init-build-env build-ohos-linux - -2. You will find yourself in the newly created build directory. Call *bitbake* - to build the image. For example, if you are using *allscenarios-image-base* - run the following command: - -.. code-block:: console - - $ MACHINE=qemuarm64 bitbake allscenarios-image-base - -Once the image is done, you can run the Qemu using the provided script wrapper: - -.. code-block:: console - - $ MACHINE=qemuarm64 runqemu diff --git a/flavours/linux/conf-notes.txt b/flavours/linux/conf-notes.txt index b179fb188a5f675352da96fe528a329b6d4b6574..5a4a2848c04a53733d292070ded73263c2b6b68a 100644 --- a/flavours/linux/conf-notes.txt +++ b/flavours/linux/conf-notes.txt @@ -12,8 +12,6 @@ Supported targets: Supported machines (first is the default): - qemux86-64 - qemux86 -- qemuarm -- qemuarm64 - seco-intel-b68 (SECO SBC-B68) - seco-imx8mm-c61 (SECO SBC-C61) - stm32mp1-av96 (96Boards Avenger96) diff --git a/flavours/linux/local.conf.sample b/flavours/linux/local.conf.sample index 76162760eaf60bf88d5ac344dd6288f3add44cc8..72d38219eed72cce0fce1b428102ef4ee6d1f1e7 100644 --- a/flavours/linux/local.conf.sample +++ b/flavours/linux/local.conf.sample @@ -20,8 +20,6 @@ # You need to select a specific machine to target the build with. There are a selection # of emulated machines available which can boot and run in the QEMU emulator: # -#MACHINE ?= "qemuarm" -#MACHINE ?= "qemuarm64" #MACHINE ?= "qemux86" #MACHINE ?= "qemux86-64" #MACHINE ?= "stm32mp1-av96"