CI: only run pending-updates on master

This job takes a few minutes and isn't useful unless it's being ran for
master, or is being actively worked on.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>

.gitignore

@@ -1,2 +1 @@
 __pycache__
-build

.gitlab-ci.yml

@@ -1,13 +1,16 @@
-image: ghcr.io/siemens/kas/kas:3.2.3
+image: ghcr.io/siemens/kas/kas:3.2
 
 variables:
   CPU_REQUEST: ""
   DEFAULT_TAG: ""
-  CACHE_DIR: $CI_BUILDS_DIR/persist
   # These are needed as the k8s executor doesn't respect the container entrypoint
   # by default
-  FF_KUBERNETES_HONOR_ENTRYPOINT: 1
   FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: 0
+  FF_KUBERNETES_HONOR_ENTRYPOINT: 1
+  # The directory to use as the persistent cache (the root for DL_DIR,
+  # SSTATE_DIR, etc). The default is the build tree which will not be
+  # persistent, so this should be set in the runner.
+  CACHE_DIR: $CI_PROJECT_DIR
 
 stages:
   - prep
@@ -21,7 +24,8 @@ stages:
   interruptible: true
   variables:
     KAS_WORK_DIR: $CI_PROJECT_DIR/work
-    KAS_REPO_REF_DIR: $CACHE_DIR/repos
+    KAS_BUILD_DIR: $KAS_WORK_DIR/build
+    KAS_REPO_REF_DIR: ""
     SSTATE_DIR: $CACHE_DIR/sstate
     DL_DIR: $CACHE_DIR/downloads
     BB_LOGCONFIG: $CI_PROJECT_DIR/ci/logging.yml
@@ -29,9 +33,6 @@ stages:
     IMAGE_DIR: $CI_PROJECT_DIR/work/build/tmp/deploy/images
     TOOLCHAIN_LINK_DIR: $CI_PROJECT_DIR/work/build/toolchains
   before_script:
-    - echo KAS_WORK_DIR = $KAS_WORK_DIR
-    - echo SSTATE_DIR = $SSTATE_DIR
-    - echo DL_DIR = $DL_DIR
     - rm -rf $KAS_WORK_DIR
     - 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
@@ -42,24 +43,9 @@ stages:
   extends: .setup
   variables:
     KUBERNETES_CPU_REQUEST: $CPU_REQUEST
-  rules:
-    # Don't run MR pipelines
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      when: never
-    # Don't run pipelines for tags
-    - if: $CI_COMMIT_TAG
-      when: never
-    # Don't run if BUILD_ENABLE_REGEX is set, but the job doesn't match the regex
-    - if: '$BUILD_ENABLE_REGEX != null && $CI_JOB_NAME !~ $BUILD_ENABLE_REGEX'
-      when: never
-    # Allow the dev kernels to fail and not fail the overall build
-    - if: '$KERNEL == "linux-yocto-dev"'
-      allow_failure: true
-    # Catch all for everything else
-    - if: '$KERNEL != "linux-yocto-dev"'
   script:
     - KASFILES=$(./ci/jobs-to-kas "$CI_JOB_NAME")
-    - kas dump --update --force-checkout --resolve-refs --resolve-env $KASFILES 
+    - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf'
     - kas build $KASFILES
     - ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log
   artifacts:
@@ -67,7 +53,17 @@ stages:
     when: on_failure
     paths:
       - $CI_PROJECT_DIR/work/build/tmp/work*/**/temp/log.do_*.*
