CI: pin to kas 3.2 as 3.2.1 fails

For some reason the kas 3.2.1 container fails:

No such file or directory: '/builds/engineering/yocto/meta-arm/ci/ci/base.yml'

Note the repeated /ci/, which is wrong.

Pin the kas container to 3.2 for now until this is resolved.

Signed-off-by: Ross Burton <ross.burton@arm.com>

.gitignore

@@ -1 +0,0 @@
-__pycache__

.gitlab-ci.yml

@@ -1,7 +1,9 @@
-image: ghcr.io/siemens/kas/kas:latest-release
+image: ghcr.io/siemens/kas/kas:3.2
 
+  # First do a common bootstrap, and then build all the targets
 stages:
   - prep
+  - bootstrap
   - build
 
 # Common job fragment to get a worker ready
@@ -25,28 +27,16 @@ stages:
     - mkdir --verbose --parents $KAS_WORK_DIR $KAS_REPO_REF_DIR $SSTATE_DIR $DL_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR
     # Must do this here, as it's the only way to make sure the toolchain is installed on the same builder
     - ./ci/get-binary-toolchains $DL_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR
-    - sudo apt update && sudo apt install telnet -y
 
 # Generalised fragment to do a Kas build
 .build:
   extends: .setup
   script:
-    - KASFILES=$(./ci/jobs-to-kas "$CI_JOB_NAME")
+    - KASFILES=$(./ci/jobs-to-kas $CI_JOB_NAME)
     - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf'
     - kas build $KASFILES
     - ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log
 
-# Workaround for Zephyr not currectly handling TESTIMAGE_AUTO
-.build_and_test:
-  extends: .setup
-  script:
-    - KASFILES=$(./ci/jobs-to-kas "$CI_JOB_NAME")
-    - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf'
-    - kas build $KASFILES
-    - kas build $KASFILES -c testimage
-    - ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log
-
-
 #
 # Prep stage, update repositories once
 #
@@ -54,41 +44,38 @@ update-repos:
   extends: .setup
   stage: prep
   script:
-    - flock --verbose --timeout 60 $KAS_REPO_REF_DIR ./ci/update-repos
+  - flock --verbose --timeout 60 $KAS_REPO_REF_DIR ./ci/update-repos
 
+#
+# Bootstrap stage, bootstrap and machine coverage
+#
+
+# Build a number of native tools first to ensure the other builders don't race
+# over them
+n1sdp/bootstrap:
+  extends: .build
+  stage: bootstrap
 
 # What percentage of machines in the layer do we build
 machine-coverage:
-  stage: build
+  stage: bootstrap
   interruptible: true
   script:
-    - ./ci/check-machine-coverage
+  - ./ci/check-machine-coverage
   coverage: '/Coverage: \d+/'
 
+
 #
 # Build stage, the actual build jobs
 #
-# Available options for building are
-#  TOOLCHAINS: [gcc, clang, armgcc, external-gccarm]
-#  TCLIBC: [glibc, musl]
-#  VIRT: [none, xen]
-#  TESTING: testimage
 
 # Validate layers are Yocto Project Compatible
 check-layers:
   extends: .setup
   coverage: '/Coverage: \d+/'
   script:
-    - kas shell --update --force-checkout ci/base.yml:ci/meta-arm-autonomy.yml:ci/meta-openembedded.yml --command \
+  - kas shell --update --force-checkout ci/base.yml:ci/meta-python.yml --command \
-      "$CI_PROJECT_DIR/ci/check-layers.py $CI_PROJECT_DIR/ci/check-layers.yml $CI_PROJECT_DIR $KAS_WORK_DIR"
+    "$CI_PROJECT_DIR/ci/check-layers.py $CI_PROJECT_DIR/ci/check-layers.yml $CI_PROJECT_DIR $KAS_WORK_DIR"
-
-pending-updates:
-  extends: .setup
-  artifacts:
-    paths:
-      - update-report.html
-  script:
-    - kas shell ci/qemuarm64.yml:ci/meta-openembedded.yml -c "$CI_PROJECT_DIR/scripts/machine-summary.py -t updates.html -o $CI_PROJECT_DIR/update-report.html $($CI_PROJECT_DIR/ci/listmachines.py meta-arm meta-arm-bsp)"
 
 corstone500:
   extends: .build
@@ -99,37 +86,23 @@ corstone700-fvp:
 corstone700-mps3:
   extends: .build
 
-corstone1000-fvp:
-  extends: .build
-
-corstone1000-mps3:
-  extends: .build
-
 fvp-base:
   extends: .build
-  parallel:
-    matrix:
-      - TESTING: testimage
-  tags:
-    - x86_64
 
 fvp-base-arm32:
   extends: .build
-  parallel:
+
-    matrix:
+fvp-base-arm32/external-gccarm:
-      - TOOLCHAINS: [gcc, external-gccarm]
+  extends: .build
 
 fvp-baser-aemv8r64:
   extends: .build
 
-fvps:
-  extends: .build
-
 gem5-arm64:
   extends: .build
-  parallel:
+
-    matrix:
+gem5-arm64-xen:
-      - VIRT: [none, xen]
+  extends: .build
 
 gem5-atp-arm64:
   extends: .build
@@ -139,15 +112,12 @@ generic-arm64:
 
 juno:
   extends: .build
-  parallel:
+
-    matrix:
+juno/clang:
-      - TOOLCHAINS: [gcc, clang]
+  extends: .build
 
 microbit-v1:
-  extends: .build_and_test
+  extends: .build
-  parallel:
-    matrix:
-      - TESTING: testimage-zephyr
 
 musca-b1:
   extends: .build
@@ -157,62 +127,86 @@ musca-s1:
 
 n1sdp:
   extends: .build
-  parallel:
+
-    matrix:
+n1sdp/armgcc:
-      - TOOLCHAINS: [gcc, armgcc]
+  extends: .build
 
 qemu-cortex-a53:
   extends: .build
 
-qemu-cortex-m3:
+qemuarm/testimage:
-  extends: .build_and_test
-  parallel:
-    matrix:
-      - TESTING: testimage-zephyr
-
-qemu-cortex-r5:
   extends: .build
 
-qemuarm64-secureboot:
+qemuarm64-sbsa:
   extends: .build
-  parallel:
-    matrix:
-      - TOOLCHAINS: [gcc, clang]
-        TCLIBC: [glibc, musl]
-        TESTING: testimage
 
-qemuarm64:
+qemuarm64-secureboot/testimage:
   extends: .build
-  parallel:
-    matrix:
-      - VIRT: xen
 
-qemuarm:
+qemuarm64-secureboot/clang/testimage:
   extends: .build
-  parallel:
-    matrix:
-      - TOOLCHAINS: [gcc, clang]
-        TESTING: testimage
-      - VIRT: xen
 
-qemuarmv5:
+qemuarm64-secureboot/clang/musl/testimage:
+  extends: .build
+
+qemuarm64-secureboot/musl/testimage:
+  extends: .build
+
+qemuarmv5/testimage:
   extends: .build
-  parallel:
-    matrix:
-      - TESTING: testimage
 
 sgi575:
   extends: .build
 
 tc0:
   extends: .build
-  tags:
-    - x86_64
 
-tc1:
-  extends: .build
-  tags:
-    - x86_64
 