-      - $CI_PROJECT_DIR/work/build/tmp/work*/**/testimage/*
+
+# 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.
@@ -77,18 +73,24 @@ update-repos:
   extends: .setup
   stage: prep
   script:
-    - flock --verbose --timeout 60 $KAS_REPO_REF_DIR ./ci/update-repos
+    - |
+      exit_code=0
 
+      printenv
+
+      if [ -n "$KAS_REPO_REF_DIR" ]; then
+        flock --verbose --timeout 60 $KAS_REPO_REF_DIR --command ./ci/update-repos || exit_code=$?
+        # Exit now if that failed, unless the status was 128 (fetch failed)
+        test $exit_code != 0 -a $exit_code != 128 && exit 1
+      fi
+
+      exit $exit_code
 #
 # Build stage, the actual build jobs
 #
 # Available options for building are
-#  DISTRO: [poky, poky-tiny]
-#  KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
 #  TOOLCHAINS: [gcc, clang, armgcc, external-gccarm]
 #  TCLIBC: [glibc, musl]
-#  FIRMWARE: [u-boot, edk2]
-#  TS: [none, trusted-services]
 #  VIRT: [none, xen]
 #  TESTING: testimage
 
@@ -104,7 +106,7 @@ corstone1000-fvp:
   extends: .build
   parallel:
     matrix:
-      - TESTING: [testimage, tftf]
+      - TESTING: [testimage,tftf]
   tags:
     - x86_64
 
@@ -116,7 +118,17 @@ fvp-base:
   parallel:
     matrix:
       - TESTING: testimage
-      - FIRMWARE: edk2
+  tags:
+    - x86_64
+
+fvp-base-arm32:
+  extends: .build
+  parallel:
+    matrix:
+      - TOOLCHAINS: [gcc, external-gccarm]
+        TESTING: testimage
+  tags:
+    - x86_64
 
 fvp-baser-aemv8r64:
   extends: .build
@@ -129,6 +141,15 @@ fvp-baser-aemv8r64:
 fvps:
   extends: .build
 
+gem5-arm64:
+  extends: .build
+  parallel:
+    matrix:
+      - VIRT: [none, xen]
+
+gem5-atp-arm64:
+  extends: .build
+
 generic-arm64:
   extends: .build
 
@@ -137,7 +158,13 @@ juno:
   parallel:
     matrix:
       - TOOLCHAINS: [gcc, clang]
-        FIRMWARE: [u-boot, edk2]
+        FIRMWARE: [none, edk2]
+
+microbit-v1:
+  extends: .build_and_test
+  parallel:
+    matrix:
+      - TESTING: testimage-zephyr
 
 musca-b1:
   extends: .build
@@ -150,57 +177,45 @@ n1sdp:
   parallel:
     matrix:
       - TOOLCHAINS: [gcc, armgcc]
-        TS: [none, n1sdp-ts]
+
+qemu-cortex-a53:
+  extends: .build
+
+qemu-cortex-m3:
+  extends: .build_and_test
+  parallel:
+    matrix:
+      - TESTING: testimage-zephyr
+
+qemu-cortex-r5:
+  extends: .build
 
 qemu-generic-arm64:
   extends: .build
   parallel:
     matrix:
-      - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
-        TOOLCHAINS: [gcc, clang]
+      - TOOLCHAINS: [gcc, clang]
         TESTING: testimage
 
 qemuarm64-secureboot:
   extends: .build
   parallel:
     matrix:
-      - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
-        TOOLCHAINS: [gcc, clang]
+      - TOOLCHAINS: [gcc, clang]
         TCLIBC: [glibc, musl]
-        TS: [none, qemuarm64-secureboot-ts]
         TESTING: testimage
 
 qemuarm64:
   extends: .build
   parallel:
     matrix:
-      - DISTRO: poky
-        KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
-        TOOLCHAINS: [gcc, clang]
-        FIRMWARE: [u-boot, edk2]
-        TESTING: testimage
-      - DISTRO: poky-tiny
-        TESTING: testimage
       - VIRT: xen
 
-qemuarm-secureboot:
-  extends: .build
-  parallel:
-    matrix:
-      - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
-        TOOLCHAINS: [gcc, clang, external-gccarm]
-        TESTING: testimage
-
 qemuarm:
   extends: .build
   parallel:
     matrix:
-      - DISTRO: poky
-        KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
-        TOOLCHAINS: [gcc, clang]
-        FIRMWARE: [u-boot, edk2]
-        TESTING: testimage
-      - DISTRO: poky-tiny
+      - TOOLCHAINS: [gcc, clang]
         TESTING: testimage
       - VIRT: xen
 
@@ -208,20 +223,18 @@ qemuarmv5:
   extends: .build
   parallel:
     matrix:
-      - DISTRO: poky
-        KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
-        TESTING: testimage
-      - DISTRO: poky-tiny
-        TESTING: testimage
+      - TESTING: testimage
 
 sgi575:
   extends: .build
 
+tc0:
+  extends: .build
+  tags:
+    - x86_64
+
 tc1:
   extends: .build
-  parallel:
-    matrix:
-      - TESTING: testimage
   tags:
     - x86_64
 
@@ -242,18 +255,23 @@ check-layers:
       "yocto-check-layer-wrapper $CI_PROJECT_DIR/$LAYER --dependency $CI_PROJECT_DIR/meta-* $KAS_WORK_DIR/meta-openembedded/meta-oe --no-auto-dependency"
   parallel:
     matrix:
-      - LAYER: [meta-arm, meta-arm-bsp, meta-arm-toolchain]
+      - LAYER: [meta-arm, meta-arm-bsp, meta-arm-toolchain, meta-gem5]
 
 pending-updates:
   extends: .setup
+  # Only run this job for the default branch (master), or if forced with
+  # BUILD_FORCE_PENDING_UPDATES.
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $BUILD_FORCE_PENDING_UPDATES != null
   artifacts:
     paths:
       - update-report
   script:
     - rm -fr update-report
     # This configuration has all of the layers we need enabled
-    - kas shell --update --force-checkout ci/qemuarm64.yml:ci/meta-openembedded.yml --command \
-      "$CI_PROJECT_DIR/scripts/machine-summary.py -t report -o $CI_PROJECT_DIR/update-report $($CI_PROJECT_DIR/ci/listmachines.py meta-arm meta-arm-bsp)"
+    - kas shell ci/gem5-arm64.yml --command \
+      "$CI_PROJECT_DIR/scripts/machine-summary.py -t report -o $CI_PROJECT_DIR/update-report $($CI_PROJECT_DIR/ci/listmachines.py meta-arm meta-arm-bsp meta-gem5)"
   # Do this on x86 whilst the compilers are x86-only
   tags:
     - x86_64
@@ -273,18 +291,3 @@ metrics:
   script:
     - kas shell --update --force-checkout ci/base.yml --command \
       "$CI_PROJECT_DIR/ci/patchreview $CI_PROJECT_DIR/meta-* --verbose --metrics $CI_PROJECT_DIR/metrics.txt"
-
-documentation:
-  extends: .setup
-  script:
-    - |
-      sudo pip3 install -r meta-arm-bsp/documentation/requirements.txt
-      for CONF in meta-*/documentation/*/conf.py ; do
-        SOURCE_DIR=$(dirname $CONF)
-        MACHINE=$(basename $SOURCE_DIR)
-        sphinx-build -vW $SOURCE_DIR build-docs/$MACHINE
-      done
-      test -d build-docs/
-  artifacts:
-    paths:
-      - build-docs/

README.md

@@ -18,6 +18,15 @@ This repository contains the Arm layers for OpenEmbedded.
 
   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/armgcc.yml

@@ -3,4 +3,4 @@ header:
 
 local_conf_header:
   cc: |
-    GCCVERSION = "arm-12.2"
+    GCCVERSION = "arm-11.2"

ci/base.yml

@@ -5,7 +5,7 @@ distro: poky
 
 defaults:
   repos:
-    refspec: mickledore
+    refspec: kirkstone
 
 repos:
   meta-arm:
@@ -15,7 +15,7 @@ repos:
       meta-arm-toolchain:
 
   poky:
-    url: https://git.yoctoproject.org/git/poky
+    url: https://git.yoctoproject.org/poky
     layers:
       meta:
       meta-poky:
@@ -26,7 +26,10 @@ env:
 
 local_conf_header:
   base: |
+    BB_SERVER_TIMEOUT = "60"
     CONF_VERSION = "2"
+    BB_NUMBER_THREADS = "16"
+    PARALLEL_MAKE = "-j16"
     LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA"
   setup: |
     PACKAGE_CLASSES = "package_ipk"
@@ -35,11 +38,13 @@ local_conf_header:
     PACKAGECONFIG:append:pn-perf = " coresight"
     INHERIT += "rm_work"
     DISTRO_FEATURES:remove = "ptest"
-  extrapackages: |
-    CORE_IMAGE_EXTRA_INSTALL += "perf opencsd"
-    CORE_IMAGE_EXTRA_INSTALL:append:aarch64 = " gator-daemon"
-
+  kvm: |
+    QEMU_USE_KVM = ""
+  perf: |
+    CORE_IMAGE_EXTRA_INSTALL += "perf"
+  sshkeys: |
+    CORE_IMAGE_EXTRA_INSTALL += "ssh-pregen-hostkeys"
 machine: unset
 
 target:
-  - core-image-sato
+  - core-image-base

ci/clang.yml

@@ -6,8 +6,5 @@ repos:
     url: https://github.com/kraj/meta-clang
 
 local_conf_header:
-  toolchain: |
+  clang: |
     TOOLCHAIN = "clang"
-    # This is needed to stop bitbake getting confused about what clang/llvm is
-    # being used, see https://github.com/kraj/meta-clang/pull/766
-    BBMASK += "/meta/recipes-devtools/llvm/llvm.*\.bb"

ci/corstone1000-common.yml

@@ -3,12 +3,11 @@ header:
   includes:
     - ci/base.yml
     - ci/meta-openembedded.yml
-    - ci/poky-tiny.yml
-
 local_conf_header:
-    extrapackages: |
-    # Intentionally blank to prevent perf from being added to the image in base.yml
+    perf: |
+
+distro: poky-tiny
 
 target:
-  - corstone1000-image
   - perf
+  - corstone1000-image

ci/corstone1000-fvp.yml

@@ -2,11 +2,11 @@ header:
   version: 11
   includes:
     - ci/corstone1000-common.yml
-    - ci/fvp.yml
 
 local_conf_header:
     fvp-config: |
         # Remove Dropbear SSH as it will not fit into the corstone1000 image.
         IMAGE_FEATURES:remove = " ssh-server-dropbear"
+        INHERIT += "fvpboot"
 
 machine: corstone1000-fvp

ci/corstone500.yml

@@ -2,11 +2,17 @@ header:
   version: 11
   includes:
     - ci/base.yml
-    - ci/fvp.yml
-    - ci/poky-tiny.yml
 
 local_conf_header:
-  fvp-config: |
+  testimagefvp: |
+    INHERIT += "fvpboot"
     IMAGE_FEATURES:remove = " ssh-server-dropbear"
+  perf: |
 
 machine: corstone500
+
+distro: poky-tiny
+
+target:
+  - core-image-minimal
+  - perf

ci/edk2.yml

@@ -7,11 +7,3 @@ local_conf_header:
     MACHINE_FEATURES += "efi"
     TFA_UBOOT = "0"
     TFA_UEFI = "1"
-
-    EXTRA_IMAGEDEPENDS += "edk2-firmware"
-    EFI_PROVIDER ?= "grub-efi"
-
-    QB_DEFAULT_BIOS = "QEMU_EFI.fd"
-    WKS_FILE ?= "efi-disk.wks.in"
-  failing_tests: |
-    TEST_SUITES:remove = "xorg"

ci/fvp-base-arm32.yml

@@ -0,0 +1,16 @@
+header:
+  version: 11
+  includes:
+    - ci/base.yml
+
+machine: fvp-base-arm32
+
+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:8122, and forward that to SSH in the FVP.
+    TEST_TARGET_IP = "127.0.0.1:8122"
+    FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "8122=22"

ci/fvp-base.yml

@@ -2,6 +2,15 @@ header:
   version: 11
   includes:
     - ci/base.yml
-    - ci/fvp.yml
 
 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/fvp.yml

@@ -1,11 +0,0 @@
-header:
-  version: 11
-
-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"
-  failing_tests: |
-    TEST_SUITES:remove = "xorg"

ci/fvps.yml

@@ -13,8 +13,8 @@ local_conf_header:
 
 target:
   - nativesdk-fvp-base-a-aem
-  - nativesdk-fvp-corstone500
-  - nativesdk-fvp-corstone1000
   - nativesdk-fvp-n1-edge
   - nativesdk-fvp-sgi575
-  - nativesdk-fvp-tc1
+  - nativesdk-fvp-corstone500
+  - nativesdk-fvp-corstone1000
+  - nativesdk-fvp-tc0

ci/gcc.yml

@@ -1,7 +0,0 @@
-header:
-  version: 11
-
-#NOTE: This is the default for poky.  This is only being added for completeness/clarity
-local_conf_header:
-  toolchain: |
-    TOOLCHAIN = "gcc"

ci/gem5-arm64.yml

@@ -0,0 +1,16 @@
+header:
+  version: 11
+  includes:
+    - ci/base.yml
+    - ci/meta-openembedded.yml
+
+repos:
+  meta-arm:
+    layers:
+      meta-gem5:
+
+machine: gem5-arm64
+
+target:
+  - core-image-minimal
+  - gem5-aarch64-native

ci/gem5-atp-arm64.yml

@@ -0,0 +1,15 @@
+header:
+  version: 11
+  includes:
+    - ci/gem5-arm64.yml
+
+repos:
+  meta-arm:
+    layers:
+      meta-atp:
+
+machine: gem5-atp-arm64
+
+target:
+  - atp-native
+  - core-image-minimal

ci/get-binary-toolchains

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -u -e
 
-BASENAME=arm-gnu-toolchain
-VER=${VER:-12.2.rel1}
+BASENAME=gcc-arm
+VER=${VER:-10.3-2021.07}
 HOST_ARCH=${HOST_ARCH:-$(uname -m)}
 
 DOWNLOAD_DIR=$1
@@ -14,7 +14,7 @@ mkdir -p $DOWNLOAD_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR
 
 download() {
 	TRIPLE=$1
-	URL=https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/$BASENAME-$VER-$HOST_ARCH-$TRIPLE.tar.xz
+	URL=https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/$BASENAME-$VER-$HOST_ARCH-$TRIPLE.tar.xz
 	wget -P $DOWNLOAD_DIR -nc $URL
 }
 

ci/glibc.yml

@@ -1,7 +0,0 @@
-header:
-  version: 11
-
-#NOTE: This is the default for poky.  This is only being added for completeness/clarity
-local_conf_header:
-  libc: |
-    TCLIBC = "glibc"

ci/jobs-to-kas

@@ -18,7 +18,7 @@ for i in $(echo $1 | cut -s -d ':' -f 2 | sed 's/[][,]//g'); do
 	# 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' ]]; then
+	if [[ $i == 'none' || $i == 'gcc' || $i == 'glibc' ]]; then
 		continue
 	fi
 	FILES+=":ci/$i.yml"

ci/linux-yocto-dev.yml

@@ -1,6 +0,0 @@
-header:
-  version: 9
-
-local_conf_header:
-  kernel: |
-    PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"

ci/linux-yocto-rt.yml

@@ -1,6 +0,0 @@
-header:
-  version: 9
-
-local_conf_header:
-  kernel: |
-    PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"

ci/linux-yocto.yml

@@ -1,7 +0,0 @@
-header:
-  version: 9
-
-#NOTE: This is the default for poky.  This is only being added for completeness/clarity
-local_conf_header:
-  kernel: |
-    PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"

ci/meta-virtualization.yml

@@ -5,5 +5,4 @@ header:
 
 repos:
   meta-virtualization:
-    url: git://git.yoctoproject.org/meta-virtualization
-    refspec: master
+    url: https://git.yoctoproject.org/meta-virtualization

ci/meta-zephyr.yml

@@ -0,0 +1,13 @@
+header:
+  version: 11
+  includes:
+    - ci/meta-openembedded.yml
+
+repos:
+  meta-zephyr:
+    url: https://git.yoctoproject.org/meta-zephyr
+    layers:
+      meta-zephyr-core:
+
+target:
+  - zephyr-kernel-test-all

ci/microbit-v1.yml

@@ -0,0 +1,7 @@
+header:
+  version: 11
+  includes:
+    - ci/base.yml
+    - ci/meta-zephyr.yml
+
+machine: microbit-v1

ci/musca-b1.yml

@@ -2,9 +2,14 @@ header:
   version: 11
   includes:
     - ci/base.yml
-    - ci/meta-openembedded.yml
+    - ci/meta-zephyr.yml
+
+local_conf_header:
+  nonbuilding_tests: |
+    ZEPHYRTESTS:remove = "common sleep poll device queue"
 
 machine: musca-b1
 
 target:
   - trusted-firmware-m
+  - zephyr-kernel-test-all

ci/musca-s1.yml

@@ -2,9 +2,14 @@ header:
   version: 11
   includes:
     - ci/base.yml
-    - ci/meta-openembedded.yml
+    - ci/meta-zephyr.yml
+
+local_conf_header:
+  nonbuilding_tests: |
+    ZEPHYRTESTS:remove = "common sleep poll device queue"
 
 machine: musca-s1
 
 target:
   - trusted-firmware-m
+  - zephyr-kernel-test-all

ci/n1sdp-ts.yml

@@ -1,14 +0,0 @@
-header:
-  version: 11
-  includes:
-    - ci/meta-openembedded.yml
-
-local_conf_header:
-  trusted_services: |
-    TEST_SUITES:append = " trusted_services"
-    # Include TS Crypto, TS Protected Storage, TS Internal and Trusted Storage SPs into optee-os image
-    MACHINE_FEATURES:append = " arm-ffa ts-crypto ts-storage ts-its"
-    # Include TS demo/test tools into image
-    IMAGE_INSTALL:append = " packagegroup-ts-tests"
-    # Include TS PSA Arch tests into image
-    IMAGE_INSTALL:append = " packagegroup-ts-tests-psa"

ci/n1sdp.yml

@@ -4,7 +4,3 @@ header:
     - ci/base.yml
 
 machine: n1sdp
-
-local_conf_header:
-  unsupported_trusted_services: |
-    MACHINE_FEATURES:remove = "ts-smm-gateway"

ci/poky-tiny.yml

@@ -1,14 +0,0 @@
-header:
-  version: 9
-
-distro: poky-tiny
-
-local_conf_header:
-  hacking: |
-    TEST_SUITES = "ping"
-  extrapackages: |
-    # Intentionally blank to prevent perf from being added to the image in base.yml
-
-target:
-  - core-image-minimal
-  - perf

ci/poky.yml

@@ -1,4 +0,0 @@
-header:
-  version: 9
-
-distro: poky

ci/qemu-cortex-a53.yml

@@ -0,0 +1,9 @@
+header:
+  version: 11
+  includes:
+    - ci/base.yml
+    - ci/meta-zephyr.yml
+
+# FIXME - testimage fails all tests currently, but all the tests build
+
+machine: qemu-cortex-a53

ci/qemu-cortex-m3.yml

@@ -0,0 +1,20 @@
+header:
+  version: 11
+  includes:
+    - ci/base.yml
+    - ci/meta-zephyr.yml
+
+repos:
+  meta-zephyr:
+    layers:
+      meta-zephyr-bsp:
+
+local_conf_header:
+  tclibc: |
+    TCLIBC = "newlib"
+  nonbuilding_tests: |
+    ZEPHYRTESTS:remove = "context pending poll sleep"
+  qemu_opts: |
+    QB_OPT_APPEND = "-icount shift=3,align=off,sleep=on -rtc clock=vm"
+
+machine: qemu-cortex-m3

ci/qemu-cortex-r5.yml

@@ -0,0 +1,11 @@
+header:
+  version: 11
+  includes:
+    - ci/base.yml
+    - ci/meta-zephyr.yml
+
+local_conf_header:
+  nonbuilding_tests: |
+    ZEPHYRTESTS:remove = "common poll sleep queue device"
+
+machine: qemu-cortex-r5

ci/qemu-generic-arm64.yml

@@ -10,5 +10,5 @@ local_conf_header:
 machine: qemu-generic-arm64
 
 target:
-  - core-image-sato
+  - core-image-base
   - sbsa-acs

ci/qemuarm-secureboot.yml

@@ -1,12 +0,0 @@
-header:
-  version: 11
-  includes:
-    - ci/base.yml
-
-machine: qemuarm-secureboot
-
-target:
-  - core-image-base
-  - optee-examples
-  - optee-test
-  - optee-os-tadevkit

ci/qemuarm64-secureboot-ts.yml

@@ -1,14 +0,0 @@
-header:
-  version: 11
-  includes:
-    - ci/meta-openembedded.yml
-
-local_conf_header:
-  trusted_services: |
-    TEST_SUITES:append = " trusted_services"
-    # Include TS Crypto, TS Protected Storage, TS Internal Trusted Storage and SMM-Gateway SPs into optee-os image
-    MACHINE_FEATURES:append = " arm-ffa ts-crypto ts-storage ts-its ts-smm-gateway"
-    # Include TS demo/test tools into image
-    IMAGE_INSTALL:append = " packagegroup-ts-tests"
-    # Include TS PSA Arch tests into image
-    IMAGE_INSTALL:append = " packagegroup-ts-tests-psa"

ci/qemuarm64-secureboot.yml

@@ -5,8 +5,14 @@ header:
 
 machine: qemuarm64-secureboot
 
+local_conf_header:
+  failing_tests: |
+    # software IO TLB: Cannot allocate buffer
+    DEFAULT_TEST_SUITES:remove = "parselogs"
+
 target:
   - core-image-base
   - optee-examples
   - optee-test
+  - optee-spdevkit
   - optee-os-tadevkit

ci/tc0.yml

@@ -0,0 +1,9 @@
+header:
+  version: 11
+  includes:
+    - ci/base.yml
+
+machine: tc0
+
+target:
+  - tc-artifacts-image

ci/tc1.yml

@@ -2,11 +2,8 @@ header:
   version: 11
   includes:
     - ci/base.yml
-    - ci/fvp.yml
-    - ci/meta-openembedded.yml
 
 machine: tc1
 
 target:
-  - core-image-minimal
-  - trusted-firmware-m
+  - tc-artifacts-image

ci/testimage-zephyr.yml

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

ci/testimage.yml

@@ -5,15 +5,9 @@ local_conf_header:
   testimage: |
     IMAGE_CLASSES += "testimage"
     TESTIMAGE_AUTO = "1"
-  kvm: |
-    QEMU_USE_KVM = ""
   slirp: |
     TEST_RUNQEMUPARAMS = "slirp"
     TEST_SERVER_IP = "127.0.0.1"
     QEMU_USE_SLIRP = "1"
   sshd: |
     IMAGE_FEATURES:append = " ssh-server-dropbear"
-  sshkeys: |
-    CORE_IMAGE_EXTRA_INSTALL += "ssh-pregen-hostkeys"
-  universally_failing_tests: |
-    TEST_SUITES:remove = "opkg"

ci/u-boot.yml

@@ -1,8 +0,0 @@
-header:
-  version: 11
-
-local_conf_header:
-  bootfirmware: |
-    PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-    TFA_UBOOT = "1"
-    TFA_UEFI = "0"

ci/update-repos

@@ -20,9 +20,10 @@ def repo_shortname(url):
             .replace('*', '.'))
 
 repositories = (
-    "https://git.yoctoproject.org/git/poky",
+    "https://git.yoctoproject.org/poky",
     "https://git.openembedded.org/meta-openembedded",
-    "https://git.yoctoproject.org/git/meta-virtualization",
+    "https://git.yoctoproject.org/meta-virtualization",
+    "https://git.yoctoproject.org/meta-zephyr",
     "https://github.com/kraj/meta-clang",
 )
 

documentation/oeqa-fvp.md

@@ -4,7 +4,7 @@ OE-Core's [oeqa][OEQA] framework provides a method of performing runtime tests o
 
 Tests can be configured to run automatically post-build by setting the variable `TESTIMAGE_AUTO="1"`, e.g. in your Kas file or local.conf.
 
-There are two main methods of testing, using different test "targets". Both test targets generate an additional log file with the prefix 'fvp_log' in the image recipe's `${WORKDIR}/testimage` containing the FVP's stdout.
+There are two main methods of testing, using different test "targets".
 
 ## OEFVPTarget
 

documentation/trusted-services.md

@@ -1,65 +0,0 @@
-# The Trusted Services: framework for developing root-of-trust services
-
-meta-arm layer includes recipes for [Trusted Services][^1] Secure Partitions and Normal World applications
-in `meta-arm/recipes-security/trusted-services`
-
-## Secure Partitions recipes
-
-We define dedicated recipes for all supported Trusted Services (TS) Secure Partitions.
-These recipes produce ELF and DTB files for SPs.
-These files are automatically included into optee-os image accordingly to defined MACHINE_FEATURES.
-
-### How to include TS SPs
-
-To include TS SPs into optee-os image you need to add into MACHINE_FEATURES
-features for each [Secure Partition][^2] you would like to include:
-
-| Secure Partition  | MACHINE_FEATURE |
-| ----------------- | --------------- |
-| Attestation       | ts-attesation   |
-| Crypto            | ts-crypto       |
-| Internal Storage  | ts-its          |
-| Protected Storage | ts-storage      |
-| se-proxy          | ts-se-proxy     |
-| smm-gateway       | ts-smm-gateway  |
-| spm-test[1-3]     | optee-spmc-test |
-
-Other steps depend on your machine/platform definition:
-
-1. For communications between Secure and Normal Words Linux kernel option `CONFIG_ARM_FFA_TRANSPORT=y`
-   is required. If your platform doesn't include it already you can add `arm-ffa` into MACHINE_FEATURES.
-   (Please see ` meta-arm/recipes-kernel/arm-ffa-tee`.)
-
-   For running the `uefi-test` or the `xtest -t ffa_spmc` tests under Linux the `arm-ffa-user` drivel is required. This is
-   enabled if the `ts-smm-gateway` and/or the `optee-spmc-test` machine features are enabled.
-   (Please see ` meta-arm/recipes-kernel/arm-ffa-user`.)
-
-2. optee-os might require platform specific OP-TEE build parameters (for example what SEL the SPM Core is implemented at).
-   You can find examples in `meta-arm/recipes-security/optee/optee-os_%.bbappend` for qemuarm64-secureboot machine
-   and in `meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc` and `meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc`
-   for N1SDP and Corstone1000 platforms accordingly.
-
-3. trusted-firmware-a might require platform specific TF-A build parameters (SPD and SPMC details on the platform).
-   See `meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend` for qemuarm64-secureboot machine
-   and in `meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-n1sdp.inc` and
-   `meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc` for N1SDP and Corstone1000 platforms.
-
-## Normal World applications
-
-Optionally for testing purposes you can add `packagegroup-ts-tests` into your image. It includes 
-[Trusted Services test and demo tools][^3] and [xtest][^4] configured to include the `ffa_spmc` tests.
-
-## OEQA Trusted Services tests
-
-  meta-arm also includes Trusted Service OEQA tests which can be used for automated testing.
-See `ci/trusted-services.yml` for an example how to include them into an image.
-
-
-------
-[^1]: https://trusted-services.readthedocs.io/en/integration/overview/index.html
-
-[^2]: https://trusted-services.readthedocs.io/en/integration/deployments/secure-partitions.html
-
-[^3]: https://trusted-services.readthedocs.io/en/integration/deployments/test-executables.html
-
-[^4]: https://optee.readthedocs.io/en/latest/building/gits/optee_test.html

kas/corstone1000-base.yml

@@ -5,7 +5,7 @@ distro: poky-tiny
 
 defaults:
   repos:
-    refspec: mickledore
+    refspec: kirkstone
 
 repos:
   meta-arm:
@@ -16,7 +16,6 @@ repos:
 
   poky:
     url: https://git.yoctoproject.org/git/poky
-    refspec: 31dd418207f6c95ef0aad589cd03cd2a4c9a8bf2
     layers:
       meta:
       meta-poky:
@@ -24,7 +23,6 @@ repos:
 
   meta-openembedded:
     url: https://git.openembedded.org/meta-openembedded
-    refspec: 5a01ab461c9bcabcbb2298236602373948f8f073
     layers:
       meta-oe:
       meta-python:

meta-arm-autonomy/README.md

@@ -0,0 +1,23 @@
+meta-arm-autonomy Yocto Layer
+=============================
+
+The meta-arm-autonomy layer is being deprecated from master, with bug fixes
+only being applied to the following branches. Additionally, all support and
+maintenance of meta-arm-autonomy will stop as per the schedule below.
+
+    honister: End-of-life scheduled to June 2022
+    hardknot: End-of-life scheduled to December 2021
+    gatesgarth: End-of-life scheduled to October 2021
+    dunfell: End-of-life scheduled to October 2021
+    master: End-of-life scheduled to October 2021 and code removed
+
+
+Contributing
+------------
+This project has not put in place a process for contributions currently. If you
+would like to contribute, please contact the maintainers
+
+
+Maintainer(s)
+-------------
+* Diego Sueiro <diego.sueiro@arm.com>

meta-arm-bsp/classes/wic_nopt.bbclass

@@ -1,7 +1,7 @@
 # This class removes the empty partition table header
 # in the WIC file when --no-table WKS option is used
 
-IMAGE_TYPES:append = " wic.nopt"
+IMAGE_TYPES += "wic.nopt"
 
 CONVERSIONTYPES += "nopt"
 

meta-arm-bsp/conf/layer.conf

@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-arm-bsp"
 BBFILE_PATTERN_meta-arm-bsp = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-arm-bsp = "5"
 
-LAYERSERIES_COMPAT_meta-arm-bsp = "mickledore"
+LAYERSERIES_COMPAT_meta-arm-bsp = "kirkstone"
 
 LAYERDEPENDS_meta-arm-bsp = "core meta-arm"
 # This won't be used by layerindex-fetch, but works everywhere else

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

@@ -29,13 +29,9 @@ FVP_CONFIG[board.se_flash_size] ?= "8192"
 FVP_CONFIG[diagnostics] ?= "4"
 FVP_CONFIG[disable_visualisation] ?= "true"
 FVP_CONFIG[se.nvm.update_raw_image] ?= "0"
-FVP_CONFIG[se.cryptocell.USER_OTP_FILTERING_DISABLE] ?= "1"
 
 # Boot image
-FVP_DATA ?= "board.flash0=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.wic@0x68000000"
-
-# External system (cortex-M3)
-FVP_CONFIG[extsys_harness0.extsys_flashloader.fname] ?= "${DEPLOY_DIR_IMAGE}/es_flashfw.bin"
+FVP_DATA ?= "board.flash0=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.wic.nopt@0x68100000"
 
 # FVP Terminals
 FVP_TERMINALS[host.host_terminal_0] ?= "Normal World Console"
@@ -43,9 +39,3 @@ FVP_TERMINALS[host.host_terminal_1] ?= "Secure World Console"
 FVP_TERMINALS[se.secenc_terminal] ?= "Secure Enclave Console"
 FVP_TERMINALS[extsys0.extsys_terminal] ?= "Cortex M3"
 
-# MMC card configuration
-FVP_CONFIG[board.msd_mmc.card_type] ?= "SDHC"
-FVP_CONFIG[board.msd_mmc.p_fast_access] ?= "0"
-FVP_CONFIG[board.msd_mmc.diagnostics] ?= "2"
-FVP_CONFIG[board.msd_mmc.p_max_block_count] ?= "0xFFFF"
-FVP_CONFIG[board.msd_config.pl180_fifo_depth] ?= "16"

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

@@ -12,7 +12,7 @@ require conf/machine/include/arm/armv7a/tune-cortexa5.inc
 # apply.
 #
 PREFERRED_PROVIDER_virtual/kernel:forcevariable = "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "6.1%"
+PREFERRED_VERSION_linux-yocto ?= "5.15%"
 
 EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot"
 
@@ -26,7 +26,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
 UBOOT_MACHINE = "corstone500_defconfig"
 UBOOT_IMAGE_ENTRYPOINT = "0x84000000"
 UBOOT_IMAGE_LOADADDRESS = "0x84000000"
-PREFERRED_VERSION_u-boot ?= "2023.01"
+PREFERRED_VERSION_u-boot ?= "2022.01"
 
 # making sure EXTRA_IMAGEDEPENDS will be used while creating the image
 WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
@@ -43,6 +43,3 @@ FVP_DATA ?= "css.cluster.cpu0=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.wic.nopt@
 FVP_CONSOLE ?= "terminal_0"
 FVP_TERMINALS[css.terminal_0] ?= "console"
 FVP_TERMINALS[css.terminal_1] ?= ""
-
-# Disable openssl in kmod to shink the initramfs size
-PACKAGECONFIG:remove:pn-kmod = "openssl"

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

@@ -0,0 +1,23 @@
+# Configuration for Armv7-A Base Platform FVP
+
+#@TYPE: Machine
+#@NAME: Armv7-A Base Platform FVP machine
+#@DESCRIPTION: Machine configuration for Armv7-A Base Platform FVP model
+
+require conf/machine/fvp-common.inc
+require conf/machine/include/arm/arch-armv7a.inc
+
+# FVP u-boot configuration
+PREFERRED_VERSION_u-boot ?= "2021.10"
+UBOOT_MACHINE = "vexpress_aemv8a_aarch32_defconfig"
+
+KERNEL_IMAGETYPE = "zImage"
+
+FVP_CONFIG[cluster0.cpu0.CONFIG64] = "0"
+FVP_CONFIG[cluster0.cpu1.CONFIG64] = "0"
+FVP_CONFIG[cluster0.cpu2.CONFIG64] = "0"
+FVP_CONFIG[cluster0.cpu3.CONFIG64] = "0"
+FVP_CONFIG[cluster1.cpu0.CONFIG64] = "0"
+FVP_CONFIG[cluster1.cpu1.CONFIG64] = "0"
+FVP_CONFIG[cluster1.cpu2.CONFIG64] = "0"
+FVP_CONFIG[cluster1.cpu3.CONFIG64] = "0"

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

@@ -4,16 +4,12 @@
 #@NAME: Armv8-A Base Platform FVP machine
 #@DESCRIPTION: Machine configuration for Armv8-A Base Platform FVP model
 
-require conf/machine/include/fvp-common.inc
+require conf/machine/fvp-common.inc
 require conf/machine/include/arm/arch-armv8a.inc
 
 TUNE_FEATURES = "aarch64"
 
-PREFERRED_VERSION_u-boot ?= "2023.01"
-
 # FVP u-boot configuration
 UBOOT_MACHINE = "vexpress_aemv8a_semi_defconfig"
 
 KERNEL_IMAGETYPE = "Image"
-
-FVP_CONFIG[bp.virtio_rng.enabled] ?= "1"

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

@@ -9,7 +9,8 @@ require conf/machine/include/arm/armv8r/arch-armv8r64.inc
 EXTRA_IMAGEDEPENDS += "boot-wrapper-aarch64"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_u-boot ?= "2022.10"
+PREFERRED_VERSION_linux-yocto ?= "5.15%"
+PREFERRED_VERSION_linux-yocto-rt ?= "5.15%"
 
 KERNEL_IMAGETYPE = "Image"
 KERNEL_DEVICETREE = "arm/fvp-baser-aemv8r64.dtb"
@@ -25,7 +26,9 @@ 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.
+# 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"
 MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys"
 
 # testimage configuration

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

@@ -16,22 +16,21 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 
 KERNEL_DEVICETREE = "arm/fvp-base-revc.dtb"
 
-EXTRA_IMAGEDEPENDS += "trusted-firmware-a"
+EXTRA_IMAGEDEPENDS += "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.
+# 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"
 MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys"
 
 TEST_TARGET = "OEFVPTarget"
-TEST_TARGET_IP = "127.0.0.1:8022"
 
 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"
-# Tell testimage to connect to localhost:8022, and forward that to SSH in the FVP.
-FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "8022=22"
 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"
@@ -41,7 +40,7 @@ FVP_CONFIG[cluster0.has_arm_v8-4] = "1"
 FVP_CONFIG[cluster1.has_arm_v8-4] = "1"
 FVP_CONSOLE ?= "terminal_0"
 FVP_DATA ?= "cluster0.cpu0=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}@0x80080000 \
-             cluster0.cpu0=${DEPLOY_DIR_IMAGE}/fvp-base-revc.dtb@0x8fc00000"
+             cluster0.cpu0=${DEPLOY_DIR_IMAGE}/fvp-base-revc.dtb@0x83000000"
 FVP_TERMINALS[bp.terminal_0] ?= "Console"
 FVP_TERMINALS[bp.terminal_1] ?= ""
 FVP_TERMINALS[bp.terminal_2] ?= ""

meta-arm-bsp/conf/machine/include/corstone1000.inc

@@ -10,6 +10,8 @@ TFA_BL2_BINARY = "bl2-corstone1000.bin"
 TFA_FIP_BINARY = "fip-corstone1000.bin"
 
 # TF-M
+PREFERRED_VERSION_trusted-firmware-m ?= "1.5%"
+TFM_PLATFORM = "arm/corstone1000"
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m"
 
 # TF-M settings for signing host images
@@ -18,11 +20,11 @@ TFA_BL2_RE_SIGN_BIN_SIZE = "0x2d000"
 TFA_FIP_RE_IMAGE_LOAD_ADDRESS = "0x68130000"
 TFA_FIP_RE_SIGN_BIN_SIZE = "0x00200000"
 RE_LAYOUT_WRAPPER_VERSION = "0.0.7"
-TFM_SIGN_PRIVATE_KEY = "${libdir}/tfm-scripts/root-RSA-3072_1.pem"
+TFM_SIGN_PRIVATE_KEY = "${S}/bl2/ext/mcuboot/root-RSA-3072_1.pem"
 RE_IMAGE_OFFSET = "0x1000"
 
 # u-boot
-PREFERRED_VERSION_u-boot ?= "2023.01"
+PREFERRED_VERSION_u-boot ?= "2022.01"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 UBOOT_CONFIG ??= "EFI"
@@ -33,24 +35,19 @@ UBOOT_BOOTARGS = "earlycon=pl011,0x1a510000 console=ttyAMA0 loglevel=9"
 UBOOT_ARCH = "arm"
 UBOOT_EXTLINUX = "0"
 
-#optee
-PREFERRED_VERSION_optee-os ?= "3.20.%"
-PREFERRED_VERSION_optee-client ?= "3.18.%"
+# optee
+PREFERRED_VERSION_optee-os ?= "3.14%"
+PREFERRED_VERSION_optee-client ?= "3.14%"
 EXTRA_IMAGEDEPENDS += "optee-os"
 OPTEE_ARCH = "arm64"
 OPTEE_BINARY = "tee-pager_v2.bin"
 
-# Include smm-gateway and se-proxy SPs into optee-os binary
-MACHINE_FEATURES += "ts-smm-gateway ts-se-proxy"
-TS_PLATFORM = "arm/corstone1000"
-TS_SP_SE_PROXY_CONFIG = "corstone1000"
-
-# External System(Cortex-M3)
-EXTRA_IMAGEDEPENDS += "external-system"
+# Trusted Services(TS)
+EXTRA_IMAGEDEPENDS += "secure-partitions"
 
 # Linux kernel
 PREFERRED_PROVIDER_virtual/kernel:forcevariable = "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "6.1%"
+PREFERRED_VERSION_linux-yocto = "5.15%"
 KERNEL_IMAGETYPE = "Image.gz"
 
 INITRAMFS_IMAGE_BUNDLE ?= "1"
@@ -58,9 +55,6 @@ INITRAMFS_IMAGE_BUNDLE ?= "1"
 #telling the build system which image is responsible of the generation of the initramfs rootfs
 INITRAMFS_IMAGE = "corstone1000-initramfs-image"
 
-# add FF-A support in the kernel
-MACHINE_FEATURES += "arm-ffa"
-
 # prevent the kernel image from being included in the intramfs rootfs
 PACKAGE_EXCLUDE = "kernel-image-*"
 
@@ -74,6 +68,3 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0"
 WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
 
 WKS_FILE ?= "corstone1000-image.corstone1000.wks"
-
-# Disable openssl in kmod to shink the initramfs size
-PACKAGECONFIG:remove:pn-kmod = "openssl"

meta-arm-bsp/conf/machine/include/tc.inc

@@ -6,18 +6,24 @@ MACHINEOVERRIDES =. "tc:"
 
 # Das U-boot
 UBOOT_MACHINE ?= "total_compute_defconfig"
-PREFERRED_VERSION_u-boot ?= "2022.04"
+PREFERRED_VERSION_u-boot ?= "2021.10"
 UBOOT_RD_LOADADDRESS = "0x88000000"
 UBOOT_RD_ENTRYPOINT = "0x88000000"
 UBOOT_LOADADDRESS = "0x80080000"
 UBOOT_ENTRYPOINT = "0x80080000"
+# Below options will generate a key to sign the kernel Image and INITRAMFS_IMAGE
+# according to the default parameters of kernel-fitimage.bbclass. If the user
+# would prefer to use their own keys, disable the key generation using the
+# FIT_GENERATE_KEYS parameter and specify the location of the keys using the
+# below paramters.
+UBOOT_SIGN_ENABLE = "1"
+UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb"
+UBOOT_SIGN_KEYNAME = "dev_key"
+UBOOT_SIGN_KEYDIR = "${DEPLOY_DIR_IMAGE}/keys"
+FIT_GENERATE_KEYS = "1"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm64-ack"
-
-# OP-TEE
-PREFERRED_VERSION_optee-os ?= "3.18%"
-PREFERRED_VERSION_optee-client ?= "3.18%"
-PREFERRED_VERSION_optee-test ?= "3.18%"
+PREFERRED_VERSION_linux-arm64-ack ?= "5.10"
 
 # Cannot use the default zImage on arm64
 KERNEL_IMAGETYPE = "Image"
@@ -28,8 +34,3 @@ IMAGE_FSTYPES += "cpio.gz"
 INITRAMFS_IMAGE ?= "core-image-minimal"
 
 SERIAL_CONSOLES = "115200;ttyAMA0"
-
-EXTRA_IMAGEDEPENDS += "trusted-firmware-a optee-os"
-# FIXME - there is signed image dependency/race with testimage.
-# This should be fixed in oe-core
-TESTIMAGEDEPENDS:append = " virtual/kernel:do_deploy"

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

@@ -18,6 +18,7 @@ IMAGE_FSTYPES += "tar.bz2 ext4 cpio.gz"
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_u-boot ?= "2020.07"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
 
 EXTRA_IMAGEDEPENDS += "trusted-firmware-a virtual/bootloader firmware-image-juno"

meta-arm-bsp/conf/machine/musca-b1.conf

@@ -16,8 +16,13 @@ IMAGE_CLASSES += "qemuboot"
 QB_SYSTEM_NAME = "qemu-system-arm"
 QB_MACHINE = "-machine musca-b1"
 QB_CPU = "-cpu cortex-m33"
-QB_GRAPHICS = "-nographic -vga none"
+QB_OPT_APPEND = "-nographic -vga none"
 QB_MEM = "512k"
 QB_RNG = ""
 
-TFM_PLATFORM = "arm/musca_b1"
+# Zephyr RTOS settings
+ZEPHYR_BOARD = "v2m_musca_b1"
+ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
+ARCH:musca-b1 = "arm"
+
+TFM_PLATFORM = "arm/musca_b1/sse_200"

meta-arm-bsp/conf/machine/musca-s1.conf

@@ -15,8 +15,13 @@ IMAGE_CLASSES += "qemuboot"
 QB_SYSTEM_NAME = "qemu-system-arm"
 QB_MACHINE = "-machine musca-s1"
 QB_CPU = "-cpu cortex-m33"
-QB_GRAPHICS = "-nographic -vga none"
+QB_OPT_APPEND = "-nographic -vga none"
 QB_MEM = "512k"
 QB_RNG = ""
 
+# Zephyr RTOS settings
+ZEPHYR_BOARD = "v2m_musca_s1"
+ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
+ARCH:musca-s1 = "arm"
+
 TFM_PLATFORM = "arm/musca_s1"

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

@@ -19,20 +19,18 @@ WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
 
 # Use kernel provided by yocto
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "6.1%"
+PREFERRED_VERSION_linux-yocto ?= "5.15%"
 
 # RTL8168E Gigabit Ethernet Controller is attached to the PCIe interface
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
 
 EXTRA_IMAGEDEPENDS += "trusted-firmware-a"
+PREFERRED_VERSION_trusted-firmware-a ?= "2.7%"
+
 EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
 
 #UEFI EDK2 firmware
 EXTRA_IMAGEDEPENDS += "edk2-firmware"
-PREFERRED_VERSION_edk2-firmware ?= "202211"
-
-#optee
-PREFERRED_VERSION_optee-os ?= "3.20.%"
 
 #grub-efi
 EFI_PROVIDER ?= "grub-efi"

meta-arm-bsp/conf/machine/qemu-cortex-r5.conf

@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: qemu_cortex_r5
+#@DESCRIPTION: Machine for Zephyr BOARD qemu_cortex_r5
+
+require conf/machine/include/qemu.inc
+require conf/machine/include/arm/armv7r/tune-cortexr5.inc
+
+# GLIBC will not work with Cortex-R.
+TCLIBC = "newlib"
+
+# For runqemu
+QB_SYSTEM_NAME = "qemu-system-aarch64"
+QB_MACHINE = "-machine xlnx-zcu102"
+QB_CPU = "-cpu cortex-r5"
+QB_MEM = "-m 64k"
+QB_OPT_APPEND = "-nographic -vga none"
+QB_RNG = ""
+
+# Zephyr RTOS settings
+ZEPHYR_BOARD = "qemu_cortex_r5"
+ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
+ARCH:qemu-cortex-r5 = "arm"

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

@@ -0,0 +1,7 @@
+# Configuration for TC0
+
+#@TYPE: Machine
+#@NAME: TC0
+#@DESCRIPTION: Machine configuration for TC0
+
+require conf/machine/include/tc.inc

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

@@ -5,27 +5,3 @@
 #@DESCRIPTION: Machine configuration for TC1
 
 require conf/machine/include/tc.inc
-
-TEST_TARGET = "OEFVPSerialTarget"
-TEST_SUITES = "linuxboot"
-
-# FVP Config
-FVP_PROVIDER ?= "fvp-tc1-native"
-FVP_EXE ?= "FVP_TC1"
-
-# FVP Parameters
-FVP_CONFIG[css.scp.ROMloader.fname] ?= "${DEPLOY_DIR_IMAGE}/scp_romfw.bin"
-FVP_CONFIG[css.trustedBootROMloader.fname] ?= "${DEPLOY_DIR_IMAGE}/bl1-tc.bin"
-FVP_CONFIG[board.flashloader0.fname] ?= "${DEPLOY_DIR_IMAGE}/fip_gpt-tc.bin"
-
-#FVP_CONFIG[board.hostbridge.userNetworking] ?= "true"
-#FVP_CONFIG[board.hostbridge.userNetPorts] ?= "8022=22"
-#smsc ethernet takes a very long time to come up.  disable now to prevent testimage timeout
-#FVP_CONFIG[board.smsc_91c111.enabled] ?= "1"
-
-FVP_CONSOLE = "terminal_s1"
-FVP_TERMINALS[soc.terminal_s0] ?= "Secure Console"
-FVP_TERMINALS[soc.terminal_s1] ?= "Console"
-
-# Boot image
-FVP_DATA ?= "board.dram=${DEPLOY_DIR_IMAGE}/fitImage-core-image-minimal-tc1-tc1@0x20000000"

meta-arm-bsp/documentation/corstone1000/change-log.rst

@@ -1,230 +0,0 @@
-..
- # Copyright (c) 2022-2023, Arm Limited.
- #
- # SPDX-License-Identifier: MIT
-
-##########
-Change Log
-##########
-
-This document contains a summary of the new features, changes and
-fixes in each release of Corstone-1000 software stack.
-
-***************
-Version 2023.06
-***************
-
-Changes
-=======
-
-- GPT support (in TF-M, TF-A, U-boot)
-- Use TF-M BL1 code as the ROM code instead of MCUboot (the next stage bootloader BL2 remains to be MCUboot)
-- Secure Enclave uses CC312 OTP as the provisioning backend in FVP and FPGA
-- NVMXIP block storage support in U-Boot
-- Upgrading the SW stack recipes
-- Upgrades for the U-Boot FF-A driver and MM communication
-
-Corstone-1000 components versions
-=================================
-
-+-------------------------------------------+--------------------------------------------+
-| arm-ffa-tee                               | 1.1.2-r0                                   |
-+-------------------------------------------+--------------------------------------------+
-| arm-ffa-user                              | 5.0.1-r0                                   |
-+-------------------------------------------+--------------------------------------------+
-| corstone1000-external-sys-tests           | 1.0+gitAUTOINC+2945cd92f7-r0               |
-+-------------------------------------------+--------------------------------------------+
-| external-system                           | 0.1.0+gitAUTOINC+8c9dca74b1-r0             |
-+-------------------------------------------+--------------------------------------------+
-| linux-yocto                               | 6.1.25+gitAUTOINC+36901b5b29_581dc1aa2f-r0 |
-+-------------------------------------------+--------------------------------------------+
-| u-boot                                    | 2023.01-r0                                 |
-+-------------------------------------------+--------------------------------------------+
-| optee-client                              | 3.18.0-r0                                  |
-+-------------------------------------------+--------------------------------------------+
-| optee-os                                  | 3.20.0-r0                                  |
-+-------------------------------------------+--------------------------------------------+
-| trusted-firmware-a                        | 2.8.0-r0                                   |
-+-------------------------------------------+--------------------------------------------+
-| trusted-firmware-m                        | 1.7.0-r0                                   |
-+-------------------------------------------+--------------------------------------------+
-| ts-newlib                                 | 4.1.0-r0                                   |
-+-------------------------------------------+--------------------------------------------+
-| ts-psa-{crypto, iat, its. ps}-api-test    | 38cb53a4d9                                 |
-+-------------------------------------------+--------------------------------------------+
-| ts-sp-{se-proxy, smm-gateway}             | 08b3d39471                                 |
-+-------------------------------------------+--------------------------------------------+
-
-Yocto distribution components versions
-======================================
-
-+-------------------------------------------+--------------------------------+
-| meta-arm                                  | mickledore                     |
-+-------------------------------------------+--------------------------------+
-| poky                                      | mickledore                     |
-+-------------------------------------------+--------------------------------+
-| meta-openembedded                         | mickledore                     |
-+-------------------------------------------+--------------------------------+
-| busybox                                   | 1.36.0-r0                      |
-+-------------------------------------------+--------------------------------+
-| musl                                      | 1.2.3+gitAUTOINC+7d756e1c04-r0 |
-+-------------------------------------------+--------------------------------+
-| gcc-arm-none-eabi-native                  | 11.2-2022.02                   |
-+-------------------------------------------+--------------------------------+
-| gcc-cross-aarch64                         | 12.2.rel1-r0                   |
-+-------------------------------------------+--------------------------------+
-| openssl                                   | 3.1.0-r0                       |
-+-------------------------------------------+--------------------------------+
-
-******************
-Version 2022.11.23
-******************
-
-Changes
-=======
-
-- Booting the External System (Cortex-M3) with RTX RTOS
-- Adding MHU communication between the HOST (Cortex-A35) and the External System
-- Adding a Linux application to test the External System
-- Adding ESRT (EFI System Resource Table) support
-- Upgrading the SW stack recipes
-- Upgrades for the U-Boot FF-A driver and MM communication
-
-Corstone-1000 components versions
-=================================
-
-+-------------------------------------------+------------+
-| arm-ffa-tee                               | 1.1.1      |
-+-------------------------------------------+------------+
-| arm-ffa-user                              | 5.0.0      |
-+-------------------------------------------+------------+
-| corstone1000-external-sys-tests           | 1.0        |
-+-------------------------------------------+------------+
-| external-system                           | 0.1.0      |
-+-------------------------------------------+------------+
-| linux-yocto                               | 5.19       |
-+-------------------------------------------+------------+
-| u-boot                                    | 2022.07    |
-+-------------------------------------------+------------+
-| optee-client                              | 3.18.0     |
-+-------------------------------------------+------------+
-| optee-os                                  | 3.18.0     |
-+-------------------------------------------+------------+
-| trusted-firmware-a                        | 2.7.0      |
-+-------------------------------------------+------------+
-| trusted-firmware-m                        | 1.6.0      |
-+-------------------------------------------+------------+
-| ts-newlib                                 | 4.1.0      |
-+-------------------------------------------+------------+
-| ts-psa-{crypto, iat, its. ps}-api-test    | 451aa087a4 |
-+-------------------------------------------+------------+
-| ts-sp-{se-proxy, smm-gateway}             | 3d4956770f |
-+-------------------------------------------+------------+
-
-Yocto distribution components versions
-======================================
-
-+-------------------------------------------+---------------------+
-| meta-arm                                  | langdale            |
-+-------------------------------------------+---------------------+
-| poky                                      | langdale            |
-+-------------------------------------------+---------------------+
-| meta-openembedded                         | langdale            |
-+-------------------------------------------+---------------------+
-| busybox                                   | 1.35.0              |
-+-------------------------------------------+---------------------+
-| musl                                      | 1.2.3+git37e18b7bf3 |
-+-------------------------------------------+---------------------+
-| gcc-arm-none-eabi-native                  | 11.2-2022.02        |
-+-------------------------------------------+---------------------+
-| gcc-cross-aarch64                         | 12.2                |
-+-------------------------------------------+---------------------+
-| openssl                                   | 3.0.5               |
-+-------------------------------------------+---------------------+
-
-******************
-Version 2022.04.04
-******************
-
-Changes
-=======
-- Linux distro openSUSE, raw image installation and boot in the FVP.
-- SCT test support in FVP.
-- Manual capsule update support in FVP.
-
-******************
-Version 2022.02.25
-******************
-
-Changes
-=======
-- Building and running psa-arch-tests on Corstone-1000 FVP
-- Enabled smm-gateway partition in Trusted Service on Corstone-1000 FVP
-- Enabled MHU driver in Trusted Service on Corstone-1000 FVP
-- Enabled OpenAMP support in SE proxy SP on Corstone-1000 FVP
-
-******************
-Version 2022.02.21
-******************
-
-Changes
-=======
-- psa-arch-tests: recipe is dropped and merged into the secure-partitons recipe.
-- psa-arch-tests: The tests are align with latest tfm version for psa-crypto-api suite.
-
-******************
-Version 2022.01.18
-******************
-
-Changes
-=======
-- psa-arch-tests: change master to main for psa-arch-tests
-- U-Boot: fix null pointer exception for get_image_info
-- TF-M: fix capsule instability issue for Corstone-1000
-
-******************
-Version 2022.01.07
-******************
-
-Changes
-=======
-- Corstone-1000: fix SystemReady-IR ACS test (SCT, FWTS) failures.
-- U-Boot: send bootcomplete event to secure enclave.
-- U-Boot: support populating Corstone-1000 image_info to ESRT table.
-- U-Boot: add ethernet device and enable configs to support bootfromnetwork SCT.
-
-******************
-Version 2021.12.15
-******************
-
-Changes
-=======
-- Enabling Corstone-1000 FPGA support on:
-  - Linux 5.10
-  - OP-TEE 3.14
-  - Trusted Firmware-A 2.5
-  - Trusted Firmware-M 1.5
-- Building and running psa-arch-tests
-- Adding openamp support in SE proxy SP
-- OP-TEE: adding smm-gateway partition
-- U-Boot: introducing Arm FF-A and MM support
-
-******************
-Version 2021.10.29
-******************
-
-Changes
-=======
-- Enabling Corstone-1000 FVP support on:
-  - Linux 5.10
-  - OP-TEE 3.14
-  - Trusted Firmware-A 2.5
-  - Trusted Firmware-M 1.4
-- Linux kernel: enabling EFI, adding FF-A debugfs driver, integrating ARM_FFA_TRANSPORT.
-- U-Boot: Extending EFI support
-- python3-imgtool: adding recipe for Trusted-firmware-m
-- python3-imgtool: adding the Yocto recipe used in signing host images (based on MCUBOOT format)
-
---------------
-
-*Copyright (c) 2022-2023, Arm Limited. All rights reserved.*

meta-arm-bsp/documentation/corstone1000/conf.py

@@ -1,52 +0,0 @@
-# Configuration file for the Sphinx documentation builder.
-#
-# This file only contains a selection of the most common options. For a full
-# list see the documentation:
-# https://www.sphinx-doc.org/en/master/usage/configuration.html
-
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-
-
-# -- Project information -----------------------------------------------------
-
-project = 'corstone1000'
-copyright = '2020-2022, Arm Limited'
-author = 'Arm Limited'
-
-
-# -- General configuration ---------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-]
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', 'docs/infra']
-
-
-# -- Options for HTML output -------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-html_theme = 'sphinx_rtd_theme'
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']

meta-arm-bsp/documentation/corstone1000/index.rst

@@ -1,16 +0,0 @@
-..
- # Copyright (c) 2022, Arm Limited.
- #
- # SPDX-License-Identifier: MIT
-
-################
-ARM Corstone1000
-################
-
-.. toctree::
-   :maxdepth: 1
-
-   software-architecture
-   user-guide
-   release-notes
-   change-log

meta-arm-bsp/documentation/corstone1000/release-notes.rst

@@ -1,199 +0,0 @@
-..
- # Copyright (c) 2022-2023, Arm Limited.
- #
- # SPDX-License-Identifier: MIT
-
-#############
-Release notes
-#############
-
-
-*************************
-Disclaimer
-*************************
-
-You expressly assume all liabilities and risks relating to your use or operation
-of Your Software and Your Hardware designed or modified using the Arm Tools,
-including without limitation, Your software or Your Hardware designed or
-intended for safety-critical applications. Should Your Software or Your Hardware
-prove defective, you assume the entire cost of all necessary servicing, repair
-or correction.
-
-***********************
-Release notes - 2023.06
-***********************
-
-Known Issues or Limitations
----------------------------
- - FPGA supports Linux distro install and boot through installer. However, FVP only supports openSUSE raw image installation and boot.
- - Due to the performance uplimit of MPS3 FPGA and FVP, some Linux distros like Fedora Rawhide can not boot on Corstone-1000 (i.e. user may experience timeouts or boot hang).
- - PSA Crypto tests (psa-crypto-api-test command) take 30 minutes to complete for FVP and 1 hour for MPS3.
- - Corstone-1000 SoC on FVP doesn't have a secure debug peripheral. It does on the MPS3 .
- - The following limitations listed in the previous release are still applicable:
-
-   - UEFI Compliant - Boot from network protocols must be implemented -- FAILURE
-
-   - Known limitations regarding ACS tests - see previous release's notes.
-
-Platform Support
------------------
- - This software release is tested on Corstone-1000 FPGA version AN550_v2
-   https://developer.arm.com/downloads/-/download-fpga-images
- - This software release is tested on Corstone-1000 Fast Model platform (FVP) version 11.19_21
-   https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps
-
-**************************
-Release notes - 2022.11.23
-**************************
-
-Known Issues or Limitations
----------------------------
- - The external-system can not be reset individually on (or using) AN550_v1 FPGA release. However, the system-wide reset still applies to the external-system.
- - FPGA supports Linux distro install and boot through installer. However, FVP only supports openSUSE raw image installation and boot.
- - Due to the performance uplimit of MPS3 FPGA and FVP, some Linux distros like Fedora Rawhide can not boot on Corstone-1000 (i.e. user may experience timeouts or boot hang).
- - Below SCT FAILURE is a known issues in the FVP:
-   UEFI Compliant - Boot from network protocols must be implemented -- FAILURE
- - Below SCT FAILURE is a known issue when a terminal emulator (in the system where the user connects to serial ports) does not support 80x25 or 80x50 mode:
-   EFI_SIMPLE_TEXT_OUT_PROTOCOL.SetMode - SetMode() with valid mode -- FAILURE
- - Known limitations regarding ACS tests: The behavior after running ACS tests on FVP is not consistent.  Both behaviors are expected and are valid;
-   The system might boot till the Linux prompt. Or, the system might wait after finishing the ACS tests.
-   In both cases, the system executes the entire test suite and writes the results as stated in the user guide.
-
-
-Platform Support
------------------
- - This software release is tested on Corstone-1000 FPGA version AN550_v1
-   https://developer.arm.com/downloads/-/download-fpga-images
- - This software release is tested on Corstone-1000 Fast Model platform (FVP) version 11.19_21
-   https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps
-
-**************************
-Release notes - 2022.04.04
-**************************
-
-Known Issues or Limitations
----------------------------
- - FPGA support Linux distro install and boot through installer. However,
-   FVP only support openSUSE raw image installation and boot.
- - Due to the performance uplimit of MPS3 FPGA and FVP, some Linux distros like Fedora Rawhide
-   cannot boot on Corstone-1000 (i.e. user may experience timeouts or boot hang).
- - Below SCT FAILURE is a known issues in the FVP:
-   UEFI Compliant - Boot from network protocols must be implemented -- FAILURE
-
-Platform Support
------------------
- - This software release is tested on Corstone-1000 FPGA version AN550_v1
- - This software release is tested on Corstone-1000 Fast Model platform (FVP) version 11.17_23
-   https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps
-
-**************************
-Release notes - 2022.02.25
-**************************
-
-Known Issues or Limitations
----------------------------
- - The following tests only work on Corstone-1000 FPGA: ACS tests (SCT, FWTS,
-   BSA), manual capsule update test, Linux distro install and boot.
-
-Platform Support
-----------------
- - This software release is tested on Corstone-1000 FPGA version AN550_v1
- - This software release is tested on Corstone-1000 Fast Model platform (FVP) version 11.17_23
-   https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps
-
-Release notes - 2022.02.21
---------------------------
-
-Known Issues or Limitations
----------------------------
- - The following tests only work on Corstone-1000 FPGA: ACS tests (SCT, FWTS,
-   BSA), manual capsule update test, Linux distro install and boot, psa-arch-test.
-
-Platform Support
-----------------
- - This software release is tested on Corstone-1000 FPGA version AN550_v1
- - This software release is tested on Corstone-1000 Fast Model platform (FVP) version 11.16.21
-   https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps
-
-Release notes - 2022.01.18
---------------------------
-
-Known Issues or Limitations
----------------------------
-
- - Before running each SystemReady-IR tests: ACS tests (SCT, FWTS, BSA), manual
-   capsule update test, Linux distro install and boot, etc., the SecureEnclave
-   flash must be cleaned. See user-guide "Clean Secure Flash Before Testing"
-   section.
-
-Release notes - 2021.12.15
---------------------------
-
-Software Features
-------------------
-The following components are present in the release:
-
- - Yocto version Honister
- - Linux kernel version 5.10
- - U-Boot 2021.07
- - OP-TEE version 3.14
- - Trusted Firmware-A 2.5
- - Trusted Firmware-M 1.5
- - OpenAMP 347397decaa43372fc4d00f965640ebde042966d
- - Trusted Services a365a04f937b9b76ebb2e0eeade226f208cbc0d2
-
-
-Platform Support
-----------------
- - This software release is tested on Corstone-1000 FPGA version AN550_v1
- - This software release is tested on Corstone-1000 Fast Model platform (FVP) version 11.16.21
-   https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps
-
-Known Issues or Limitations
----------------------------
- - The following tests only work on Corstone-1000 FPGA: ACS tests (SCT, FWTS,
-   BSA), manual capsule update test, Linux distro install and boot, and
-   psa-arch-tests.
- - Only the manual capsule update from UEFI shell is supported on FPGA.
- - Due to flash size limitation and to support A/B banks,the wic image provided
-   by the user should be smaller than 15MB.
- - The failures in PSA Arch Crypto Test are known limitations with crypto
-   library. It requires further investigation. The user can refer to `PSA Arch Crypto Test Failure Analysis In TF-M V1.5 Release <https://developer.trustedfirmware.org/w/tf_m/release/psa_arch_crypto_test_failure_analysis_in_tf-m_v1.5_release/>`__
-   for the reason for each failing test.
-
-
-Release notes - 2021.10.29
---------------------------
-
-Software Features
------------------
-This initial release of Corstone-1000 supports booting Linux on the Cortex-A35
-and TF-M/MCUBOOT in the Secure Enclave. The following components are present in
-the release:
-
- - Linux kernel version 5.10
- - U-Boot 2021.07
- - OP-TEE version 3.14
- - Trusted Firmware-A 2.5
- - Trusted Firmware-M 1.4
-
-Platform Support
-----------------
- - This Software release is tested on Corstone-1000 Fast Model platform (FVP) version 11.16.21
-   https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps
-
-Known Issues or Limitations
----------------------------
- - No software support for external system(Cortex M3)
- - No communication established between A35 and M0+
- - Very basic functionality of booting Secure Enclave, Trusted Firmware-A , OP-TEE , u-boot and Linux are performed
-
-Support
--------
-For technical support email: support-subsystem-iot@arm.com
-
-For all security issues, contact Arm by email at arm-security@arm.com.
-
---------------
-
-*Copyright (c) 2022-2023, Arm Limited. All rights reserved.*

meta-arm-bsp/documentation/corstone1000/software-architecture.rst

@@ -1,242 +0,0 @@
-..
- # Copyright (c) 2022-2023, Arm Limited.
- #
- # SPDX-License-Identifier: MIT
-
-######################
-Software architecture
-######################
-
-
-*****************
-Arm Corstone-1000
-*****************
-
-Arm Corstone-1000 is a reference solution for IoT devices. It is part of
-Total Solution for IoT which consists of hardware and software reference
-implementation.
-
-Corstone-1000 software plus hardware reference solution is PSA Level-2 ready
-certified (`PSA L2 Ready`_) as well as System Ready IR certified(`SRIR cert`_).
-More information on the Corstone-1000 subsystem product and design can be
-found at:
-`Arm corstone1000 Software`_ and `Arm corstone1000 Technical Overview`_.
-
-This readme explicitly focuses on the software part of the solution and
-provides internal details on the software components. The reference
-software package of the platform can be retrieved following instructions
-present in the user-guide document.
-
-***************
-Design Overview
-***************
-
-The software architecture of Corstone-1000 platform is a reference
-implementation of Platform Security Architecture (`PSA`_) which provides
-framework to build secure IoT devices.
-
-The base system architecture of the platform is created from three
-different types of systems: Secure Enclave, Host and External System.
-Each subsystem provides different functionality to overall SoC.
-
-
-.. image:: images/CorstoneSubsystems.png
-   :width: 720
-   :alt: CorstoneSubsystems
-
-
-The Secure Enclave System, provides PSA Root of Trust (RoT) and
-cryptographic functions. It is based on an Cortex-M0+ processor,
-CC312 Cryptographic Accelerator and peripherals, such as watchdog and
-secure flash. Software running on the Secure Enclave is isolated via
-hardware for enhanced security. Communication with the Secure Encalve
-is achieved using Message Handling Units (MHUs) and shared memory.
-On system power on, the Secure Enclave boots first. Its software
-comprises of a  ROM code (TF-M BL1), Mcuboot BL2, and
-TrustedFirmware-M(`TF-M`_) as runtime software. The software design on 
-Secure Enclave follows Firmware Framework for M class
-processor (`FF-M`_) specification.
-
-The Host System is based on ARM Cotex-A35 processor with standardized
-peripherals to allow for the booting of a Linux OS. The Cortex-A35 has
-the TrustZone technology that allows secure and non-secure security
-states in the processor. The software design in the Host System follows
-Firmware Framework for A class procseeor (`FF-A`_) specification.
-The boot process follows Trusted Boot Base Requirement (`TBBR`_).
-The Host Subsystem is taken out of reset by the Secure Enclave system
-during its final stages of the initialization. The Host subsystem runs
-FF-A Secure Partitions(based on `Trusted Services`_) and OPTEE-OS
-(`OPTEE-OS`_) in the secure world, and U-Boot(`U-Boot repo`_) and
-linux (`linux repo`_) in the non-secure world. The communication between
-non-secure and the secure world is performed via FF-A messages.
-
-An external system is intended to implement use-case specific
-functionality. The system is based on Cortex-M3 and run RTX RTOS.
-Communictaion between external system and Host(cortex-A35) is performed
-using MHU as transport mechanism and rpmsg messaging system.
-
-Overall, the Corstone-1000 architecture is designed to cover a range
-of Power, Performance, and Area (PPA) applications, and enable extension
-for use-case specific applications, for example, sensors, cloud
-connectivitiy, and edge computing.
-
-*****************
-Secure Boot Chain
-*****************
-
-For the security of a device, it is essential that only authorized
-software should run on the device. The Corstone-1000 boot uses a
-Secure Boot Chain process where an already authenticated image verifies
-and loads the following software in the chain. For the boot chain
-process to work, the start of the chain should be trusted, forming the
-Root of Trust (RoT) of the device. The RoT of the device is immutable in
-nature and encoded into the device by the device owner before it
-is deployed into the field. In Corstone-1000, the BL1 image of the secure
-enclave and content of the CC312 OTP (One Time Programmable) memory
-forms the RoT. The BL1 image exists in ROM (Read Only Memory).
-
-.. image:: images/SecureBootChain.png
-   :width: 870
-   :alt: SecureBootChain
-
-It is a lengthy chain to boot the software on Corstone-1000. On power on,
-the secure enclave starts executing BL1 code from the ROM which is the RoT
-of the device. Authentication of an image involves the steps listed below:
-
-- Load image from flash to dynamic RAM.
-- The public key present in the image header is validated by comparing with the hash.
-  Depending on the image, the hash of the public key is either stored in the OTP or part
-  of the software which is being already verified in the previous stages.
-- The image is validated using the public key.
-
-In the secure enclave, BL1 authenticates the BL2 and passes the execution
-control. BL2 authenticates the initial boot loader of the host (Host TF-A BL2)
-and TF-M. The execution control is now passed to TF-M. TF-M being the run
-time executable of secure enclave which initializes itself and, at the end,
-brings the host CPU out of rest. The host follows the boot standard defined
-in the `TBBR`_ to authenticate the secure and non-secure software.
-
-***************
-Secure Services
-***************
-
-Corstone-1000 is unique in providing a secure environment to run a secure
-workload. The platform has TrustZone technology in the Host subsystem but
-it also has hardware isolated secure enclave environment to run such secure
-workloads. In Corstone-1000, known Secure Services such as Crypto, Protected
-Storage, Internal Trusted Storage and Attestation are available via PSA
-Functional APIs in TF-M. There is no difference for a user communicating to
-these services which are running on a secure enclave instead of the
-secure world of the host subsystem. The below diagram presents the data
-flow path for such calls.
-
-
-.. image:: images/SecureServices.png
-   :width: 930
-   :alt: SecureServices
-
-
-The SE Proxy SP (Secure Enclave Proxy Secure Partition) is a proxy partition
-managed by OPTEE which forwards such calls to the secure enclave. The
-solution relies on OpenAMP which uses shared memory and MHU interrupts as
-a doorbell for communication between two cores. Corstone-1000 implements
-isolation level 2. Cortex-M0+ MPU (Memory Protection Unit) is used to implement
-isolation level 2.
-
-For a user to define its own secure service, both the options of the host
-secure world or secure encalve are available. It's a trade-off between
-lower latency vs higher security. Services running on a secure enclave are
-secure by real hardware isolation but have a higher latency path. In the
-second scenario, the services running on the secure world of the host
-subsystem have lower latency but virtual hardware isolation created by
-TrustZone technology.
-
-
-**********************
-Secure Firmware Update
-**********************
-
-Apart from always booting the authorized images, it is also essential that
-the device only accepts the authorized images in the firmware update
-process. Corstone-1000 supports OTA (Over the Air) firmware updates and
-follows Platform Security Firmware Update sepcification (`FWU`_).
-
-As standardized into `FWU`_, the external flash is divided into two
-banks of which one bank has currently running images and the other bank is
-used for staging new images.  There are four updatable units, i.e. Secure
-Enclave's BL2 and TF-M, and Host's FIP (Firmware Image Package) and Kernel
-Image (the initramfs bundle). The new images are accepted in the form of a UEFI capsule.
-
-
-.. image:: images/ExternalFlash.png
-   :width: 690
-   :alt: ExternalFlash
-
-
-The Metadata Block in the flash has the below firmware update state machine.
-TF-M runs an OTA service that is responsible for accepting and updating the
-images in the flash. The communication between the UEFI Capsule update
-subsystem and the OTA service follows the same data path explained above.
-The OTA service writes the new images to the passive bank after successful
-capsule verification. It changes the state of the system to trial state and
-triggers the reset. Boot loaders in Secure Enclave and Host read the Metadata
-block to get the information on the boot bank. In the successful trial stage,
-the acknowledgment from the host moves the state of the system from trial to
-regular. Any failure in the trial stage or system hangs leads to a system
-reset. This is made sure by the use of watchdog hardware. The Secure Enclave's
-BL1 has the logic to identify multiple resets and eventually switch back to the
-previous good bank. The ability to revert to the previous bank is crucial to
-guarantee the availability of the device.
-
-
-.. image:: images/SecureFirmwareUpdate.png
-   :width: 430
-   :alt: SecureFirmwareUpdate
-
-
-
-******************************
-UEFI Runtime Support in U-Boot
-******************************
-
-Implementation of UEFI boottime and runtime APIs require variable storage.
-In Corstone-1000, these UEFI variables are stored in the Protected Storage
-service. The below diagram presents the data flow to store UEFI variables.
-The U-Boot implementation of the UEFI subsystem uses the U-Boot FF-A driver to
-communicate with the SMM Service in the secure world. The backend of the
-SMM service uses the proxy PS from the SE Proxy SP. From there on, the PS
-calls are forwarded to the secure enclave as explained above.
-
-
-.. image:: images/UEFISupport.png
-   :width: 590
-   :alt: UEFISupport
-
-
-***************
-References
-***************
-`ARM corstone1000 Search`_
-
-`Arm security features`_
-
---------------
-
-*Copyright (c) 2022-2023, Arm Limited. All rights reserved.*
-
-.. _Arm corstone1000 Technical Overview: https://developer.arm.com/documentation/102360/0000
-.. _Arm corstone1000 Software: https://developer.arm.com/Tools%20and%20Software/Corstone-1000%20Software
-.. _Arm corstone1000 Search: https://developer.arm.com/search#q=corstone-1000
-.. _Arm security features: https://www.arm.com/architecture/security-features/platform-security
-.. _linux repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
-.. _FF-A: https://developer.arm.com/documentation/den0077/latest
-.. _FF-M: https://developer.arm.com/-/media/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf?revision=2d1429fa-4b5b-461a-a60e-4ef3d8f7f4b4&hash=3BFD6F3E687F324672F18E5BE9F08EDC48087C93
-.. _FWU: https://developer.arm.com/documentation/den0118/a/
-.. _OPTEE-OS: https://github.com/OP-TEE/optee_os
-.. _PSA: https://www.psacertified.org/
-.. _PSA L2 Ready: https://www.psacertified.org/products/corstone-1000/
-.. _SRIR cert: https://armkeil.blob.core.windows.net/developer/Files/pdf/certificate-list/arm-systemready-ir-certification-arm-corstone-1000.pdf
-.. _TBBR: https://developer.arm.com/documentation/den0006/latest
-.. _TF-M: https://www.trustedfirmware.org/projects/tf-m/
-.. _Trusted Services: https://www.trustedfirmware.org/projects/trusted-services/
-.. _U-Boot repo: https://github.com/u-boot/u-boot.git

meta-arm-bsp/documentation/fvp-base-arm32.md

@@ -0,0 +1,61 @@
+# Armv7-A Base Platform FVP Support in meta-arm-bsp
+
+## How to build and run
+
+### Configuration:
+In the local.conf file, MACHINE should be set as follows:
+MACHINE ?= "fvp-base-arm32"
+
+### Build:
+```bash$ bitbake core-image-minimal```
+
+### Run:
+To Run the Fixed Virtual Platform simulation tool you must download "Armv8-A
+Base Platform FVP" from Arm developer (This might require the user to
+register) from this address:
+https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms
+and install it on your host PC.
+
+Fast Models Fixed Virtual Platforms (FVP) Reference Guide:
+https://developer.arm.com/docs/100966/latest
+
+Armv8‑A Foundation Platform User Guide:
+https://developer.arm.com/docs/100961/latest/
+
+
+Once done, do the following to build and run an image:
+```bash$ bitbake core-image-minimal```
+```bash$ export YOCTO_DEPLOY_IMGS_DIR="<yocto-build-dir/tmp/deploy/images/fvp-base-arm32>"```
+```bash$ cd <path-to-Base_RevC_AEMv8A_pkg-dir/models/Linux64_GCC-X.X/>```
+```
+bash$ ./FVP_Base_RevC-2xAEMv8A -C bp.virtio_net.enabled=1 \
+         -C cache_state_modelled=0 \
+         -C bp.secureflashloader.fname=${YOCTO_DEPLOY_IMGS_DIR}/bl1-fvp.bin \
+         -C bp.flashloader0.fname=${YOCTO_DEPLOY_IMGS_DIR}/fip-fvp.bin \
+         --data cluster0.cpu0=${YOCTO_DEPLOY_IMGS_DIR}/Image@0x80080000 \
+         -C bp.virtioblockdevice.image_path=${YOCTO_DEPLOY_IMGS_DIR}/core-image-minimal-fvp-base-arm32.wic \
+         -C cluster0.cpu0.CONFIG64=0 \
+         -C cluster0.cpu1.CONFIG64=0 \
+         -C cluster0.cpu2.CONFIG64=0 \
+         -C cluster0.cpu3.CONFIG64=0 \
+         -C cluster1.cpu0.CONFIG64=0 \
+         -C cluster1.cpu1.CONFIG64=0 \
+         -C cluster1.cpu2.CONFIG64=0 \
+         -C cluster1.cpu3.CONFIG64=0 \
+
+```
+
+
+If you have built a configuration without a ramdisk, you can use the following
+command in U-boot to start Linux:
+```fvp32# bootz 0x80080000 - 0x82000000```
+
+## Devices supported in the kernel
+- serial
+- virtio disk
+- network
+- watchdog
+- rtc
+
+## Devices not supported or not functional
+None

meta-arm-bsp/documentation/fvp-base.md

@@ -3,22 +3,45 @@
 ## Howto Build and Run
 
 ### Configuration:
-In the local.conf file, `MACHINE` should be set:
-```
-MACHINE = "fvp-base"
-```
+In the local.conf file, MACHINE should be set as follow:
+MACHINE ?= "fvp-base"
 
 ### Build:
-```
-$ bitbake core-image-base
-```
+```bash$ bitbake core-image-minimal```
 
 ### Run:
-The `fvp-base` machine has support for the `runfvp` script, so running is simple:
+To Run the Fixed Virtual Platform simulation tool you must download "Armv8-A
+Base Platform FVP" from Arm developer (This might require the user to
+register) from this address:
+https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms
+and install it on your host PC.
 
+Fast Models Fixed Virtual Platforms (FVP) Reference Guide:
+https://developer.arm.com/docs/100966/latest
+
+Armv8‑A Foundation Platform User Guide:
+https://developer.arm.com/docs/100961/latest/
+
+
+Once done, do the following to build and run an image:
+```bash$ bitbake core-image-minimal```
+```bash$ export YOCTO_DEPLOY_IMGS_DIR="<yocto-build-dir/tmp/deploy/images/fvp-base>"```
+```bash$ cd <path-to-Base_RevC_AEMv8A_pkg-dir/models/Linux64_GCC-X.X/>```
 ```
-$ runfvp tmp/deploy/images/fvp-base/core-image-base-fvp-base.fvpconf
+bash$ ./FVP_Base_RevC-2xAEMv8A -C bp.virtio_net.enabled=1 \
+         -C cache_state_modelled=0 \
+         -C bp.secureflashloader.fname=${YOCTO_DEPLOY_IMGS_DIR}/bl1-fvp.bin \
+         -C bp.flashloader0.fname=${YOCTO_DEPLOY_IMGS_DIR}/fip-fvp.bin \
+         --data cluster0.cpu0=${YOCTO_DEPLOY_IMGS_DIR}/Image@0x80080000 \
+         --data cluster0.cpu0=${YOCTO_DEPLOY_IMGS_DIR}/fvp-base-gicv3-psci-custom.dtb@0x83000000 \
+         -C bp.virtioblockdevice.image_path=${YOCTO_DEPLOY_IMGS_DIR}/core-image-minimal-fvp-base.wic
 ```
+
+
+If you have built a configuration without a ramdisk, you can use the following
+command in U-boot to start Linux:
+```VExpress64# booti 0x80080000 - 0x83000000```
+
 ## Devices supported in the kernel
 - serial
 - virtio disk

meta-arm-bsp/documentation/fvp-baser-aemv8r64.md

@@ -27,9 +27,9 @@ The fvp-baser-aemv8r64 Yocto MACHINE supports the following BSP components,
 where either a standard or Real-Time Linux kernel (PREEMPT\_RT) can be built
 and run:
 
- - FVP_Base_AEMv8R: v11.20.15
+ - FVP_Base_AEMv8R: v11.19.14
  - boot-wrapper-aarch64: provides PSCI support
- - U-Boot: v2022.07 - provides UEFI services
+ - U-Boot: v2022.01 - provides UEFI services
  - Linux kernel: linux-yocto-5.15
  - Linux kernel with PREEMPT\_RT support: linux-yocto-rt-5.15
 

meta-arm-bsp/documentation/musca-b1.md

@@ -4,6 +4,9 @@
 For a description of the hardware, go to
 https://developer.arm.com/tools-and-software/development-boards/iot-test-chips-and-boards/musca-b-test-chip-board
 
+For current supported hardware by Zephyr, go to
+https://docs.zephyrproject.org/2.3.0/boards/arm/v2m_musca/doc/index.html
+
 For emulated hardware, go to
 https://www.qemu.org/docs/master/system/arm/musca.html
 
@@ -11,5 +14,13 @@ https://www.qemu.org/docs/master/system/arm/musca.html
 In the local.conf file, MACHINE should be set as follows:
 MACHINE ?= "musca-b1"
 
-To build the trusted firmware-m:
+To build for Zephyr:
+```bash$ bitbake-layers layerindex-fetch meta-zephyr```
+```bash$ bitbake zephyr-philosophers```
+
+To build the trusted firmware-m (and not Zephyr):
 ```bash$ bitbake trusted-firmware-m```
+
+## Running
+To run Zephyr on the QEMU based machine, execute the following command
+```bash$ runqemu qemu-musca-b1```

meta-arm-bsp/documentation/requirements.txt

@@ -1,12 +0,0 @@
-# Copyright (c) 2022, Arm Limited.
-#
-# SPDX-License-Identifier: MIT
-
-# Read The Docs specific
-jinja2==3.1.1
-
-# Required to build the documentation
-sphinx==4.5.0
-sphinx_rtd_theme==1.0.0
-sphinx-copybutton==0.5.0
-docutils==0.17.1

meta-arm-bsp/documentation/tc0.md

@@ -0,0 +1,32 @@
+# TC0 Platform Support in meta-arm-bsp
+
+## Overview
+The Total Compute platform provides an envelope for all of Arm's latest IP and
+software solutions, optimised to work together. Further information can be
+found on the Total Compute community page:
+https://community.arm.com/developer/tools-software/oss-platforms/w/docs/606/total-compute
+
+The user guide for TC0 platform with detailed instructions for
+syncing and building the source code and running on TC0 Fixed Virtual Platform
+for poky and android distributions is available at:
+https://git.linaro.org/landing-teams/working/arm/arm-reference-platforms.git/tree/docs/tc0/user-guide.rst
+
+## Building
+In the local.conf file, MACHINE should be set as follows:
+MACHINE = "tc0"
+
+To build the required binaries for tc0, run the commmand:
+```bash$ bitbake tc-artifacts-image```
+
+Trusted-firmware-a is the final component to be built with the rest of the
+components dependent of it, therefore building tc-artifacts-image which depends
+on trusted-firmware-a will build all the required binaries.
+
+## Running
+To run the produced binaries in a TC0 Fixed Virtual Platform please get
+the run scripts at:
+https://git.linaro.org/landing-teams/working/arm/model-scripts.git/
+
+and follow the instructions in the user-guide.rst available in:
+https://git.linaro.org/landing-teams/working/arm/arm-reference-platforms.git/tree/docs/tc0/user-guide.rst
+

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0001-aarch64-Rename-labels-and-prepare-for-lower-EL-booti.patch

@@ -1,4 +1,4 @@
-From 545f6950ae4dc55b4974986aa9629adb16eaf4e1 Mon Sep 17 00:00:00 2001
+From 3e7cfbe39a2a053d2a6b0d928cc172ed9d1c6da8 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Tue, 25 May 2021 07:25:00 +0100
 Subject: [PATCH] aarch64: Rename labels and prepare for lower EL booting
@@ -18,10 +18,10 @@ Signed-off-by: Jaxson Han <jaxson.han@arm.com>
  3 files changed, 27 insertions(+), 14 deletions(-)
 
 diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S
-index d682ba5..fab694e 100644
+index 27ba449..84e1646 100644
 --- a/arch/aarch64/boot.S
 +++ b/arch/aarch64/boot.S
-@@ -34,18 +34,30 @@ ASM_FUNC(_start)
+@@ -21,18 +21,30 @@ ASM_FUNC(_start)
  
  	/*
  	 * EL3 initialisation
@@ -56,7 +56,7 @@ index d682ba5..fab694e 100644
  	orr	x0, x0, #(1 << 0)		// Non-secure EL1
  	orr	x0, x0, #(1 << 8)		// HVC enable
  
-@@ -145,7 +157,7 @@ ASM_FUNC(_start)
+@@ -124,7 +136,7 @@ ASM_FUNC(_start)
  
  	bl	gic_secure_init
  
@@ -65,7 +65,7 @@ index d682ba5..fab694e 100644
  
  err_invalid_id:
  	b	.
-@@ -172,7 +184,7 @@ ASM_FUNC(jump_kernel)
+@@ -151,7 +163,7 @@ ASM_FUNC(jump_kernel)
  	bl	find_logical_id
  	bl	setup_stack		// Reset stack pointer
  
@@ -74,7 +74,7 @@ index d682ba5..fab694e 100644
  	cmp	w0, #0			// Prepare Z flag
  
  	mov	x0, x20
-@@ -181,7 +193,7 @@ ASM_FUNC(jump_kernel)
+@@ -160,7 +172,7 @@ ASM_FUNC(jump_kernel)
  	mov	x3, x23
  
  	b.eq	1f
@@ -83,7 +83,7 @@ index d682ba5..fab694e 100644
  
  1:	mov	x4, #SPSR_KERNEL
  
-@@ -199,5 +211,5 @@ ASM_FUNC(jump_kernel)
+@@ -178,5 +190,5 @@ ASM_FUNC(jump_kernel)
  
  	.data
  	.align 3

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0002-aarch64-Prepare-for-EL1-booting.patch

@@ -1,4 +1,4 @@
-From bad32d3fc127a421be416b17e4f7d6d514f06abb Mon Sep 17 00:00:00 2001
+From 26f9b5354c2de9cc052531096ff92b04c3a3846f Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Tue, 25 May 2021 07:25:00 +0100
 Subject: [PATCH] aarch64: Prepare for EL1 booting
@@ -15,10 +15,10 @@ Reviewed-by: Andre Przywara <andre.przywara@arm.com>
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S
-index fab694e..5105b41 100644
+index 84e1646..b589744 100644
 --- a/arch/aarch64/boot.S
 +++ b/arch/aarch64/boot.S
-@@ -177,10 +177,14 @@ ASM_FUNC(jump_kernel)
+@@ -156,10 +156,14 @@ ASM_FUNC(jump_kernel)
  	ldr	x0, =SCTLR_EL1_KERNEL
  	msr	sctlr_el1, x0
  
@@ -35,7 +35,7 @@ index fab694e..5105b41 100644
  	bl	setup_stack		// Reset stack pointer
  
 diff --git a/arch/aarch64/include/asm/cpu.h b/arch/aarch64/include/asm/cpu.h
-index 49d3f86..3767da3 100644
+index 63eb1c3..b1003f4 100644
 --- a/arch/aarch64/include/asm/cpu.h
 +++ b/arch/aarch64/include/asm/cpu.h
 @@ -11,6 +11,7 @@

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0003-aarch64-Prepare-for-lower-EL-booting.patch

@@ -1,4 +1,4 @@
-From 252cbd36e51414b60ab68306f9c38e358709494d Mon Sep 17 00:00:00 2001
+From ce628de7699dd6401ddf713efaa49872e2733619 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Tue, 25 May 2021 07:25:00 +0100
 Subject: [PATCH] aarch64: Prepare for lower EL booting
@@ -17,11 +17,11 @@ Reviewed-by: Andre Przywara <andre.przywara@arm.com>
  1 file changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S
-index 5105b41..243198d 100644
+index b589744..6b45afc 100644
 --- a/arch/aarch64/boot.S
 +++ b/arch/aarch64/boot.S
-@@ -151,7 +151,16 @@ el3_init:
- 	mov	x0, #ZCR_EL3_LEN_MAX		// SVE: Enable full vector len
+@@ -130,7 +130,16 @@ el3_init:
+ 	mov	x0, #ZCR_EL3_LEN_MASK		// SVE: Enable full vector len
  	msr	ZCR_EL3, x0			// for EL2.
  
 -1:
@@ -38,7 +38,7 @@ index 5105b41..243198d 100644
  	ldr	x0, =COUNTER_FREQ
  	msr	cntfrq_el0, x0
  
-@@ -199,7 +208,7 @@ ASM_FUNC(jump_kernel)
+@@ -178,7 +187,7 @@ ASM_FUNC(jump_kernel)
  	b.eq	1f
  	br	x19			// Keep current EL
  
@@ -47,7 +47,7 @@ index 5105b41..243198d 100644
  
  	/*
  	 * If bit 0 of the kernel address is set, we're entering in AArch32
-@@ -217,3 +226,5 @@ ASM_FUNC(jump_kernel)
+@@ -196,3 +205,5 @@ ASM_FUNC(jump_kernel)
  	.align 3
  flag_keep_el:
  	.long 0

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0004-gic-v3-Prepare-for-gicv3-with-EL2.patch

@@ -1,4 +1,4 @@
-From bff110a95a5e4c9db2d61e629b4aa4b84530201e Mon Sep 17 00:00:00 2001
+From 483d363bf825082b6db6de3c57d169e741861891 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Tue, 25 May 2021 07:25:00 +0100
 Subject: [PATCH] gic-v3: Prepare for gicv3 with EL2

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0005-aarch64-Prepare-for-booting-with-EL2.patch

@@ -1,4 +1,4 @@
-From ba955efb35ce1d41b562190d7c2fbcbcf8ef97ff Mon Sep 17 00:00:00 2001
+From be814863cdd5f61d9a16eec012d500550053c8c6 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Tue, 25 May 2021 07:25:00 +0100
 Subject: [PATCH] aarch64: Prepare for booting with EL2
@@ -15,10 +15,10 @@ Reviewed-by: Andre Przywara <andre.przywara@arm.com>
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S
-index 243198d..3593ca5 100644
+index 6b45afc..908764a 100644
 --- a/arch/aarch64/boot.S
 +++ b/arch/aarch64/boot.S
-@@ -216,10 +216,18 @@ ASM_FUNC(jump_kernel)
+@@ -195,10 +195,18 @@ ASM_FUNC(jump_kernel)
  	 */
  	bfi	x4, x19, #5, #1
  

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0006-aarch64-Introduce-EL2-boot-code-for-Armv8-R-AArch64.patch

@@ -1,4 +1,4 @@
-From 8e44fac113d935affed1550480631f3fe7f30584 Mon Sep 17 00:00:00 2001
+From 81df76f8d94cb6c31c01739b078a72bdb8497441 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Tue, 25 May 2021 07:25:00 +0100
 Subject: [PATCH] aarch64: Introduce EL2 boot code for Armv8-R AArch64
@@ -36,10 +36,10 @@ Signed-off-by: Jaxson Han <jaxson.han@arm.com>
  2 files changed, 92 insertions(+), 2 deletions(-)
 
 diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S
-index 3593ca5..a219ea7 100644
+index 908764a..def9192 100644
 --- a/arch/aarch64/boot.S
 +++ b/arch/aarch64/boot.S
-@@ -37,16 +37,24 @@ ASM_FUNC(_start)
+@@ -24,16 +24,24 @@ ASM_FUNC(_start)
  	 * Boot sequence
  	 * If CurrentEL == EL3, then goto EL3 initialisation and drop to
  	 *   lower EL before entering the kernel.
@@ -66,7 +66,7 @@ index 3593ca5..a219ea7 100644
  	mov	w0, #1
  	ldr	x1, =flag_keep_el
  	str	w0, [x1]
-@@ -160,6 +168,85 @@ el3_init:
+@@ -139,6 +147,85 @@ el3_init:
  	str	w0, [x1]
  	b	el_max_init
  