-toolchains:
+#
-  extends: .build
+# Utility tasks, not executed automatically
+#
+
+delete-dl-dir:
+  extends: .setup
+  stage: prep
+  when: manual
+  script:
+  - rm -rf $DL_DIR/*
+
+delete-repo-dir:
+  extends: .setup
+  stage: prep
+  when: manual
+  script:
+  - rm -rf $KAS_REPO_REF_DIR/*
+
+# Delete all sstate
+delete-sstate:
+  extends: .setup
+  stage: prep
+  when: manual
+  script:
+  - rm -rf $SSTATE_DIR/*
+
+delete-toolchains:
+  extends: .setup
+  stage: prep
+  when: manual
+  script:
+  - rm -rf $TOOLCHAIN_DIR/*
+
+# Wipe out old sstate
+prune-sstate:
+  extends: .setup
+  stage: prep
+  when: manual
+  script:
+  - find $SSTATE_DIR -type f -atime +30 -delete
+
+# Report on disk usage
+usage:
+  extends: .setup
+  stage: prep
+  when: manual
+  script:
+  - du -h -s $DL_DIR $SSTATE_DIR $KAS_REPO_REF_DIR $TOOLCHAIN_DIR

README.md

@@ -1,46 +1,23 @@
 Introduction
 ------------
-This repository contains the Arm layers for OpenEmbedded.
+This repository contains Arm layers for OpenEmbedded
 
-* meta-arm
+meta-arm:
+	This layer provides support for general recipes for the Arm
+	architecture.  Anything that's not needed explicitly for BSPs, the IOTA
+	distribution, or destined to be upstreamed belongs here.
 
-  This layer contains general recipes for the Arm architecture, such as firmware, FVPs, and Arm-specific integration.
+meta-arm-bsp:
+	This layer provides support for Arm reference platforms
 
-* meta-arm-autonomy
+meta-arm-iota:
+	This layer provides support for Arm's IOTA Linux Distribution
 
-  This layer is the distribution for a reference stack for autonomous systems.
+meta-arm-toolchain:
+	This layer provides support for Arm's GNU-A toolset releases
 
-* meta-arm-bsp
+meta-arm-autonomy:
-
+    This layer provides a reference stack for autonomous systems.
-  This layer contains machines for Arm reference platforms, for example FVP Base, N1SDP, and Juno.
-
-* meta-arm-toolchain
-
-  This layer contains recipes for Arm's binary toolchains (GCC and Clang for -A and -M), and a recipe to build Arm's GCC.
-
-* meta-atp
-
-  This layer contains recipes for the Adaptive Traffic Generation integration into meta-gem5.
-
-* meta-gem5
-
-  This layer contains recipes and machines for gem5, a system-level and processor simulator.
-
-
-Other Directories
------------------
-
-* ci
-
-  This directory contains gitlab continuous integration configuration files (KAS yaml files) as well as scripts needed for this
-
-* kas
-
-  This directory contains KAS yaml files to describe builds for systems not used in CI
-
-* scripts
-
-  This directory contains scripts used in running the CI tests
 
 Contributing
 ------------

ci/armgcc.yml

@@ -3,4 +3,4 @@ header:
 
 local_conf_header:
   cc: |
-    GCCVERSION = "arm-10.3"
+    GCCVERSION = "arm-10.2"

ci/base.yml

@@ -5,7 +5,7 @@ distro: poky
 
 defaults:
   repos:
-    refspec: honister
+    refspec: hardknott
 
 repos:
   meta-arm:
@@ -26,17 +26,17 @@ env:
 
 local_conf_header:
   base: |
-    CONF_VERSION = "2"
+    CONF_VERSION = "1"
     PACKAGE_CLASSES = "package_ipk"
-    LICENSE_FLAGS_WHITELIST += "armcompiler Arm-FVP-EULA"
+    LICENSE_FLAGS_WHITELIST += "armcompiler"
-    PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
+    PACKAGECONFIG_remove_pn-qemu-system-native = "gtk+ sdl"
-    EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
+    EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
     BB_NUMBER_THREADS = "16"
     PARALLEL_MAKE = "-j16"
     INHERIT += "rm_work"
-    PACKAGECONFIG:append:pn-perf = " coresight"
+    PACKAGECONFIG_append_pn-perf = " coresight"
   noptest: |
-    DISTRO_FEATURES:remove = "ptest"
+    DISTRO_FEATURES_remove = "ptest"
 
 machine: unset
 

ci/bootstrap.yml

@@ -0,0 +1,9 @@
+header:
+  version: 9
+
+target:
+  - binutils-cross-aarch64
+  - gcc-cross-aarch64
+  - python3-native
+  - opkg-native
+  - rpm-native

ci/check-layers.py

@@ -28,7 +28,6 @@ if __name__ == "__main__":
     cli.extend([args.metaarm / layer for layer in layers])
     cli.append("--dependency")
     cli.extend([args.others / layer for layer in dependencies])
-    cli.append("--no-auto-dependency")
 
     passed = 0
     process = subprocess.Popen(cli, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)

ci/check-layers.yml

@@ -3,11 +3,5 @@ layers:
   - meta-arm-bsp
   - meta-arm-toolchain
   - meta-gem5
-  - meta-arm-autonomy
 dependencies:
   - meta-openembedded/meta-oe
-  - meta-openembedded/meta-networking
-  - meta-openembedded/meta-python
-  - meta-openembedded/meta-filesystems
-  - poky/meta-poky
-  - meta-virtualization

ci/check-machine-coverage

@@ -2,7 +2,6 @@
 
 from pathlib import Path
 import sys
-from listmachines import list_machines
 
 metaarm = Path.cwd()
 
@@ -10,10 +9,9 @@ if metaarm.name != "meta-arm":
     print("Not running inside meta-arm")
     sys.exit(1)
 
-# Find all layers
-layers = (p.name for p in metaarm.glob("meta-*") if p.is_dir())
 # All machine configurations
-machines = list_machines(layers)
+machines = metaarm.glob("meta-*/conf/machine/*.conf")
+machines = set(p.stem for p in machines)
 
 # All kas files
 kas = metaarm.glob("ci/*.yml")

ci/corstone1000-fvp.yml

@@ -1,13 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-    - meta-openembedded.yml
-
-local_conf_header:
-    custom-local-conf: |
-        INITRAMFS_IMAGE_BUNDLE = "0"
-        INITRAMFS_IMAGE:remove = "corstone1000-initramfs-image"
-
-machine: corstone1000-fvp
-

ci/corstone1000-mps3.yml

@@ -1,12 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-    - meta-openembedded.yml
-
-local_conf_header:
-    custom-local-conf: |
-        INITRAMFS_IMAGE_BUNDLE = "0"
-        INITRAMFS_IMAGE:remove = "corstone1000-initramfs-image"
-
-machine: corstone1000-mps3

ci/fvp-base.yml

@@ -5,12 +5,3 @@ header:
 
 machine: fvp-base
 
-local_conf_header:
-  testimagefvp: |
-    INHERIT = "fvpboot"
-    # This fails but we can't add to the ignorelist from meta-arm yet
-    # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14604
-    TEST_SUITES:remove = "parselogs"
-    # Tell testimage to connect to localhost:8022, and forward that to SSH in the FVP.
-    TEST_TARGET_IP = "localhost:8022"
-    FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] ?= "8022=22"

ci/fvps.yml

@@ -1,20 +0,0 @@
-# Simple target to build the FVPs that are publically available
-
-header:
-  version: 9
-  includes:
-    - base.yml
-
-machine: qemuarm64
-
-local_conf_header:
-  sdk: |
-    SDKMACHINE = "x86_64"
-
-target:
-  - nativesdk-fvp-base-a-aem
-  - nativesdk-fvp-n1-edge
-  - nativesdk-fvp-sgi575
-  - nativesdk-fvp-corstone500
-  - nativesdk-fvp-corstone700
-  - nativesdk-fvp-tc0

ci/gem5-arm64-xen.yml

@@ -0,0 +1,28 @@
+
+header:
+  version: 9
+  includes:
+    - base.yml
+    - meta-python.yml
+
+repos:
+  meta-arm:
+    layers:
+      meta-gem5:
+  meta-openembedded:
+    url: https://git.openembedded.org/meta-openembedded
+    layers:
+      meta-oe:
+      meta-filesystems:
+      meta-networking:
+  meta-virtualization:
+    url: git://git.yoctoproject.org/meta-virtualization
+
+machine: gem5-arm64
+
+local_conf_header:
+  meta-virt:
+    DISTRO_FEATURES_append = " virtualization xen"
+
+target:
+  - xen-image-minimal

ci/gem5-arm64.yml

@@ -2,13 +2,17 @@ header:
   version: 9
   includes:
     - base.yml
-    - meta-openembedded.yml
 
 repos:
   meta-arm:
     layers:
       meta-gem5:
 
+  meta-openembedded:
+    url: https://git.openembedded.org/meta-openembedded
+    layers:
+      meta-oe:
+
 machine: gem5-arm64
 
 target:

ci/get-binary-toolchains

@@ -2,7 +2,7 @@
 set -u
 
 HOST_ARCH=$(uname -m)
-VER="10.3-2021.07"
+VER="10.2-2020.11"
 
 DOWNLOAD_DIR=$1
 TOOLCHAIN_DIR=$2

ci/jobs-to-kas

@@ -1,27 +1,19 @@
 #! /bin/bash
 
-# This script is expecting an input of machine name, optionally followed by a
+# Read a GitLab CI job name on $1 and transform it to a
-# colon and a list of one or more parameters separated by commas between
+# list of Kas yaml files
-# brackets.  For example, the following are acceptable:
-# corstone500
-# fvp-base: [testimage]
-# qemuarm64-secureboot: [clang, glibc, testimage]
-#
-# Turn this list into a series of yml files separated by colons to pass to kas
 
 set -e -u
 
-FILES="ci/$(echo $1 | cut -d ':' -f 1).yml"
+# Read Job namne from $1 and split on /
+IFS=/ read -r -a PARTS<<<$1
 
-for i in $(echo $1 | cut -s -d ':' -f 2 | sed 's/[][,]//g'); do
+# Prefix each part with ci/
-	# Given that there are no yml files for gcc or glibc, as those are the
+PARTS=("${PARTS[@]/#/ci/}")
-	# defaults, we can simply ignore those parameters.  They are necessary
-	# to pass in so that matrix can correctly setup all of the permutations
-	# of each individual run.
-	if [[ $i == 'none' || $i == 'gcc' || $i == 'glibc' ]]; then
-		continue
-	fi
-	FILES+=":ci/$i.yml"
-done
 
-echo $FILES
+# Suffix each part with .yml
+PARTS=("${PARTS[@]/%/.yml}")
+
+# Print colon-separated
+IFS=":"
+echo "${PARTS[*]}"

ci/listmachines.py

@@ -1,29 +0,0 @@
-#! /usr/bin/env python3
-
-import pathlib
-import typing
-import sys
-
-"""
-List all of the machines available under the listed sub-layers of meta-arm.
-"""
-def list_machines(layers: typing.Sequence[str]) -> typing.Set[str]:
-    machines = set()
-
-    # We know we're in meta-arm/scripts, so find the top-level directory
-    metaarm = pathlib.Path(__file__).resolve().parent.parent
-    if metaarm.name != "meta-arm":
-        raise Exception("Not running inside meta-arm")
-    
-    for layer in layers:
-        machines |= set(p.stem for p in (metaarm / layer / "conf" / "machine").glob("*.conf"))
-    return machines
-
-if __name__ == "__main__":
-    if len(sys.argv) > 1:
-        machines = list_machines(sys.argv[1:])
-        print(" ".join(sorted(machines)))
-        sys.exit(0)
-    else:
-        print("Usage:\n$ %s [layer name ...] " % sys.argv[0])
-        sys.exit(1)

ci/meta-arm-autonomy.yml

@@ -1,10 +0,0 @@
-header:
-  version: 9
-  includes:
-    - meta-openembedded.yml
-    - meta-virtualization.yml
-
-repos:
-  meta-arm:
-    layers:
-      meta-arm-autonomy:

ci/meta-python.yml

@@ -5,7 +5,5 @@ repos:
   meta-openembedded:
     url: https://git.openembedded.org/meta-openembedded
     layers:
-      meta-filesystems:
-      meta-networking:
       meta-oe:
       meta-python:

ci/meta-virtualization.yml

@@ -1,8 +0,0 @@
-header:
-  version: 9
-  includes:
-    - meta-openembedded.yml
-
-repos:
-  meta-virtualization:
-    url: git://git.yoctoproject.org/meta-virtualization

ci/meta-zephyr.yml

@@ -1,7 +1,7 @@
 header:
   version: 9
   includes:
-    - meta-openembedded.yml
+    - meta-python.yml
 
 repos:
   meta-zephyr:

ci/microbit-v1.yml

@@ -4,13 +4,7 @@ header:
     - base.yml
     - meta-zephyr.yml
 
-local_conf_header:
-  nonbuilding_tests: |
-    ZEPHYRTESTS:remove = "common"
-  failing_tests: |
-    ZEPHYRTESTS:remove = "context early_sleep sleep"
-
 machine: microbit-v1
 
 target:
-  - zephyr-kernel-test-all
+  - zephyr-philosophers

ci/musca-s1.yml

@@ -2,7 +2,7 @@ header:
   version: 9
   includes:
     - base.yml
-    - meta-openembedded.yml
+    - meta-python.yml
 
 machine: musca-s1
 

ci/qemu-cortex-a53.yml

@@ -4,11 +4,7 @@ header:
     - base.yml
     - meta-zephyr.yml
 
-local_conf_header:
-  nonbuilding_tests: |
-    ZEPHYRTESTS:remove += "common device poll queue sleep"
-
 machine: qemu-cortex-a53
 
 target:
-  - zephyr-kernel-test-all
+  - zephyr-philosophers

ci/qemu-cortex-m3.yml

@@ -1,16 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-    - meta-zephyr.yml
-
-local_conf_header:
-  tclibc: |
-    TCLIBC = "newlib"
-  nonbuilding_tests: |
-    ZEPHYRTESTS:remove = "common context pending poll sleep"
-
-machine: qemu-cortex-m3
-
-target:
-  - zephyr-kernel-test-all

ci/qemu-cortex-r5.yml

@@ -1,10 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-    - meta-zephyr.yml
-
-machine: qemu-cortex-r5
-
-target:
-  - zephyr-philosophers

ci/qemuarm64-secureboot.yml

@@ -14,6 +14,3 @@ target:
   - core-image-base
   - perf
   - optee-examples
-  - optee-test
-  - optee-spdevkit
-  - optee-os-tadevkit

ci/qemuarm64.yml

@@ -1,6 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-
-machine: qemuarm64

ci/qemuarmv5.yml

@@ -4,3 +4,8 @@ header:
     - base.yml
 
 machine: qemuarmv5
+
+local_conf_header:
+  bugs: |
+    # Remove parselogs until errors can be resolved
+    TEST_SUITES_remove = "parselogs"

ci/tc0.yml

@@ -4,7 +4,3 @@ header:
     - base.yml
 
 machine: tc0
-
-target:
-  - tc-artifacts-image
-  - perf

ci/tc1.yml

@@ -1,10 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-
-machine: tc1
-
-target:
-  - tc-artifacts-image
-  - perf

ci/testimage-zephyr.yml

@@ -1,8 +0,0 @@
-header:
-  version: 9
-
-local_conf_header:
-  testimage: |
-    IMAGE_CLASSES += "testimage"
-    TEST_TARGET = "QemuTargetZephyr"
-    TEST_SUITES = "zephyr"

ci/testimage.yml

@@ -10,7 +10,7 @@ local_conf_header:
     TEST_SERVER_IP = "127.0.0.1"
     QEMU_USE_SLIRP = "1"
   packages: |
-    IMAGE_FEATURES:append = " ssh-server-dropbear"
+    IMAGE_FEATURES_append = " ssh-server-dropbear"
 
 # Multiple targets are available, put it down to just one
 target:

ci/toolchains.yml

@@ -1,20 +0,0 @@
-header:
-  version: 9
-  includes:
-    - base.yml
-
-# Target is arm64 and SDK is x86-64 to ensure that we exercise both
-# architectures
-
-machine: qemuarm64
-local_conf_header:
-  toolchains: |
-    SDKMACHINE = "x86_64"
-
-# No target armcompiler as currently there is no arm64 build
-target:
-  - nativesdk-armcompiler
-  - gcc-aarch64-none-elf
-  - nativesdk-gcc-aarch64-none-elf
-  - gcc-arm-none-eabi
-  - nativesdk-gcc-arm-none-eabi

ci/xen.yml

@@ -1,11 +0,0 @@
-header:
-  version: 9
-  includes:
-    - meta-virtualization.yml
-
-local_conf_header:
-  meta-virt: |
-    DISTRO_FEATURES:append = " virtualization xen"
-
-target:
-  - xen-image-minimal

kas/corstone1000-base.yml

@@ -1,48 +0,0 @@
-header:
-  version: 11
-
-distro: poky-tiny
-
-defaults:
-  repos:
-    refspec: honister
-
-repos:
-  meta-arm:
-    layers:
-      meta-arm:
-      meta-arm-bsp:
-      meta-arm-toolchain:
-
-  poky:
-    url: https://git.yoctoproject.org/git/poky
-    refspec: b6b0af0889de9da0e4128cef8c9069b770b7d5a0
-    layers:
-      meta:
-      meta-poky:
-      meta-yocto-bsp:
-
-  meta-openembedded:
-    url: https://git.openembedded.org/meta-openembedded
-    refspec: ad52a41de8b4b7d619d1376d0a0090ebcfff56da
-    layers:
-      meta-oe:
-      meta-python:
-
-  meta-arm-image:
-     url: https://git.gitlab.arm.com/arm-reference-solutions/meta-arm-image.git
-     refspec: 9f611833ef58394b707836d69356c4e27d0265fc
-
-local_conf_header:
-  base: |
-    CONF_VERSION = "2"
-    PACKAGE_CLASSES = "package_ipk"
-    LICENSE_FLAGS_WHITELIST += "armcompiler"
-    BB_NUMBER_THREADS ?= "16"
-    PARALLEL_MAKE ?= "-j16"
-    PACKAGECONFIG:append:pn-perf = " coresight"
-
-machine: unset
-
-target:
-  - corstone1000-image

kas/corstone1000-fvp.yml

@@ -1,23 +0,0 @@
-header:
-  version: 11
-  includes:
-    - kas/corstone1000-base.yml
-
-repos:
-  run-scripts:
-     url: https://git.gitlab.arm.com/arm-reference-solutions/model-scripts.git
-     refspec: b40b4227fe6b6fc8e4b688db8928f4be76e94eb7
-     layers:
-      .: 'excluded'
-
-machine: corstone1000-fvp
-
-local_conf_header:
-    fvp-config: |
-        # Remove Dropbear SSH as it will not fit into the corstone1000 image.
-        IMAGE_FEATURES:remove = " ssh-server-dropbear"
-        INHERIT = " ${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'fvpboot', '', d)}"
-        LICENSE_FLAGS_WHITELIST:append = " Arm-FVP-EULA"
-
-target:
-  - corstone1000-image

kas/corstone1000-mps3.yml

@@ -1,6 +0,0 @@
-header:
-  version: 11
-  includes:
-    - kas/corstone1000-base.yml
-
-machine: corstone1000-mps3

kas/fvp-baser-aemv8r64-bsp.yml

@@ -6,12 +6,10 @@ machine: fvp-baser-aemv8r64
 
 defaults:
   repos:
-    refspec: honister
+    refspec: hardknott
 
 repos:
   meta-arm:
-    url: https://git.yoctoproject.org/git/meta-arm
-    path: layers/meta-arm
     layers:
       meta-arm:
       meta-arm-bsp:
@@ -19,24 +17,16 @@ repos:
 
   poky:
     url: https://git.yoctoproject.org/git/poky
-    path: layers/poky
     layers:
       meta:
       meta-poky:
 
-env:
-  FVP_BASE_R_AEM_TARBALL_URI: ""
-  FVP_BASE_R_ARM_EULA_ACCEPT: "False"
-
 local_conf_header:
   base: |
-    CONF_VERSION = "2"
+    CONF_VERSION = "1"
     PACKAGE_CLASSES = "package_ipk"
-    PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
+    PACKAGECONFIG_remove_pn-qemu-system-native = "gtk+ sdl"
-    EXTRA_IMAGE_FEATURES:append = " debug-tweaks ssh-server-openssh"
+    EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
-    FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] ?= "8022=22"
-    IMAGE_CLASSES:append = " ${@oe.utils.ifelse(d.getVar('FVP_BASE_R_AEM_TARBALL_URI'), 'fvpboot', '')}"
-    LICENSE_FLAGS_WHITELIST:append = " ${@oe.utils.vartrue('FVP_BASE_R_ARM_EULA_ACCEPT', 'Arm-FVP-EULA', '', d)}"
 
 target:
   - core-image-minimal

kas/fvp-baser-aemv8r64-rt-bsp.yml

@@ -1,8 +0,0 @@
-header:
-  version: 9
-  includes:
-    - kas/fvp-baser-aemv8r64-bsp.yml
-
-local_conf_header:
-  base-rt: |
-    PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"

meta-arm-autonomy/classes/alternate-kernel.bbclass

@@ -2,7 +2,7 @@
 # an alternate kernel (set via PREFERRED_PROVIDER_alternate/kernel).
 #
 # It is mandatory to also set the KERNEL_PACKAGE_NAME for the alternate kernel
-# recipe via KERNEL_PACKAGE_NAME:pn-${PREFERRED_PROVIDER_alternate/kernel} and
+# recipe via KERNEL_PACKAGE_NAME_pn-${PREFERRED_PROVIDER_alternate/kernel} and
 # its value needs to be different from "kernel" since this is the default set
 # for PREFERRED_PROVIDER_virtual/kernel.
 #
@@ -16,11 +16,11 @@ PREFERRED_PROVIDER_alternate/kernel ??= ""
 python () {
     alternate_kernel = d.getVar('PREFERRED_PROVIDER_alternate/kernel')
     if alternate_kernel:
-        alternate_kernel_pkg_name = d.getVar('KERNEL_PACKAGE_NAME:pn-%s' % alternate_kernel)
+        alternate_kernel_pkg_name = d.getVar('KERNEL_PACKAGE_NAME_pn-%s' % alternate_kernel)
         if alternate_kernel_pkg_name:
             d.appendVar('EXTRA_IMAGEDEPENDS', ' ' + alternate_kernel)
             d.appendVar('IMAGE_INSTALL', ' kernel-modules')
             d.appendVar('IMAGE_INSTALL', ' ' + alternate_kernel_pkg_name + '-modules')
         else:
-            raise bb.parse.SkipRecipe("No KERNEL_PACKAGE_NAME:pn-%s set" % alternate_kernel )
+            raise bb.parse.SkipRecipe("No KERNEL_PACKAGE_NAME_pn-%s set" % alternate_kernel )
 }

meta-arm-autonomy/classes/docker_extern_containers.bbclass

@@ -71,7 +71,7 @@ inherit features_check
 
 REQUIRED_DISTRO_FEATURES = "docker"
 
-RDEPENDS:${PN} = "packagegroup-docker-runtime-minimal"
+RDEPENDS_${PN} = "packagegroup-docker-runtime-minimal"
 
 CONTAINER_IMAGE_FILES ??= ""
 CONTAINERS_INSTALL_DIR ??= "${datadir}/docker/images"
@@ -112,4 +112,4 @@ do_install() {
 
 do_install[vardeps] += "CONTAINER_IMAGE_FILES"
 
-FILES:${PN} += "${CONTAINERS_INSTALL_DIR}"
+FILES_${PN} += "${CONTAINERS_INSTALL_DIR}"

meta-arm-autonomy/classes/image_types_xenguest.bbclass

@@ -22,7 +22,7 @@ xenguest_image_add_kernel() {
 # Add rootfs file to the image
 xenguest_image_add_rootfs() {
     call_xenguest_mkimage partial \
-        --disk-add-file=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${IMAGE_TYPEDEP:xenguest}:rootfs.${IMAGE_TYPEDEP:xenguest}
+        --disk-add-file=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${IMAGE_TYPEDEP_xenguest}:rootfs.${IMAGE_TYPEDEP_xenguest}
 }
 
 # Pack xenguest image
@@ -57,7 +57,7 @@ do_bootimg_xenguest[depends] += "xenguest-base-image:do_deploy"
 do_bootimg_xenguest[depends] += "${PN}:do_rootfs"
 
 # This set in python anonymous after, just set a default value here
-IMAGE_TYPEDEP:xenguest ?= "tar"
+IMAGE_TYPEDEP_xenguest ?= "tar"
 
 # We must not be built at rootfs build time because we need the kernel
 IMAGE_TYPES_MASKED += "xenguest"
@@ -158,7 +158,7 @@ python __anonymous() {
             # do_bootimg_xenguest will need the tar file
             d.appendVarFlag('do_bootimg_xenguest', 'depends', ' %s:do_image_tar' % (d.getVar('PN')))
             # set our TYPEDEP to the proper compression
-            d.setVar('IMAGE_TYPEDEP:xenguest', 'tar' + (rootfs_file.split('.tar', 1)[1] or ''))
+            d.setVar('IMAGE_TYPEDEP_xenguest', 'tar' + (rootfs_file.split('.tar', 1)[1] or ''))
 
         if kernel_needed:
             # Tell do_bootimg_xenguest to call xenguest_image_add_kernel

meta-arm-autonomy/classes/kernel-xenguest.bbclass

@@ -29,7 +29,7 @@ do_assemble_xenguest_initramfs() {
 }
 do_assemble_xenguest_initramfs[depends] += "${INITRAMFS_IMAGE}:do_merge_xenguestenv"
 
-kernel_do_deploy:append() {
+kernel_do_deploy_append() {
     if [ -f "${B}/${KERNEL_OUTPUT_DIR}/Image-initramfs.xenguest" ]; then
         install -m 0644 ${B}/${KERNEL_OUTPUT_DIR}/Image-initramfs.xenguest "$deployDir/Image-${INITRAMFS_NAME}.xenguest"
         ln -snf Image-${INITRAMFS_NAME}.xenguest $deployDir/Image-${INITRAMFS_LINK_NAME}.xenguest

meta-arm-autonomy/classes/xenguest_image_extra.bbclass

@@ -48,7 +48,7 @@ XENGUEST_IMAGE_VARS_EXTRA += "\
  XENGUEST_EXTRA_INIT_PRE XENGUEST_EXTRA_INIT XENGUEST_EXTRA_INIT_POST \
  XENGUEST_EXTRA_FILES XENGUEST_EXTRA_DISK_FILES"
 
-do_deploy:append() {
+do_deploy_append() {
     if [ -z "${XENGUEST_IMAGE_DEPLOY_DIR}" -o \
         -z "${XENGUEST_IMAGE_DEPLOY_SUBDIR}" ]; then
         die "Configuration error: XENGUEST_IMAGE_DEPLOY_DIR or XENGUEST_IMAGE_DEPLOY_SUBDIR is empty"

meta-arm-autonomy/conf/distro/include/arm-autonomy-guest.inc

@@ -1,7 +1,7 @@
 # This files is added when DISTRO_FEATURES contains arm-autonomy-guest
 
 # We need to have ipv4 activated
-DISTRO_FEATURES:append = " ipv4"
+DISTRO_FEATURES_append = " ipv4"
 
 # Build a xenguest type image
 IMAGE_CLASSES += "image_types_xenguest"
@@ -10,6 +10,6 @@ IMAGE_FSTYPES += "xenguest"
 # xenguest kernel extension to handle initramfs
 KERNEL_CLASSES += "kernel-xenguest"
 
-IMAGE_INSTALL:append = "${@bb.utils.contains('DISTRO_FEATURES', 'docker', \
+IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'docker', \
                         ' packagegroup-docker-runtime-minimal', \
                         '', d)}"

meta-arm-autonomy/conf/distro/include/arm-autonomy-host.inc

@@ -1,15 +1,18 @@
 # This files is added when DISTRO_FEATURES contains arm-autonomy-host
 
-ARM_AUTONOMY_HOST_OVERRIDES = ":autonomy-host"
-
 # We need to have xen and ipv4 activated
-DISTRO_FEATURES:append = " xen ipv4"
+DISTRO_FEATURES_append = " xen ipv4"
-DISTRO_FEATURES_NATIVE:append = " arm-autonomy-host"
+DISTRO_FEATURES_NATIVE_append = " arm-autonomy-host"
+
+# Since meta-virtualization master branch bumped to 4.15+stable we need to
+# force the 4.14+stable selection until we validate the new version
+PREFERRED_VERSION_xen = "4.14+stable%"
+PREFERRED_VERSION_xen-tools = "4.14+stable%"
 
 # Don't include kernels in standard images when building arm-autonomy-host
 # If the kernel image is needed in the rootfs the following should be set from
-# a bbappend: RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image"
+# a bbappend: RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base ?= ""
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base ?= ""
 
 # Require extra machine specific settings from meta-arm-bsp dynamic-layers only
 # if meta-arm-bsp is in the bblayers.conf

meta-arm-autonomy/conf/layer.conf

@@ -17,7 +17,7 @@ LAYERDEPENDS_meta-arm-autonomy = " \
    networking-layer \
    virtualization-layer \
 "
-LAYERSERIES_COMPAT_meta-arm-autonomy = "honister"
+LAYERSERIES_COMPAT_meta-arm-autonomy = "hardknott"
 
 # We don't activate virtualization feature from meta-virtualization as it
 # brings in lots of stuff we don't need. We need to disable the sanity check
@@ -29,7 +29,7 @@ ARM_AUTONOMY_LAYERDIR := "${LAYERDIR}"
 ARM_AUTONOMY_DISTRO_CFGDIR = "${ARM_AUTONOMY_LAYERDIR}/conf/distro/include/"
 
 # Add class to handle arm-autonomy distro extensions
-USER_CLASSES:append = " arm-autonomy-features"
+USER_CLASSES_append = " arm-autonomy-features"
 
 BBFILES_DYNAMIC += " \
     meta-arm-bsp:${LAYERDIR}/dynamic-layers/meta-arm-bsp/*/*/*.bbappend \

meta-arm-autonomy/conf/machine/arm64-autonomy-guest.conf

@@ -8,7 +8,7 @@ require conf/machine/include/arm/arch-armv8a.inc
 
 KERNEL_IMAGETYPE = "Image"
 
-IMAGE_FSTYPES:append = " tar.bz2"
+IMAGE_FSTYPES += "tar.bz2"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.10%"

meta-arm-autonomy/documentation/arm-autonomy-quickstart.md

@@ -29,7 +29,7 @@ First you must download the Yocto layers needed:
  - all other layers you might want to use
 
 For each of the downloaded layer make sure you checkout the release of Yocto
-you want to use (for example honister using `git checkout honister`).
+you want to use (for example hardknott using `git checkout hardknott`).
 
 Please follow [Yocto documentation](https://www.yoctoproject.org/docs/latest/brief-yoctoprojectqs/brief-yoctoprojectqs.html)
 in order to have the required dependencies.

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/arm-autonomy-machine-extra-settings.inc

@@ -1,7 +1,7 @@
 # Require extra machine specific settings
 ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE ?= ""
-ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE:n1sdp = "n1sdp-extra-settings.inc"
+ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_n1sdp = "n1sdp-extra-settings.inc"
-ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE:fvp-base = "fvp-base-extra-settings.inc"
+ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_fvp-base = "fvp-base-extra-settings.inc"
-ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE:juno = "juno-extra-settings.inc"
+ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE_juno = "juno-extra-settings.inc"
 
 require ${ARM_BSP_DYN_MACHINE_EXTRA_REQUIRE}

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/fvp-base-extra-settings.inc

@@ -1,12 +1,12 @@
 # Extra machine settings for fvp-base
 
-# FVP uses vda as hard drive and partition 1 is the
+# FVP uses vda as hard drive and partition 2 is the
-# default rootfs, so use vda2 for guest lvm
+# default rootfs, so use vda3 for guest lvm
-XENGUEST_MANAGER_VOLUME_DEVICE ?= "/dev/vda2"
+XENGUEST_MANAGER_VOLUME_DEVICE ?= "/dev/vda3"
 
 # We need to extend the wks search path to be able to find the wks file set in
 # ARM_AUTONOMY_WKS_FILE.
-WKS_SEARCH_PATH:prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
+WKS_SEARCH_PATH_prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
 
 ARM_AUTONOMY_WKS_FILE ?= "arm-autonomy-fvp-base-disk.wks.in"
 # set wks file only if INITRAMFS_IMAGE_BUNDLE is not set

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc

@@ -7,7 +7,7 @@ XEN_DEVICETREE_DOM0_SIZE ?= "0x02400000"
 
 # We need to extend the wks search path to be able to find the wks file set in
 # ARM_AUTONOMY_WKS_FILE.
-WKS_SEARCH_PATH:prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
+WKS_SEARCH_PATH_prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
 
 ARM_AUTONOMY_WKS_FILE ?= "arm-autonomy-juno-disk.wks.in"
 # set wks file only if INITRAMFS_IMAGE_BUNDLE is not set

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc

@@ -2,7 +2,7 @@
 
 # We need to extent the wks search path to be able to find the wks file set in
 # ARM_AUTONOMY_WKS_FILE.
-WKS_SEARCH_PATH:prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
+WKS_SEARCH_PATH_prepend := "${ARM_AUTONOMY_ARM_BSP_DYNAMIC_DIR}/wic:"
 
 ARM_AUTONOMY_WKS_FILE ?= "arm-autonomy-n1sdp-efidisk.wks.in"
 WKS_FILE = "${ARM_AUTONOMY_WKS_FILE}"
@@ -58,7 +58,7 @@ ${@bb.utils.contains('DISTRO_FEATURES', 'alternate-kernel', \
 KERNEL_PACKAGE_NAME_alternate/kernel ?= "kernel-rt"
 # When alternate-kernel DISTRO_FEATURE is present we set the kernel-rt by
 # default
-KERNEL_PACKAGE_NAME:pn-linux-yocto-rt = "\
+KERNEL_PACKAGE_NAME_pn-linux-yocto-rt = "\
 ${@ d.getVar('KERNEL_PACKAGE_NAME_alternate/kernel') \
 if bb.utils.contains('DISTRO_FEATURES', 'alternate-kernel', True, False, d) \
 else 'kernel' }"
@@ -87,8 +87,4 @@ d.getVar('PREFERRED_PROVIDER_alternate/kernel') else ''}"
 
 # Additionnal kernel modules are necessary for n1sdp to be able to mount FAT
 # filesystems using CP437.
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = " kernel-module-nls-cp437 kernel-module-nls-iso8859-1"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = " kernel-module-nls-cp437 kernel-module-nls-iso8859-1"
-
-# '-mcpu=' and '-march=' conflicts for xen build
-# lets not set '-march=' and let xen to overwrite '-mcpu='
-TUNE_CCARGS:remove:pn-xen = "${TUNE_CCARGS_MARCH}${TUNE_CCARGS_MARCH_OPTS}"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend

@@ -1,14 +1,14 @@
 # Use OVERRIDES to minimize the usage of
 # ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
-OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ':autonomy-host', '', d)}"
 
-FILESEXTRAPATHS:prepend:autonomy-host := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}:"
 
-DEPENDS:append:autonomy-host = " dos2unix-native"
+DEPENDS_append_autonomy-host = " dos2unix-native"
 
-SRC_URI:append:autonomy-host = " file://add-xen-support.patch;patchdir=../"
+SRC_URI_append_autonomy-host = " file://add-xen-support.patch;patchdir=../"
 
-do_install:append:autonomy-host() {
+do_install_append_autonomy-host() {
     mv -v ${D}/${UNPACK_DIR}/SOFTWARE/uEnv.txt \
           ${D}/${UNPACK_DIR}/SOFTWARE/uenvfile
     for dir in $(ls ${D}/${UNPACK_DIR}/SITE1/)
@@ -18,11 +18,11 @@ do_install:append:autonomy-host() {
 }
 
 DEPLOY_EXTRA_DEPS ??= ""
-DEPLOY_EXTRA_DEPS:autonomy-host = "xen:do_deploy xen-devicetree:do_deploy"
+DEPLOY_EXTRA_DEPS_autonomy-host = "xen:do_deploy xen-devicetree:do_deploy"
 
 do_deploy[depends] += "${DEPLOY_EXTRA_DEPS}"
 
-do_deploy:prepend:autonomy-host() {
+do_deploy_prepend_autonomy-host() {
     # To avoid dependency loop between firmware-image-juno:do_install,
     # xen:do_deploy and xen-devicetree:do_deploy when
     # INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend

@@ -1,10 +0,0 @@
-# Use OVERRIDES to minimize the usage of
-# ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
-OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
-
-FILESEXTRAPATHS:prepend:autonomy-host:fvp-base := "${THISDIR}/${PN}:"
-
-#
-# FVP BASE
-#
-SRC_URI:append:autonomy-host:fvp-base = " file://xen_u-boot_kernel_addr.patch"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/files/xen-n1sdp.dtsi

@@ -38,14 +38,4 @@
             /delete-property/ iommu-map;
         };
     };
-
-    /*
-     * Delete module node for Dom0, #size-cells and #address-cells because Grub2
-     * is responsible to create them
-     */
-    chosen {
-        /delete-property/ #size-cells;
-        /delete-property/ #address-cells;
-        /delete-node/ module@0;
-    };
 };

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen-devicetree/xen-devicetree.bbappend