@@ -152,7 +152,7 @@ index 3593ca5..a219ea7 100644
  el_max_init:
  	ldr	x0, =COUNTER_FREQ
  	msr	cntfrq_el0, x0
-@@ -169,6 +256,7 @@ el_max_init:
+@@ -148,6 +235,7 @@ el_max_init:
  	b	start_el_max
  
  err_invalid_id:
@@ -161,7 +161,7 @@ index 3593ca5..a219ea7 100644
  
  	/*
 diff --git a/arch/aarch64/include/asm/cpu.h b/arch/aarch64/include/asm/cpu.h
-index 3767da3..3c0e00d 100644
+index b1003f4..91f803c 100644
 --- a/arch/aarch64/include/asm/cpu.h
 +++ b/arch/aarch64/include/asm/cpu.h
 @@ -25,6 +25,7 @@
@@ -172,7 +172,7 @@ index 3767da3..3c0e00d 100644
  #define SPSR_EL2H		(9 << 0)	/* EL2 Handler mode */
  #define SPSR_HYP		(0x1a << 0)	/* M[3:0] = hyp, M[4] = AArch32 */
  
-@@ -50,6 +51,7 @@
+@@ -43,6 +44,7 @@
  #else
  #define SCTLR_EL1_KERNEL	SCTLR_EL1_RES1
  #define SPSR_KERNEL		(SPSR_A | SPSR_D | SPSR_I | SPSR_F | SPSR_EL2H)

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0007-Allow-enable-psci-to-choose-between-smc-and-hvc.patch