@@ -1,23 +1,23 @@
 # Platform dependent parameters
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 # Add a dtb snippet to turn off iommu in dom0 on Juno board
-SRC_URI:append:juno = " file://xen-juno.dtsi"
+SRC_URI_append_juno = " file://xen-juno.dtsi"
-XEN_DEVICETREE_DTSI_MERGE:append:juno = " xen-juno.dtsi"
+XEN_DEVICETREE_DTSI_MERGE_append_juno = " xen-juno.dtsi"
 
 # Add a dtb snippet to remove pmu and iommu in dom0 on N1SDP
-SRC_URI:append:n1sdp = " file://xen-n1sdp.dtsi"
+SRC_URI_append_n1sdp = " file://xen-n1sdp.dtsi"
-XEN_DEVICETREE_DTSI_MERGE:append:n1sdp = " xen-n1sdp.dtsi"
+XEN_DEVICETREE_DTSI_MERGE_append_n1sdp = " xen-n1sdp.dtsi"
 # For N1SDP, the XEN_DEVICETREE_DEPEND and XEN_DEVICETREE_DTBS variables are
 # being set in meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc
 
 # Board specific configs
-XEN_DEVICETREE_DOM0_BOOTARGS:append:juno = " root=/dev/sda1 rootwait"
+XEN_DEVICETREE_DOM0_BOOTARGS_append_juno = " root=/dev/sda1 rootwait"
-XEN_DEVICETREE_XEN_BOOTARGS:append:juno = " console=dtuart dtuart=serial0 bootscrub=0 iommu=no"
+XEN_DEVICETREE_XEN_BOOTARGS_append_juno = " console=dtuart dtuart=serial0 bootscrub=0 iommu=no"
 
-XEN_DEVICETREE_DOM0_BOOTARGS:append:n1sdp = " root=/dev/sda2 rootwait"
+XEN_DEVICETREE_DOM0_BOOTARGS_append_n1sdp = " root=/dev/sda2 rootwait"
-XEN_DEVICETREE_XEN_BOOTARGS:append:n1sdp = " console=dtuart dtuart=serial0 bootscrub=0 iommu=no"
+XEN_DEVICETREE_XEN_BOOTARGS_append_n1sdp = " console=dtuart dtuart=serial0 bootscrub=0 iommu=no"
 
-XEN_DEVICETREE_DOM0_BOOTARGS:append:fvp-base = " root=/dev/vda1"
+XEN_DEVICETREE_DOM0_BOOTARGS_append_fvp-base = " root=/dev/vda2"
-XEN_DEVICETREE_XEN_BOOTARGS:append:fvp-base = " console=dtuart dtuart=serial0 bootscrub=0"
+XEN_DEVICETREE_XEN_BOOTARGS_append_fvp-base = " console=dtuart dtuart=serial0 bootscrub=0"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-extended/xen/xen_%.bbappend

@@ -1,15 +1,15 @@
 # FVP Base support
-COMPATIBLE_MACHINE:fvp-base = "fvp-base"
+COMPATIBLE_MACHINE_fvp-base = "fvp-base"
-FILESEXTRAPATHS:prepend:fvp-base := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files:"
-SRC_URI:append:fvp-base = " file://early-printk.cfg"
+SRC_URI_append_fvp-base = " file://early-printk.cfg"
 
 # Juno support