@@ -1,4 +1,4 @@
-From 0b9a966b8a28961b078215ee7169e32a976d5e7d Mon Sep 17 00:00:00 2001
+From f5a31b4f4ea8daaa0d337d5a2322ddb1912083fc Mon Sep 17 00:00:00 2001
 From: Qi Feng <qi.feng@arm.com>
 Date: Wed, 26 May 2021 17:52:01 +0800
 Subject: [PATCH] Allow --enable-psci to choose between smc and hvc
@@ -40,7 +40,7 @@ Signed-off-by: Huifeng Zhang <Huifeng.Zhang@arm.com>
  2 files changed, 14 insertions(+), 10 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 5731a19..fc66662 100644
+index f941b07..88a27de 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -50,11 +50,11 @@ endif

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0008-aarch64-Disable-CNTPCT_EL0-trap-for-v8-R64.patch

@@ -1,4 +1,4 @@
-From 521c121eccb386aca7c75d92528e495546adccec Mon Sep 17 00:00:00 2001
+From 3f4614e02f0f8d2522510578da2752f8e3511bb3 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Mon, 25 Oct 2021 17:09:13 +0800
 Subject: [PATCH] aarch64: Disable CNTPCT_EL0 trap for v8-R64
@@ -24,10 +24,10 @@ Change-Id: I4147e66341c8153312021e6f2ab67d0037246da1
  1 file changed, 12 insertions(+)
 
 diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S