-COMPATIBLE_MACHINE:juno = "juno"
+COMPATIBLE_MACHINE_juno = "juno"
-FILESEXTRAPATHS:prepend:juno := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files:"
-SRC_URI:append:juno = " file://early-printk.cfg"
+SRC_URI_append_juno = " file://early-printk.cfg"
 
 # N1SDP support
-COMPATIBLE_MACHINE:n1sdp = "n1sdp"
+COMPATIBLE_MACHINE_n1sdp = "n1sdp"
-FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend_n1sdp := "${THISDIR}/files:"
-SRC_URI:append:n1sdp = " file://n1sdp.cfg \
+SRC_URI_append_n1sdp = " file://n1sdp.cfg \
                          file://early-printk.cfg"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/bsp/arm-platforms/n1sdp/n1sdp-preempt-rt.scc

@@ -0,0 +1,6 @@
+define KMACHINE n1sdp
+define KTYPE preempt-rt
+define KARCH arm64
+
+kconf non-hardware ktypes/developer/developer.cfg
+kconf non-hardware ktypes/preempt-rt/preempt-rt.cfg

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/disable-arm64-sve.cfg

@@ -0,0 +1,4 @@
+# We need to turn off SVE support in the Linux kernel otherwise Xen is stopping
+# Linux kernel with a coredump while trying to access ZEN bit of CPACR1 core
+# register.
+# CONFIG_ARM64_SVE is not set

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/disable-arm64-sve.scc

@@ -0,0 +1,3 @@
+define KFEATURE_DESCRIPTION "Disable SVE support"
+
+kconf non-hardware disable-arm64-sve.cfg

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/preempt-rt-extras.cfg

@@ -0,0 +1,7 @@
+# Yocto kernel-cache sets CONFIG_NLS_CODEPAGE_437=m for LINUX_KERNEL_TYPR=preempt-rt
+CONFIG_NLS_CODEPAGE_437=y
+# Yocto kernel-cache sets CONFIG_NLS_ISO8859_1=m for LINUX_KERNEL_TYPR=preempt-rt
+CONFIG_NLS_ISO8859_1=y
+
+# Set the timer interrupt run at 1000 Hz to have a fast response
+CONFIG_HZ_1000=y

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/preempt-rt-extras.scc

@@ -0,0 +1,3 @@
+define KFEATURE_DESCRIPTION "Extra kernel configs when building with PREEMPT_RT"
+
+kconf non-hardware preempt-rt-extras.cfg

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend

@@ -0,0 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}:"
+
+#
+# arm-autonomy kmeta extra
+#
+SRC_URI_append = " file://arm-autonomy-kmeta-extra;type=kmeta;name=arm-autonomy-kmeta-extra;destsuffix=arm-autonomy-kmeta-extra"
+
+# We need to turn off SVE support in the Linux kernel otherwise Xen is stopping
+# Linux kernel with a coredump while trying to access XEN bit of CPACR1 core
+# register.
+LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE = "${@bb.utils.contains_any('DISTRO_FEATURES', \
+                                         'arm-autonomy-host arm-autonomy-guest', \
+                                         ' features/arm-autonomy/disable-arm64-sve.scc','',d)}"
+
+KERNEL_FEATURES_append_fvp-base = "${LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE}"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/wic/arm-autonomy-fvp-base-disk.wks.in

@@ -2,13 +2,16 @@
 # long-description: Creates a partitioned disk image that the user
 # can directly dd to boot media.
 
-# For FVP Base first partition is rootfs normally populated as /dev/vda1
+# For FVP Base first partition is empty to keep compatibility with disk.img
+part --label empty --source empty --ondisk sda --size="1M" --system-id 8e --align 1024
+
+# Second partition is rootfs normally populated as /dev/vda2
 part / --source rootfs --ondisk sda --fstype=ext4 --label root --align 1024
 
-# Second partition to accomodate guests images normally populated as /dev/vda2 (used by XENGUEST_MANAGER_VOLUME_DEVICE)
+# Third partition to accomodate guests images normally populated as /dev/vda3 (used by XENGUEST_MANAGER_VOLUME_DEVICE)
 part --label guests --source empty --ondisk sda --size="${GUEST_PART_SIZE}${GUEST_PART_SIZE_UNIT}" --system-id 8e --align 1024
 
-# Third partition is user defined entry normally populated as /dev/vda3
+# Fourth partition is user defined entry normally populated as /dev/vda4
 ${AUTONOMY_HOST_EXTRA_PARTITION}
 
 bootloader --ptable msdos

meta-arm-autonomy/recipes-bsp/grub/grub-efi_%.bbappend

@@ -1,3 +1 @@
-OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+GRUB_BUILDIN += "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', 'xen_boot', '', d)}"
-
-GRUB_BUILDIN:append:autonomy-host = " xen_boot"

meta-arm-autonomy/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/xen_u-boot_kernel_addr.patch

@@ -1,4 +1,4 @@
-Upstream-Status: Inappropriate [meta-arm-autonomy specific u-boot config]
+Upstream Status: Inappropriate [meta-arm-autonomy specifc u-boot config]
 Signed-off-by: Nathan Dunne <nathan.dunne@arm.com>
 
 diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h

meta-arm-autonomy/recipes-bsp/u-boot/u-boot_2021.01.bbappend

@@ -0,0 +1,9 @@
+# Machine specific u-boot
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
+
+#
+# FVP BASE
+#
+
+SRC_URI_append_fvp-base = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ' file://xen_u-boot_kernel_addr.patch', '', d)}"

meta-arm-autonomy/recipes-containers/import-docker-containers/import-docker-containers.bb

@@ -25,7 +25,7 @@ INITSCRIPT_PARAMS = "start 30 2 3 4 5 ."
 INITSCRIPT_NAME = "import_containers.sh"
 
 S = "${WORKDIR}"
-do_install:append() {
+do_install_append() {
     install -d ${D}${sysconfdir}/init.d
     install -m 755 import_containers.sh ${D}${sysconfdir}/init.d
 

meta-arm-autonomy/recipes-containers/packagegroups/packagegroup-docker-runtime-minimal.bb

@@ -8,7 +8,7 @@ DESCRIPTION = "The minimal set of packages required for running Docker"
 
 inherit packagegroup
 
-RDEPENDS:${PN} = "\
+RDEPENDS_${PN} = "\
     docker-ce \
     docker-ce-contrib \
     kernel-module-xt-nat \

meta-arm-autonomy/recipes-core/busybox/busybox_%.bbappend

@@ -1,8 +1,4 @@
-# Use OVERRIDES to minimize the usage of
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
-OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
-
-FILESEXTRAPATHS:prepend:autonomy-host := "${THISDIR}/${PN}:"
 
 # The --exclude flag in Busybox tar is required by xenguest-mkimage
-SRC_URI:append:autonomy-host = " file://feature_tar_long_options.cfg"
+SRC_URI += "file://feature_tar_long_options.cfg"

meta-arm-autonomy/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend

@@ -3,9 +3,7 @@
 # configuration by adding network network interface configuration file under
 # interfaces.d directory.
 
-OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+do_install_append() {
-
-do_install:append:autonomy-host() {
     # Add scan of interfaces.d to interfaces file
     cp -f ${WORKDIR}/interfaces ${WORKDIR}/interfaces.subdir
     echo "source-directory ${sysconfdir}/network/interfaces.d/" \

meta-arm-autonomy/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend

@@ -1,20 +1,16 @@
-# if arm-autonomy-host or arm-autonomy-guest are activated, we need to install
+# if arm-autonomy-guest is activated, we are running as a xen guest so we must
-# the getty-wrapper to spawn the login console on /dev/hvc0.
+# have a console on hvc0
-# This is normally done in meta-virtualization if virtualization and xen
+# This is normally done in meta-virtualization if xen is activated but here
-# DISTRO_FEATURES are activated.
+# we don't have xen activated.
+#
 
-# In both arm-autonomy-host and arm-autonomy-guest we don't have virtualization
+SYSVINIT_ADDHVC0 = "${@bb.utils.contains('DISTRO_FEATURES', \
-# in DISTRO_FEATURE. Hence, manually include sysvinit-inittab_virtualization.inc
+    'arm-autonomy-guest', 'true', 'false', d)}"
-# to install the getty-wrapper.
-require ${@bb.utils.contains_any('DISTRO_FEATURES', \
-                                 'arm-autonomy-host arm-autonomy-guest', \
-                                 'recipes-core/sysvinit/sysvinit-inittab_virtualization.inc', \
-                                 '', d)}
 
-# For arm-autonomy-guest we don't have xen in DISTRO_FEATURES. Hence, manually
+do_install_append() {
-# include sysvinit-inittab_xen.inc to append the getty-wrapper entry to
+    if ${SYSVINIT_ADDHVC0}; then
-# /etc/inittab.
+        echo "" >> ${D}${sysconfdir}/inittab
-require ${@bb.utils.contains('DISTRO_FEATURES', \
+        echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> \
-                             'arm-autonomy-guest', \
+            ${D}${sysconfdir}/inittab
-                             'recipes-core/sysvinit/sysvinit-inittab_xen.inc', \
+    fi
-                             '', d)}
+}

meta-arm-autonomy/recipes-devtools/qemu/qemu-autonomy-host.inc

@@ -1,8 +0,0 @@
-# For Xen we only need the i386 binaries
-QEMU_TARGETS = "i386"
-
-PACKAGECONFIG[noaudio] = "--audio-drv-list='',,"
-PACKAGECONFIG:append = " noaudio"
-PACKAGECONFIG:remove = "fdt sdl kvm"
-
-require recipes-devtools/qemu/qemu-package-split.inc

meta-arm-autonomy/recipes-devtools/qemu/qemu_%.bbappend

@@ -1,3 +1,12 @@
-require ${@bb.utils.contains('DISTRO_FEATURES', \
+# Use OVERRIDES to minimize the usage of
-                             'arm-autonomy-host', \
+# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
-                             'qemu-autonomy-host.inc', '', d)}
+OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ':autonomy-host', '', d)}"
+
+# For Xen we only need the i386 binaries
+QEMU_TARGETS_autonomy-host = "i386"
+
+PACKAGECONFIG[noaudio] = "--audio-drv-list='',,"
+PACKAGECONFIG_append_autonomy-host = " noaudio"
+PACKAGECONFIG_remove_autonomy-host = "fdt sdl kvm"
+
+require ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', 'recipes-devtools/qemu/${BPN}-package-split.inc', '', d)}

meta-arm-autonomy/recipes-extended/xen-devicetree/files/xen.dtsi.in

@@ -1,13 +1,16 @@
 / {
     chosen {
-        #size-cells = <0x00000001>;
-        #address-cells = <0x00000001>;
         xen,dom0-bootargs = "###XEN_DOM0_BOOTARGS###";
         xen,xen-bootargs = "###XEN_XEN_BOOTARGS###";
 
-        module@0 {
+        modules {
-            reg = <###XEN_DOM0_ADDR### ###XEN_DOM0_SIZE###>;
+            #size-cells = <0x00000001>;
-            compatible = "multiboot,module";
+            #address-cells = <0x00000001>;
+
+            module@0 {
+                reg = <###XEN_DOM0_ADDR### ###XEN_DOM0_SIZE###>;
+                compatible = "multiboot,module";
+            };
         };
     };
 };

meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb

@@ -16,7 +16,7 @@ DESCRIPTION = "Add entries in DTB for Xen and Dom0"
 # customizable parameters
 # kernel size is passed to xen via xen.dtb so we need to add
 # 'virtual/kernel:do_deploy' as a dependency
-XEN_DEVICETREE_DEPEND:append = " virtual/kernel:do_deploy"
+XEN_DEVICETREE_DEPEND_append = " virtual/kernel:do_deploy"
 XEN_DEVICETREE_DTBS ?= "${KERNEL_DEVICETREE}"
 XEN_DEVICETREE_XEN_BOOTARGS ?= "noreboot dom0_mem=${XEN_DEVICETREE_DOM0_MEM}"
 XEN_DEVICETREE_DOM0_MEM ?= "1024M,max:1024M"

meta-arm-autonomy/recipes-extended/xen/xen-tools_%.bbappend

@@ -1,4 +1,4 @@
-PACKAGECONFIG:remove = "\
+PACKAGECONFIG_remove = "\
     ${@bb.utils.contains('DISTRO_FEATURES', \
                          'arm-autonomy-host', \
                          'sdl', '', d)}"

meta-arm-autonomy/recipes-extended/xen/xen-tools_4.14.bbappend

@@ -1,7 +1,4 @@
-# Use OVERRIDES to minimize the usage of
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:"
-# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
-OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-FILESEXTRAPATHS:prepend:autonomy-host := "${THISDIR}/${PN}-4.14:"
+SRC_URI += "file://0001-vif-nat-fix-hostname.patch \
-
+           "
-SRC_URI:append:autonomy-host = " file://0001-vif-nat-fix-hostname.patch"

meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend

@@ -1,10 +1,9 @@
-# Use OVERRIDES to minimize the usage of
-# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
-OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
-
 # Make Xen machine specific
 # This ensures that sstate is properly handled and that each machine can have
 # its own configuration
-PACKAGE_ARCH:autonomy-host = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-PACKAGECONFIG:remove:autonomy-host = "sdl"
+PACKAGECONFIG_remove = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', \
+                         'arm-autonomy-host', \
+                         'sdl', '', d)}"

meta-arm-autonomy/recipes-extended/xen/xen_4.14.bbappend

@@ -1,9 +1,5 @@
-# Use OVERRIDES to minimize the usage of
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:"
-# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
-OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-FILESEXTRAPATHS:prepend:autonomy-host := "${THISDIR}/${PN}-4.14:"
+SRC_URI += " \
-
-SRC_URI:append:autonomy-host = " \
     file://0001-xen-arm-Throw-messages-for-unknown-FP-SIMD-implement.patch \
     "

meta-arm-autonomy/recipes-extended/xenguest/xenguest-base-image.bb

@@ -46,7 +46,7 @@ XENGUEST_IMAGE_SRC_URI_DISK_FILES ??= ""
 
 # Add xen files
 # Any extrafiles files to be added to XENGUEST_IMAGE_SRC_URI_XEN_FILES should
-# be performed via XENGUEST_IMAGE_SRC_URI_XEN_FILES:append.
+# be performed via XENGUEST_IMAGE_SRC_URI_XEN_FILES_append.
 # The kea-subnet4.json holds the kea dhcp4 subnet configuration for Dom0.
 # And it is used when XENGUEST_IMAGE_NETWORK_TYPE="nat".
 # Any customizations to it should be performed by replacing it

meta-arm-autonomy/recipes-extended/xenguest/xenguest-extern-guests.bb

@@ -67,7 +67,7 @@ do_install() {
 
 do_install[vardeps] += "ARM_AUTONOMY_HOST_IMAGE_EXTERN_GUESTS"
 
-FILES:${PN} += "${XENGUEST_MANAGER_GUEST_DIR}"
+FILES_${PN} += "${XENGUEST_MANAGER_GUEST_DIR}"
 
 # In a multiconfig build this variable will hold a dependency string, which
 # differs based on whether the guest has initramfs or not.  It may have a space

meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb

@@ -56,8 +56,8 @@ do_install() {
 }
 
 # Things that we need on the target
-RDEPENDS:${PN} += "bash xenguest-mkimage lvm2 xen-tools parted e2fsprogs \
+RDEPENDS_${PN} += "bash xenguest-mkimage lvm2 xen-tools parted e2fsprogs \
                    dosfstools logrotate"
 
-FILES:${PN} += "${bindir}/xenguest-manager \
+FILES_${PN} += "${bindir}/xenguest-manager \
                ${sysconfdir}/xenguest"

meta-arm-autonomy/recipes-extended/xenguest/xenguest-mkimage.bb

@@ -31,6 +31,6 @@ do_install() {
 }
 
 # We need bash
-RDEPENDS:${PN} = "bash"
+RDEPENDS_${PN} = "bash"
-FILES:${PN} = "${bindir}/xenguest-mkimage"
+FILES_${PN} = "${bindir}/xenguest-mkimage"
 

meta-arm-autonomy/recipes-extended/xenguest/xenguest-network.bb

@@ -31,13 +31,13 @@ PACKAGES =+ "${PN}-kea-dhcp4"
 # Prefix with a_ to make sure it is executed in runlevel 01 before others
 # run start script before ifupdown and run stop script after ifupdown
 INITSCRIPT_PACKAGES = "${PN} ${PN}-kea-dhcp4"
-INITSCRIPT_NAME:${PN} = "a_xenguest-network-bridge"
+INITSCRIPT_NAME_${PN} = "a_xenguest-network-bridge"
-INITSCRIPT_PARAMS:${PN} = "start 01 2 3 4 5 . stop 81 0 1 6 ."
+INITSCRIPT_PARAMS_${PN} = "start 01 2 3 4 5 . stop 81 0 1 6 ."
 
 # Kea configuration needs to be restored before kea init scripts:
 # Kea dhcp4 server is 30, so lets use 20, to have higher priority
-INITSCRIPT_NAME:${PN}-kea-dhcp4 = "kea-restore-default-config"
+INITSCRIPT_NAME_${PN}-kea-dhcp4 = "kea-restore-default-config"
-INITSCRIPT_PARAMS:${PN}-kea-dhcp4 = "defaults 20"
+INITSCRIPT_PARAMS_${PN}-kea-dhcp4 = "defaults 20"
 
 inherit allarch update-rc.d
 
@@ -54,7 +54,7 @@ do_install() {
        > ${WORKDIR}/network-bridge.sh
     install -d -m 755 ${D}${sysconfdir}/init.d
     install -m 755 ${WORKDIR}/xenguest-network-bridge \
-        ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME:${PN}}
+        ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME_${PN}}
     install -d -m 755 ${D}${sysconfdir}/network/interfaces.d
     install -m 755 ${WORKDIR}/xenguest-network-bridge.cfg \
         ${D}${sysconfdir}/network/interfaces.d/.
@@ -77,7 +77,7 @@ do_install() {
         ${D}${sysconfdir}/kea/kea-dhcp4.conf.original
 }
 
-RDEPENDS:${PN} += "bridge-utils \
+RDEPENDS_${PN} += "bridge-utils \
                    iptables \
                    kea \
                    ${PN}-kea-dhcp4 \
@@ -87,10 +87,10 @@ RDEPENDS:${PN} += "bridge-utils \
                    kernel-module-xt-nat \
                    kernel-module-xt-masquerade \
                   "
-FILES:${PN} += "${sysconfdir}/network/interfaces.d/xenguest-network-bridge.cfg"
+FILES_${PN} += "${sysconfdir}/network/interfaces.d/xenguest-network-bridge.cfg"
-FILES:${PN} += "${sysconfdir}/xenguest/init.pre/network-bridge.sh"
+FILES_${PN} += "${sysconfdir}/xenguest/init.pre/network-bridge.sh"
-FILES:${PN} += "${sysconfdir}/xen/scripts/vif-post.d/00-vif-xenguest.hook"
+FILES_${PN} += "${sysconfdir}/xen/scripts/vif-post.d/00-vif-xenguest.hook"
 
-FILES:${PN}-kea-dhcp4 = "${sysconfdir}/kea/kea-dhcp4.conf.original"
+FILES_${PN}-kea-dhcp4 = "${sysconfdir}/kea/kea-dhcp4.conf.original"
-FILES:${PN}-kea-dhcp4 += "${sysconfdir}/init.d/${INITSCRIPT_NAME:${PN}-kea-dhcp4}"
+FILES_${PN}-kea-dhcp4 += "${sysconfdir}/init.d/${INITSCRIPT_NAME_${PN}-kea-dhcp4}"
-FILES:${PN}-kea-dhcp4 += "${sysconfdir}/xenguest/init.post/xenguest-network-init-post.sh"
+FILES_${PN}-kea-dhcp4 += "${sysconfdir}/xenguest/init.post/xenguest-network-init-post.sh"

meta-arm-autonomy/recipes-kernel/linux/linux-%.bbappend

@@ -1,5 +1,3 @@
 # Add arm-autonomy kernel support
-require ${@bb.utils.contains_any('DISTRO_FEATURES', \
+require linux-arm-autonomy.inc
-                                 'arm-autonomy-host arm-autonomy-guest', \
+
-                                 'linux-arm-autonomy.inc', \
-                                 '', d)}

meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc

@@ -1,11 +1,11 @@
 # Add arm-autonomy specific features to the kernel
 
-FILESEXTRAPATHS:prepend := "${THISDIR}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}:"
 
 #
 # arm-autonomy kmeta
 #
-SRC_URI:append = " file://arm-autonomy-kmeta;type=kmeta;name=arm-autonomy-kmeta;destsuffix=arm-autonomy-kmeta"
+SRC_URI_append = " file://arm-autonomy-kmeta;type=kmeta;name=arm-autonomy-kmeta;destsuffix=arm-autonomy-kmeta"
 
 # Add common Xen (host and guest) configs and patches
 KERNEL_FEATURES += "${@bb.utils.contains_any('DISTRO_FEATURES', \
@@ -27,8 +27,8 @@ KERNEL_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', \
 
 
 # Add support for arm64-autonomy-guest machine
-COMPATIBLE_MACHINE:arm64-autonomy-guest = "arm64-autonomy-guest"
+COMPATIBLE_MACHINE_arm64-autonomy-guest = "arm64-autonomy-guest"
-KMACHINE:arm64-autonomy-guest = "arm64-autonomy-guest"
+KMACHINE_arm64-autonomy-guest = "arm64-autonomy-guest"
 
 # Add Minimal Kernel Configs for Docker runtime
 KERNEL_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', \

meta-arm-bsp/classes/image_types_disk_img.bbclass

@@ -0,0 +1,155 @@
+# Defines the disk.img image type
+
+#
+# Add an image type 'disk.img' which creates a disk image
+# with up to 4 partitions
+#
+# For partition 1 (replace 1 by 2 for partition 2, and so on for 3 and 4):
+#
+# * DISK_IMG_PARTITION1_SIZE is the partition size in MB (1024 is 1 GB)
+#
+# * DISK_IMG_PARTITION1_FSTYPE is the file system to format the partition with.
+#   We support only ext files systems (ext2, ext3 and ext4)
+#   If this is empty, the partition will not be formated.
+#
+# * DISK_IMG_PARTITION1_CONTENT is the content to put in the filesystem.
+#   Only 'rootfs' is supported and will create a partition with the Yocto
+#   root filesystem.
+#
+
+# Default values for partition 1
+DISK_IMG_PARTITION1_SIZE ??= "2048"
+DISK_IMG_PARTITION1_FSTYPE ??= "ext4"
+DISK_IMG_PARTITION1_CONTENT ??= "rootfs"
+
+# Default values for partition 2
+DISK_IMG_PARTITION2_SIZE ??= "0"
+DISK_IMG_PARTITION2_FSTYPE ??= "ext2"
+DISK_IMG_PARTITION2_CONTENT ??= ""
+
+# Default values for partition 3
+DISK_IMG_PARTITION3_SIZE ??= "0"
+DISK_IMG_PARTITION3_FSTYPE ??= "ext4"
+DISK_IMG_PARTITION3_CONTENT ??= ""
+
+# Default values for partition 4
+DISK_IMG_PARTITION4_SIZE ??= "0"
+DISK_IMG_PARTITION4_FSTYPE ??= "ext4"
+DISK_IMG_PARTITION4_CONTENT ??= ""
+
+# Default disk sector size
+DISK_IMG_SECTOR_SIZE ??= "512"
+
+# We need mkfs.ext and parted tools to create our image (dd is always there)
+do_image_disk_img[depends] += "e2fsprogs-native:do_populate_sysroot \
+    parted-native:do_populate_sysroot"
+
+DISK_IMG_FILE = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.disk.img"
+
+# Create one disk partition
+disk_img_createpart() {
+    local imagefile="$1"
+    local start="$2"
+    local size="$3"
+    local fstype="${4:-}"
+    local content="${5:-}"
+    local formatargs=""
+
+    set -x
+
+    rm -f $imagefile
+
+    # Create the partition image
+    dd if=/dev/zero of=$imagefile bs=${DISK_IMG_SECTOR_SIZE} count=0 \
+        seek=$(expr $size / ${DISK_IMG_SECTOR_SIZE})
+
+    if [ -n "$fstype" ]; then
+        case $content in
+            rootfs)
+                formatargs=" -d ${IMAGE_ROOTFS}"
+                ;;
+            boot)
+                echo "Unsupported"
+                exit 1
+                ;;
+            *)
+        esac
+
+        # Create the file system (with content if needed)
+        mkfs.$fstype -F $imagefile $formatargs
+    fi
+
+    cat $imagefile >> ${DISK_IMG_FILE}
+
+    # Add the partition to the partition table
+    parted -s ${DISK_IMG_FILE} unit B mkpart primary $start \
+        $(expr $start + $realsize - 1)
+}
+
+disk_img_create () {
+    local currpos
+    local realsize
+
+    set -x
+
+    currpos=${DISK_IMG_SECTOR_SIZE}
+
+    # Create reserved part for partition table (1MB)
+    dd if=/dev/zero of=${DISK_IMG_FILE} bs=${DISK_IMG_SECTOR_SIZE} count=0 \
+        seek=1
+
+    parted -s ${DISK_IMG_FILE} mklabel msdos
+
+    if [ ${DISK_IMG_PARTITION1_SIZE} -ne 0 ]; then
+
+        # Reduce the first block size of one sector to make space
+        # for the partition table
+        realsize=$(expr ${DISK_IMG_PARTITION1_SIZE} \* 1024 \* 1024 \
+            - ${DISK_IMG_SECTOR_SIZE})
+
+        # Create the partition
+        disk_img_createpart ${WORKDIR}/part1.img $currpos $realsize \
+            "${DISK_IMG_PARTITION1_FSTYPE}" "${DISK_IMG_PARTITION1_CONTENT}"
+
+        currpos=$(expr $currpos + $realsize)
+    fi
+
+    if [ ${DISK_IMG_PARTITION2_SIZE} -ne 0 ]; then
+        # Partition size
+        realsize=$(expr ${DISK_IMG_PARTITION2_SIZE} \* 1024 \* 1024)
+
+        # Create the partition
+        disk_img_createpart ${WORKDIR}/part2.img $currpos $realsize \
+            "${DISK_IMG_PARTITION2_FSTYPE}" "${DISK_IMG_PARTITION2_CONTENT}"
+
+        currpos=$(expr $currpos + $realsize)
+
+    fi
+
+    if [ ${DISK_IMG_PARTITION3_SIZE} -ne 0 ]; then
+        # Partition size
+        realsize=$(expr ${DISK_IMG_PARTITION3_SIZE} \* 1024 \* 1024)
+
+        # Create the partition
+        disk_img_createpart ${WORKDIR}/part3.img $currpos $realsize \
+            "${DISK_IMG_PARTITION3_FSTYPE}" "${DISK_IMG_PARTITION3_CONTENT}"
+
+        currpos=$(expr $currpos + $realsize)
+
+    fi
+    if [ ${DISK_IMG_PARTITION4_SIZE} -ne 0 ]; then
+        # Partition size
+        realsize=$(expr ${DISK_IMG_PARTITION4_SIZE} \* 1024 \* 1024)
+
+        # Create the partition
+        disk_img_createpart ${WORKDIR}/part4.img $currpos $realsize \
+            "${DISK_IMG_PARTITION4_FSTYPE}" "${DISK_IMG_PARTITION4_CONTENT}"
+
+        currpos=$(expr $currpos + $realsize)
+
+    fi
+}
+
+IMAGE_CMD_disk.img = "disk_img_create"
+IMAGE_TYPES += "disk.img"
+