-index a219ea7..27b1139 100644
+index def9192..6dbd5cc 100644
 --- a/arch/aarch64/boot.S
 +++ b/arch/aarch64/boot.S
-@@ -240,6 +240,18 @@ el2_init:
+@@ -219,6 +219,18 @@ el2_init:
  	orr	x0, x0, #(1 << 41)		// HCR_EL2.API
  
  1:	msr	hcr_el2, x0

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0009-lds-Mark-the-mem-range.patch

@@ -1,4 +1,4 @@
-From 780df234d98db81485b1f351f902a68def35c9d4 Mon Sep 17 00:00:00 2001
+From 2851f0e6c1216894b9498d7b91256bb1ef49e544 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Tue, 2 Nov 2021 15:10:28 +0800
 Subject: [PATCH] lds: Mark the mem range

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0010-common-Introduce-the-libfdt.patch

@@ -1,4 +1,4 @@
-From b3762b6c5a56bf594bc5cb63d145e8efd86e106e Mon Sep 17 00:00:00 2001
+From fadf04f44b679d85e55b2e5f220fecbebb52ad03 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Tue, 28 Dec 2021 17:02:17 +0800
 Subject: [PATCH] common: Introduce the libfdt

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0011-common-Add-essential-libc-functions.patch

@@ -1,4 +1,4 @@
-From e2eff4f80e65cb3fcbe6345b5376a6bf7de7e2cc Mon Sep 17 00:00:00 2001
+From 0f2c7ca446063be6b193fbf870d38c0af19e15c5 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Tue, 28 Dec 2021 17:28:25 +0800
 Subject: [PATCH] common: Add essential libc functions

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0012-Makefile-Add-the-libfdt-to-the-Makefile-system.patch

@@ -1,4 +1,4 @@
-From f4d5cf4c3424598a2b3bb391717313b70c79ea28 Mon Sep 17 00:00:00 2001
+From de5d2b6c200ae5dd8113751e58bf7cf5844eec5a Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Tue, 28 Dec 2021 17:42:48 +0800
 Subject: [PATCH] Makefile: Add the libfdt to the Makefile system
@@ -17,7 +17,7 @@ Change-Id: I472bc28cdc5cde3b22461a4b7d7a3752ae382b4b
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index fc66662..ab2c3a9 100644
+index 88a27de..5e8668a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -36,6 +36,9 @@ PSCI_CPU_OFF	:= 0x84000002
@@ -30,10 +30,10 @@ index fc66662..ab2c3a9 100644
  ARCH_OBJ	:= boot.o stack.o utils.o
  
  if BOOTWRAPPER_32
-@@ -127,11 +130,12 @@ CFLAGS		+= -I$(top_srcdir)/include/ -I$(top_srcdir)/$(ARCH_SRC)/include/
+@@ -125,11 +128,12 @@ CHOSEN_NODE	:= chosen {						\
+ CPPFLAGS	+= $(INITRD_FLAGS)
+ CFLAGS		+= -I$(top_srcdir)/include/ -I$(top_srcdir)/$(ARCH_SRC)/include/
  CFLAGS		+= -Wall -fomit-frame-pointer
- CFLAGS		+= -ffreestanding -nostdlib
- CFLAGS		+= -fno-stack-protector
 +CFLAGS 		+= -fno-stack-protector
  CFLAGS		+= -ffunction-sections -fdata-sections
  CFLAGS		+= -fno-pic -fno-pie
@@ -44,7 +44,7 @@ index fc66662..ab2c3a9 100644
  
  # Don't lookup all prerequisites in $(top_srcdir), only the source files. When
  # building outside the source tree $(ARCH_SRC) needs to be created.
-@@ -152,10 +156,13 @@ $(ARCH_SRC):
+@@ -150,10 +154,13 @@ $(ARCH_SRC):
  $(COMMON_SRC):
  	$(MKDIR_P) $@
  

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0013-platform-Add-print_hex-func.patch

@@ -1,4 +1,4 @@
-From f0ece5e8cac761a76a86df7204bae7c6ef09215f Mon Sep 17 00:00:00 2001
+From 5b8cb5192dbd0332e027e8999c3afe4433983291 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Wed, 29 Dec 2021 10:50:21 +0800
 Subject: [PATCH] platform: Add print_hex func

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0014-common-Add-mem-usage-to-memreserve.patch

@@ -1,4 +1,4 @@
-From f4704146e1af9f6e0a2220db6b39a328c813fac1 Mon Sep 17 00:00:00 2001
+From b447242cd2457bec20d47fe6a8a5758d97a3bde3 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Wed, 19 Jan 2022 16:19:02 +0800
 Subject: [PATCH] common: Add mem usage to /memreserve/
@@ -20,7 +20,7 @@ Change-Id: I2ea80cdf736a910fa2c3deb622e21d50f04be960
  create mode 100644 common/device_tree.c
 
 diff --git a/Makefile.am b/Makefile.am
-index ab2c3a9..e905602 100644
+index 5e8668a..734de92 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -34,7 +34,7 @@ endif

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0015-boot-Add-the-enable-keep-el-compile-option.patch

@@ -1,4 +1,4 @@
-From 5995f83592aea874f5b423538e36675e2204582b Mon Sep 17 00:00:00 2001
+From 8271c21bcff260295203214b7b8c87cdb8236453 Mon Sep 17 00:00:00 2001
 From: Jaxson Han <jaxson.han@arm.com>
 Date: Tue, 4 Jan 2022 17:01:55 +0800
 Subject: [PATCH] boot: Add the --enable-keep-el compile option
@@ -23,7 +23,7 @@ Change-Id: I3ba9c87cf0b59d163ca433f74c9e3a46e5ca2c63
  4 files changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index e905602..6604baa 100644
+index 734de92..054becd 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -33,6 +33,10 @@ PSCI_CPU_ON	:= 0xc4000003
@@ -38,10 +38,10 @@ index e905602..6604baa 100644
  COMMON_OBJ	:= boot.o bakery_lock.o platform.o lib.o device_tree.o
  
 diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S
-index 27b1139..c079d22 100644
+index 6dbd5cc..157c097 100644
 --- a/arch/aarch64/boot.S
 +++ b/arch/aarch64/boot.S
-@@ -254,7 +254,11 @@ el2_init:
+@@ -233,7 +233,11 @@ el2_init:
  	msr	cnthctl_el2, x0
  	isb
  
@@ -53,7 +53,7 @@ index 27b1139..c079d22 100644
  	ldr	x1, =spsr_to_elx
  	str	w0, [x1]
  	// fall through
-@@ -334,5 +338,5 @@ ASM_FUNC(jump_kernel)
+@@ -313,5 +317,5 @@ ASM_FUNC(jump_kernel)
  	.align 3
  flag_keep_el:
  	.long 0

meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/files/fvp-baser-aemv8r64/0016-Makefile-Change-COUNTER_FREQ-to-100-MHz.patch

@@ -1,4 +1,4 @@
-From 0c0695cd3160ccdb95bae29b7668918015c0b6aa Mon Sep 17 00:00:00 2001
+From dd3e3f414d0e6ed1643c2e2ccac676b7fc1dc7a9 Mon Sep 17 00:00:00 2001
 From: Peter Hoyes <Peter.Hoyes@arm.com>
 Date: Tue, 1 Feb 2022 11:28:46 +0000
 Subject: [PATCH] Makefile: Change COUNTER_FREQ to 100 MHz
@@ -17,7 +17,7 @@ Change-Id: Ia9ad0f8ee488d1a887791f1fa1d8f3bf9c5887fd
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 6604baa..cc6504e 100644
+index 40bc5d6..b48173c 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -13,7 +13,7 @@ SCRIPT_DIR	:= $(top_srcdir)/scripts
@@ -29,3 +29,6 @@ index 6604baa..cc6504e 100644
  
  CPU_IDS		:= $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findcpuids.pl $(KERNEL_DTB))
  NR_CPUS         := $(shell echo $(CPU_IDS) | tr ',' ' ' | wc -w)
+-- 
+2.25.1
+