meta-arm-bsp/conf/layer.conf

@@ -9,13 +9,12 @@ BBFILE_COLLECTIONS += "meta-arm-bsp"
 BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-arm-bsp = "5"
 
-LAYERSERIES_COMPAT_meta-arm-bsp = "honister"
+LAYERSERIES_COMPAT_meta-arm-bsp = "hardknott"
 
 LAYERDEPENDS_meta-arm-bsp = "core meta-arm"
 # This won't be used by layerindex-fetch, but works everywhere else
-LAYERDEPENDS_meta-arm-bsp:append:corstone1000 = " meta-python openembedded-layer"
+LAYERDEPENDS_meta-arm-bsp_append_musca-b1 = " meta-python"
-LAYERDEPENDS_meta-arm-bsp:append:musca-b1 = " meta-python"
+LAYERDEPENDS_meta-arm-bsp_append_musca-s1 = " meta-python"
-LAYERDEPENDS_meta-arm-bsp:append:musca-s1 = " meta-python"
 
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/custom-licenses"

meta-arm-bsp/conf/machine/corstone1000-fvp.conf

@@ -1,41 +0,0 @@
-#@TYPE: Machine
-#@NAME: corstone1000-fvp machine
-#@DESCRIPTION: Machine configuration for Corstone1000 64-bit FVP
-require conf/machine/include/corstone1000.inc
-
-TFA_TARGET_PLATFORM = "fvp"
-
-TFM_PLATFORM_IS_FVP = "TRUE"
-
-# testimage config
-TEST_TARGET = "OEFVPTarget"
-TEST_SUITES = "noop"
-
-# FVP Config
-FVP_PROVIDER ?= "fvp-corstone1000-native"
-FVP_EXE ?= "FVP_Corstone-1000"
-FVP_CONSOLE ?= "host_terminal_0"
-
-# FVP Parameters
-FVP_CONFIG[se.trustedBootROMloader.fname] ?= "${DEPLOY_DIR_IMAGE}/bl1.bin"
-FVP_CONFIG[board.xnvm_size] ?= "64"
-FVP_CONFIG[se.trustedSRAM_config] ?= "6"
-FVP_CONFIG[se.BootROM_config] ?= "3"
-FVP_CONFIG[board.hostbridge.interfaceName] ?= "tap0"
-FVP_CONFIG[board.smsc_91c111.enabled] ?= "1"
-FVP_CONFIG[board.hostbridge.userNetworking] ?= "true"
-FVP_CONFIG[board.hostbridge.userNetPorts] ?= "5555=5555,8080=80,8022=22"
-FVP_CONFIG[board.se_flash_size] ?= "8192"
-FVP_CONFIG[diagnostics] ?= "4"
-FVP_CONFIG[disable_visualisation] ?= "true"
-FVP_CONFIG[se.nvm.update_raw_image] ?= "0"
-
-# Boot image
-FVP_DATA ?= "board.flash0=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.wic.nopt@0x68100000"
-
-# FVP Terminals
-FVP_TERMINALS[host.host_terminal_0] ?= "Normal World Console"
-FVP_TERMINALS[host.host_terminal_1] ?= "Secure World Console"
-FVP_TERMINALS[se.secenc_terminal] ?= "Secure Enclave Console"
-FVP_TERMINALS[extsys0.extsys_terminal] ?= "Cortex M3"
-

meta-arm-bsp/conf/machine/corstone1000-mps3.conf

@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: corstone1000-mps3 machine
-#@DESCRIPTION: Machine configuration for Corstone1000 64-bit MPS3 FPGA board
-
-require conf/machine/include/corstone1000.inc
-
-TFA_TARGET_PLATFORM = "fpga"
-
-PLATFORM_IS_FVP = "FALSE"

meta-arm-bsp/conf/machine/corstone500.conf

@@ -2,8 +2,9 @@
 #@NAME: Corstone-500 machine
 #@DESCRIPTION: Machine configuration for the Corstone-500 platform
 
-require conf/machine/include/arm/armv7a/tune-cortexa5.inc
+require conf/machine/include/tune-cortexa5.inc
 
+#
 # Corstone-500 is built against poky-tiny distro.
 # poky-tiny sets PREFERRED_PROVIDER_virtual/kernel to linux-yocto-tiny.
 # Since distro config is evaluated after the machine config, we need to
@@ -11,10 +12,12 @@ require conf/machine/include/arm/armv7a/tune-cortexa5.inc
 # PREFERRED_PROVIDER_virtual/kernel specified in the machine config will
 # apply.
 #
-PREFERRED_PROVIDER_virtual/kernel:forcevariable = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel_forcevariable = "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.3%"
+KBUILD_DEFCONFIG = "multi_v7_defconfig"
+KCONFIG_MODE = "--alldefconfig"
 
-PREFERRED_VERSION_trusted-firmware-a ?= "2.5%"
+PREFERRED_VERSION_trusted-firmware-a ?= "2.4%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
 
@@ -26,4 +29,4 @@ IMAGE_FSTYPES += "tar.bz2 cpio.gz"
 UBOOT_MACHINE = "designstart_ca5_defconfig"
 UBOOT_IMAGE_ENTRYPOINT = "0x84000000"
 UBOOT_IMAGE_LOADADDRESS = "0x84000000"
-PREFERRED_VERSION_u-boot ?= "2020.07"
+PREFERRED_VERSION_u-boot ?= "2020.07"

meta-arm-bsp/conf/machine/corstone700-fvp.conf

@@ -6,7 +6,7 @@ require conf/machine/include/corstone700.inc
 
 # default feature used: eth_lan91c111
 # add the following line to local.conf to disable the feature:
-# MACHINE_FEATURES:remove = "eth_lan91c111"
+# MACHINE_FEATURES_remove = "eth_lan91c111"
 MACHINE_FEATURES += "eth_lan91c111"
 
 TFA_TARGET_PLATFORM = "fvp"

meta-arm-bsp/conf/machine/corstone700-mps3.conf

@@ -6,12 +6,12 @@ require conf/machine/include/corstone700.inc
 
 # default feature used: eth_lan9115
 # add the following line to local.conf to disable the feature:
-# MACHINE_FEATURES:remove = "eth_lan9115"
+# MACHINE_FEATURES_remove = "eth_lan9115"
 MACHINE_FEATURES += "eth_lan9115"
 
 # default feature used: usb_host
 # add the following line to local.conf to disable the feature:
-# MACHINE_FEATURES:remove = "usb_host"
+# MACHINE_FEATURES_remove = "usb_host"
 MACHINE_FEATURES += "usb_host"
 
 TFA_TARGET_PLATFORM = "fpga"

meta-arm-bsp/conf/machine/fvp-base.conf

@@ -14,19 +14,16 @@ UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig"
 
 KERNEL_IMAGETYPE = "Image"
 
-KERNEL_DEVICETREE = "arm/fvp-base-revc.dtb"
+KERNEL_DEVICETREE = "arm/fvp-base-gicv3-psci-custom.dtb"
 
 FVP_PROVIDER ?= "fvp-base-a-aem-native"
 FVP_EXE ?= "FVP_Base_RevC-2xAEMvA"
-FVP_CONFIG[bp.ve_sysregs.exit_on_shutdown] ?= "1"
-FVP_CONFIG[bp.virtio_net.enabled] ?= "1"
-FVP_CONFIG[bp.virtio_net.hostbridge.userNetworking] ?= "1"
 FVP_CONFIG[cache_state_modelled] ?= "0"
 FVP_CONFIG[bp.secureflashloader.fname] ?= "${DEPLOY_DIR_IMAGE}/bl1-fvp.bin"
 FVP_CONFIG[bp.flashloader0.fname] ?= "${DEPLOY_DIR_IMAGE}/fip-fvp.bin"
 FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.wic"
 FVP_DATA ?= "cluster0.cpu0=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}@0x80080000 \
-            cluster0.cpu0=${DEPLOY_DIR_IMAGE}/fvp-base-revc.dtb@0x83000000"
+            cluster0.cpu0=${DEPLOY_DIR_IMAGE}/fvp-base-gicv3-psci-custom.dtb@0x83000000"
 FVP_CONSOLE ?= "terminal_0"
 FVP_TERMINALS[bp.terminal_0] ?= "Console"
 FVP_TERMINALS[bp.terminal_1] ?= ""

meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf

@@ -9,57 +9,18 @@ require conf/machine/include/arm/armv8r/arch-armv8r64.inc
 EXTRA_IMAGEDEPENDS += "boot-wrapper-aarch64"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "5.14%"
+PREFERRED_VERSION_linux-yocto ?= "5.10%"
-PREFERRED_VERSION_linux-yocto-rt ?= "5.14%"
 
 KERNEL_IMAGETYPE = "Image"
 KERNEL_DEVICETREE = "arm/fvp-baser-aemv8r64.dtb"
 
-UBOOT_MACHINE ?= "vexpress_aemv8r_defconfig"
-
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
 IMAGE_FSTYPES += "wic"
-WKS_FILE ?= "efi-disk.wks.in"
+WKS_FILE ?= "${MACHINE}.wks"
-EFI_PROVIDER ?= "grub-efi"
-MACHINE_FEATURES:append = " efi"
 
 # As this is a virtual target that will not be used in the real world there is
 # no need for real SSH keys.  Disable rng-tools (which takes too long to
 # initialise) and install the pre-generated keys.
-PACKAGECONFIG:remove:pn-openssh = "rng-tools"
+PACKAGECONFIG_remove_pn-openssh = "rng-tools"
 MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys"
-
-FVP_EXTRA_ARGS = "-a cluster0*=${DEPLOY_DIR_IMAGE}/linux-system.axf"
-FVP_PROVIDER ?= "fvp-base-r-aem-native"
-FVP_EXE ?= "FVP_BaseR_AEMv8R"
-FVP_CONSOLE ?= "terminal_0"
-
-# FVP parameters
-FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.wic"
-FVP_CONFIG[bp.dram_metadata.init_value] ?= "0"
-FVP_CONFIG[bp.dram_metadata.is_enabled] ?= "true"
-FVP_CONFIG[bp.exclusive_monitor.monitor_access_level] ?= "1"
-FVP_CONFIG[bp.pl011_uart0.unbuffered_output] ?= "1"
-FVP_CONFIG[bp.pl011_uart0.untimed_fifos] ?= "true"
-FVP_CONFIG[bp.refcounter.non_arch_start_at_default] ?= "1"
-FVP_CONFIG[bp.smsc_91c111.enabled] ?= "0"
-FVP_CONFIG[bp.ve_sysregs.mmbSiteDefault] ?= "0"
-FVP_CONFIG[cache_state_modelled] ?= "0"
-FVP_CONFIG[cluster0.gicv3.cpuintf-mmap-access-level] ?= "2"
-FVP_CONFIG[cluster0.gicv3.SRE-enable-action-on-mmap] ?= "2"
-FVP_CONFIG[cluster0.gicv3.SRE-EL2-enable-RAO] ?= "1"
-FVP_CONFIG[cluster0.gicv3.extended-interrupt-range-support] ?= "1"
-FVP_CONFIG[cluster0.has_aarch64] ?= "1"
-FVP_CONFIG[cluster0.NUM_CORES] ?= "4"
-FVP_CONFIG[cluster0.stage12_tlb_size] ?= "512"
-FVP_CONFIG[gic_distributor.GICD_CTLR-DS-1-means-secure-only] ?= "1"
-FVP_CONFIG[gic_distributor.GITS_BASER0-type] ?= "1"
-FVP_CONFIG[gic_distributor.ITS-count] ?= "1"
-FVP_CONFIG[gic_distributor.ITS-hardware-collection-count] ?= "1"
-FVP_CONFIG[gic_distributor.has-two-security-states] ?= "0"
-FVP_CONFIG[pctl.startup] ?= "0.0.0.*"
-FVP_CONFIG[bp.virtio_net.enabled] ?= "1"
-FVP_CONFIG[bp.virtio_net.hostbridge.userNetworking] ?= "1"
-FVP_CONFIG[bp.vis.rate_limit-enable] ?= "0"
-FVP_CONFIG[bp.refcounter.use_real_time] ?= "1"

meta-arm-bsp/conf/machine/fvp-common.inc

@@ -7,23 +7,39 @@
 
 MACHINE_FEATURES = "optee"
 
-IMAGE_FSTYPES += "wic"
+IMAGE_CLASSES += "image_types_disk_img"
+IMAGE_FSTYPES += "disk.img wic"
+
 WKS_FILE ?= "fvp-base.wks"
 
+# Disk image configuration
+# We don't use the first partition
+DISK_IMG_PARTITION1_SIZE = "128"
+DISK_IMG_PARTITION1_FSTYPE = ""
+DISK_IMG_PARTITION1_CONTENT = ""
+
+# Second partition is used for rootfs
+DISK_IMG_PARTITION2_SIZE = "2048"
+DISK_IMG_PARTITION2_FSTYPE = "ext4"
+DISK_IMG_PARTITION2_CONTENT = "rootfs"
+
+# Empty third partition (8G - 2048M - 128M)
+DISK_IMG_PARTITION3_SIZE = "6016"
+DISK_IMG_PARTITION3_FSTYPE = ""
+DISK_IMG_PARTITION3_CONTENT = ""
+
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.10%"
 
-PREFERRED_VERSION_u-boot ?= "2021.07"
+PREFERRED_VERSION_u-boot ?= "2021.01"
-PREFERRED_VERSION_trusted-firmware-a ?= "2.5%"
+PREFERRED_VERSION_trusted-firmware-a ?= "2.4%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
 
 # As this is a virtual target that will not be used in the real world there is
 # no need for real SSH keys.  Disable rng-tools (which takes too long to
 # initialise) and install the pre-generated keys.
-PACKAGECONFIG:remove:pn-openssh = "rng-tools"
+PACKAGECONFIG_remove_pn-openssh = "rng-tools"
 MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys"
-
-TEST_TARGET = "OEFVPTarget"