kas: corstone1000: include TS and PSA dependency for firmware image build

Includes TS and PSA dependency for firmware image build. Signed-off-by: Emekcan Aras <emekcan.aras@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
arm/trusted-firmware-a: update to lts-2.10.4
2026-07-19 16:57:09 +00:00 · 2024-05-02 06:00:05 -04:00 · 2024-05-01 09:00:21 -04:00 · 2024-05-01 09:00:14 -04:00 · 2024-05-01 09:00:14 -04:00 · 2024-05-01 09:00:14 -04:00
385 changed files with 8842 additions and 6369 deletions
@@ -1,14 +1,26 @@
-image: ${MIRROR_GHCR}/siemens/kas/kas:4.0
+image: ${MIRROR_GHCR}/siemens/kas/kas:4.3.2
 variables:
-  CPU_REQUEST: ""
+  # These are needed as the k8s executor doesn't respect the container
-  DEFAULT_TAG: ""
+  # entrypoint by default
  CACHE_DIR: $CI_BUILDS_DIR/persist
  MIRROR_GHCR: ghcr.io
  # 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
  # The default value for KUBERNETES_CPU_REQUEST
  CPU_REQUEST: ""
  # The default machine tag for the build jobs
  DEFAULT_TAG: ""
  # The machine tag for the ACS test jobs
  ACS_TAG: ""
  # The directory to use as the persistent cache (the root for DL_DIR, SSTATE_DIR, etc)
  CACHE_DIR: $CI_BUILDS_DIR/persist
  # The container mirror to use
  MIRROR_GHCR: ghcr.io
  # Whether to run the SystemReady ACS tests
  ACS_TEST: 0
  # The list of extra Kas fragments to be used when building
  EXTRA_KAS_FILES: ""
  # The NVD API key to use when fetching CVEs
  NVDCVE_API_KEY: ""
 stages:
  - prep
@@ -59,7 +71,8 @@ stages:
    # Catch all for everything else
    - if: '$KERNEL != "linux-yocto-dev"'
  script:
-    - KASFILES=$(./ci/jobs-to-kas "$CI_JOB_NAME"):lockfile.yml
+    - KASFILES=$(./ci/jobs-to-kas "$CI_JOB_NAME" $EXTRA_KAS_FILES):lockfile.yml
    - echo KASFILES=$KASFILES
    - kas dump --update --force-checkout --resolve-refs --resolve-env $KASFILES
    - kas build $KASFILES
    - ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log
@@ -67,8 +80,8 @@ stages:
    name: "logs"
    when: always
    paths:
-      - $CI_PROJECT_DIR/work/build/tmp/work*/**/temp/log.do_*.*
+      - $CI_PROJECT_DIR/work/build/tmp*/work*/**/temp/log.do_*.*
-      - $CI_PROJECT_DIR/work/build/tmp/work*/**/testimage/*
+      - $CI_PROJECT_DIR/work/build/tmp*/work*/**/testimage/*
 #
 # Prep stage, update repositories once.
@@ -107,135 +120,18 @@ update-repos:
 #  VIRT: [none, xen]
 #  TESTING: testimage
-corstone1000-fvp:
+arm-systemready-ir-acs:
  extends: .build
  timeout: 12h
  parallel:
    matrix:
-      - TESTING: [testimage, tftf]
+      # arm-systemready-ir-acs must be specified after fvp-base for ordering
-
+      # purposes for the jobs-to-kas output. It is not enough to just have it
-corstone1000-mps3:
+      # in the job name because fvp-base.yml overwrites the target.
-  extends: .build
+      - PLATFORM: fvp-base
-  parallel:
+        ARM_SYSTEMREADY_IR_ACS: arm-systemready-ir-acs
    matrix:
      - TESTING: [none, tftf]
 fvp-base:
  extends: .build
  parallel:
    matrix:
      - TESTING: testimage
      - FIRMWARE: edk2
 fvps:
  extends: .build
 generic-arm64:
  extends: .build
 juno:
  extends: .build
  parallel:
    matrix:
      - TOOLCHAINS: [gcc, clang]
        FIRMWARE: [u-boot, edk2]
 musca-b1:
  extends: .build
 musca-s1:
  extends: .build
 n1sdp:
  extends: .build
  parallel:
    matrix:
      - TESTING: [none, n1sdp-ts, n1sdp-optee, tftf]
 qemu-generic-arm64:
  extends: .build
  parallel:
    matrix:
      - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
        TOOLCHAINS: [gcc, clang]
        TESTING: testimage
 qemuarm64-secureboot:
  extends: .build
  parallel:
    matrix:
      - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
        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]
        TCLIBC: [glibc, musl]
        TESTING: testimage
      - TOOLCHAINS: 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
        TESTING: testimage
      - VIRT: xen
 qemuarmv5:
  extends: .build
  parallel:
    matrix:
      - DISTRO: poky
        KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
        TESTING: testimage
      - DISTRO: poky-tiny
        TESTING: testimage
 sgi575:
  extends: .build
 tc1:
  extends: .build
  parallel:
    matrix:
      - TESTING: testimage
  tags:
-    - x86_64
+    - ${ACS_TAG}
 toolchains:
  extends: .build
 selftest:
  extends: .setup
  script:
    - KASFILES=./ci/qemuarm64.yml:./ci/selftest.yml:lockfile.yml
    - kas shell --update --force-checkout $KASFILES -c 'oe-selftest --num-processes 2 --select-tag meta-arm --run-all-tests'
 # Validate layers are Yocto Project Compatible
 check-layers:
@@ -247,35 +143,23 @@ check-layers:
    matrix:
      - LAYER: [meta-arm, meta-arm-bsp, meta-arm-toolchain]
-pending-updates:
+corstone1000-fvp:
-  extends: .setup
+  extends: .build
-  artifacts:
+  parallel:
-    paths:
+    matrix:
-      - update-report
+      - FIRMWARE: corstone1000-firmware-only
-  script:
+        TESTING: [testimage, tftf]
-    - rm -fr update-report
+      - FIRMWARE: none
-    # This configuration has all of the layers we need enabled
+        TESTING: testimage
-    - kas shell --update --force-checkout ci/qemuarm64.yml:ci/meta-openembedded.yml:ci/meta-secure-core.yml:lockfile.yml --command \
+      - SYSTEMREADY_FIRMWARE: arm-systemready-firmware
      "$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)"
  # Do this on x86 whilst the compilers are x86-only
  tags:
    - x86_64
-# What percentage of machines in the layer do we build
+corstone1000-mps3:
-machine-coverage:
+  extends: .build
-  extends: .setup
+  parallel:
-  script:
+    matrix:
-    - ./ci/check-machine-coverage
+      - FIRMWARE: corstone1000-firmware-only
-  coverage: '/Coverage: \d+/'
+        TESTING: [none, tftf]
-
+      - FIRMWARE: none
 metrics:
  extends: .setup
  artifacts:
    reports:
      metrics: metrics.txt
  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
@@ -299,3 +183,173 @@ documentation:
  artifacts:
    paths:
      - build-docs/
 fvp-base:
  extends: .build
  parallel:
    matrix:
      - TS: [none, fvp-base-ts]
        TESTING: testimage
      - FIRMWARE: edk2
      - SYSTEMREADY_FIRMWARE: arm-systemready-firmware
 arm-systemready-ir-acs:
  extends: .build
  timeout: 12h
  parallel:
    matrix:
      # arm-systemready-ir-acs must be specified after fvp-base for ordering
      # purposes for the jobs-to-kas output. It is not enough to just have it
      # in the job name because fvp-base.yml overwrites the target.
      - PLATFORM: [fvp-base, corstone1000-fvp]
        ARM_SYSTEMREADY_IR_ACS: arm-systemready-ir-acs
  tags:
    - ${ACS_TAG}
 fvps:
  extends: .build
 genericarm64:
  extends: .build
  parallel:
    matrix:
      - TOOLCHAINS: [gcc, clang]
        TESTING: testimage
      - KERNEL: linux-yocto-dev
        TESTING: testimage
 juno:
  extends: .build
  parallel:
    matrix:
      - TOOLCHAINS: [gcc, clang]
        FIRMWARE: [u-boot, edk2]
 # What percentage of machines in the layer do we build
 machine-coverage:
  extends: .setup
  script:
    - ./ci/check-machine-coverage
  coverage: '/Coverage: \d+/'
 metrics:
  extends: .setup
  artifacts:
    reports:
      metrics: metrics.txt
  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"
 musca-b1:
  extends: .build
 musca-s1:
  extends: .build
 n1sdp:
  extends: .build
  parallel:
    matrix:
      - TESTING: [none, n1sdp-ts, n1sdp-optee, tftf]
 pending-updates:
  extends: .setup
  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:ci/meta-secure-core.yml:lockfile.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)"
  # Do this on x86 whilst the compilers are x86-only
  tags:
    - x86_64
 qemuarm64-secureboot:
  extends: .build
  parallel:
    matrix:
      - KERNEL: [linux-yocto, linux-yocto-rt]
        TOOLCHAINS: [gcc, clang]
        TCLIBC: [glibc, musl]
        TS: [none, qemuarm64-secureboot-ts]
        TESTING: testimage
      - KERNEL: linux-yocto-dev
        TESTING: testimage
 qemuarm64:
  extends: .build
  parallel:
    matrix:
      - DISTRO: poky
        KERNEL: [linux-yocto, linux-yocto-rt]
        TOOLCHAINS: [gcc, clang]
        FIRMWARE: [u-boot, edk2]
        TESTING: testimage
      - DISTRO: poky-tiny
        TESTING: testimage
      - VIRT: xen
      - KERNEL: linux-yocto-dev
        TESTING: testimage
 qemuarm-secureboot:
  extends: .build
  parallel:
    matrix:
      - KERNEL: [linux-yocto, linux-yocto-rt]
        TOOLCHAINS: [gcc, clang]
        TCLIBC: [glibc, musl]
        TESTING: testimage
      - TOOLCHAINS: external-gccarm
        TESTING: testimage
      - KERNEL: linux-yocto-dev
        TESTING: testimage
 qemuarm:
  extends: .build
  parallel:
    matrix:
      - DISTRO: poky
        KERNEL: [linux-yocto, linux-yocto-rt]
        TOOLCHAINS: [gcc, clang]
        FIRMWARE: [u-boot, edk2]
        TESTING: testimage
      - DISTRO: poky-tiny
        TESTING: testimage
      - VIRT: xen
      - KERNEL: linux-yocto-dev
        TESTING: testimage
 qemuarmv5:
  extends: .build
  parallel:
    matrix:
      - DISTRO: poky
        KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt]
        TESTING: testimage
      - DISTRO: poky-tiny
        TESTING: testimage
 sbsa-ref:
  extends: .build
  parallel:
    matrix:
      - KERNEL: [linux-yocto, linux-yocto-rt]
        TOOLCHAINS: [gcc, clang]
        TESTING: testimage
      - KERNEL: linux-yocto-dev
        TESTING: testimage
 selftest:
  extends: .setup
  script:
    - KASFILES=./ci/qemuarm64.yml:./ci/selftest.yml:lockfile.yml
    - kas shell --update --force-checkout $KASFILES -c 'oe-selftest --num-processes 2 --select-tag meta-arm --run-all-tests'
 sgi575:
  extends: .build
 toolchains:
  extends: .build
@@ -0,0 +1,79 @@
 From 42358d889ed652a8c386862f8c65e5fbe7484de2 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 Date: Fri, 26 Apr 2024 10:38:28 +0000
 Subject: [PATCH] procps: fix build with new glibc but old kernel headers
 If you're building procps with a newer glibc (with pidfd_open()) but
 older kernel headers (say 4.x, before __NR_pidfd_open) then procps will
 fail to build because of a typo in configure.ac.
 Signed-off-by: Ross Burton <ross.burton@arm.com>
 ---
 .../procps/procps/pidfd.patch                 | 42 +++++++++++++++++++
 meta/recipes-extended/procps/procps_4.0.4.bb  |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 meta/recipes-extended/procps/procps/pidfd.patch
 diff --git a/meta/recipes-extended/procps/procps/pidfd.patch b/meta/recipes-extended/procps/procps/pidfd.patch
 new file mode 100644
 index 00000000000..f5e8183e547
 --- /dev/null
 +++ b/meta/recipes-extended/procps/procps/pidfd.patch
@@ -0,0 +1,42 @@
 +From c8f625e085b8249cc009e8b19c3a19100217eb35 Mon Sep 17 00:00:00 2001
 +From: Ross Burton <ross.burton@arm.com>
 +Date: Thu, 25 Apr 2024 13:33:15 +0000
 +Subject: [PATCH] Fix pidfd_open detection
 +
 +This check for pidfd_open uses AC_CHECK_FUNC which just runs the specified code, but 
 +src/pgrep.c checks HAVE_PIDFD_OPEN which will only be defined by AC_CHECK_FUNCS.
 +
 +Also pidfd_open is defined in sys/pidfd.h so that needs including.
 +
 +Upstream-Status: Pending
 +Signed-off-by: Ross Burton <ross.burton@arm.com>
 +---
 +
 +diff --git a/configure.ac b/configure.ac
 +index fec27e3f..024731c7 100644
 +--- a/configure.ac
 ++++ b/configure.ac
 +@@ -170,7 +170,7 @@ AC_TRY_COMPILE([#include <errno.h>],
 + 		AC_MSG_RESULT(yes),
 + 		AC_MSG_RESULT(no))
 + 
 +-AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [
 ++AC_CHECK_FUNCS([pidfd_open], [enable_pidwait=yes], [
 +   AC_MSG_CHECKING([for __NR_pidfd_open])
 +   AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 + #include <sys/syscall.h>
 +diff --git a/src/pgrep.c b/src/pgrep.c
 +index d8e57dff..c5211aec 100644
 +--- a/src/pgrep.c
 ++++ b/src/pgrep.c
 +@@ -44,7 +44,9 @@
 +
 + #ifdef ENABLE_PIDWAIT
 + #include <sys/epoll.h>
 +-#ifndef HAVE_PIDFD_OPEN
 ++#ifdef HAVE_PIDFD_OPEN
 ++#include <sys/pidfd.h>
 ++#else
 + #include <sys/syscall.h>
 + #endif /* !HAVE_PIDFD_OPEN */
 + #endif
 diff --git a/meta/recipes-extended/procps/procps_4.0.4.bb b/meta/recipes-extended/procps/procps_4.0.4.bb
 index 800384f22f7..ec8c4b0261b 100644
 --- a/meta/recipes-extended/procps/procps_4.0.4.bb
 +++ b/meta/recipes-extended/procps/procps_4.0.4.bb
@@ -14,6 +14,7 @@ inherit autotools gettext pkgconfig update-alternatives
 SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \
            file://sysctl.conf \
 +           file://pidfd.patch \
            "
 SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b"
 -- 
 2.34.1
@@ -29,6 +29,13 @@ Other Directories
  This directory contains scripts used in running the CI tests
 Mailing List
 ------------
 To interact with the meta-arm developer community, please email the meta-arm mailing list at meta-arm@lists.yoctoproject.org
 Currently, it is configured to only allow emails to members from those subscribed.
 To subscribe to the meta-arm mailing list, please go to
 https://lists.yoctoproject.org/g/meta-arm
 Contributing
 ------------
 Currently, we only accept patches from the meta-arm mailing list.  For general
@@ -49,6 +56,13 @@ The component being changed in the shortlog should be prefixed with the layer na
  arm-toolchain/gcc: enable foobar v2
 Releases and Release Schedule
 --------------
 We follow the Yocto Project release methodology, schedule, and stable/LTS support timelines.  For more information on these, please reference:
 https://docs.yoctoproject.org/ref-manual/release-process.html
 https://wiki.yoctoproject.org/wiki/Releases
 https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS
 Reporting bugs
 --------------
 E-mail meta-arm@lists.yoctoproject.org with the error encountered and the steps
@@ -0,0 +1,37 @@
 # Reporting vulnerabilities
 Arm takes security issues seriously and welcomes feedback from researchers and
 the security community in order to improve the security of its products and
 services. We operate a coordinated disclosure policy for disclosing
 vulnerabilities and other security issues.
 Security issues can be complex and one single timescale doesn't fit all
 circumstances. We will make best endeavours to inform you when we expect
 security notifications and fixes to be available and facilitate coordinated
 disclosure when notifications and patches/mitigations are available.
 ## How to Report a Potential Vulnerability?
 If you would like to report a public issue (for example, one with a released CVE
 number), please contact the meta-arm mailing list at
 meta-arm@lists.yoctoproject.org and arm-security@arm.com.
 If you are dealing with a not-yet released or urgent issue, please send a mail
 to the maintainers (see README.md) and arm-security@arm.com, including as much
 detail as possible.  Encrypted emails using PGP are welcome.
 For more information, please visit https://developer.arm.com/support/arm-security-updates/report-security-vulnerabilities.
 ## Branches maintained with security fixes
 meta-arm follows the Yocto release model, so see
 [https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS Stable release and
 LTS] for detailed info regarding the policies and maintenance of stable
 branches.
 The [https://wiki.yoctoproject.org/wiki/Releases Release page] contains a list of all
 releases of the Yocto Project. Versions in grey are no longer actively maintained with
 security patches, but well-tested patches may still be accepted for them for
 significant issues.
@@ -0,0 +1,6 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 11
  includes:
    - kas/arm-systemready-firmware.yml
@@ -0,0 +1,18 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 11
  includes:
    - kas/arm-systemready-ir-acs.yml
 env:
  ACS_TEST: "0"
 local_conf_header:
  testimage: |
    TESTIMAGE_AUTO = "${ACS_TEST}"
 target:
  - arm-systemready-ir-acs
  - arm-systemready-linux-distros-debian
  - arm-systemready-linux-distros-opensuse
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -5,7 +7,7 @@ distro: poky
 defaults:
  repos:
-    branch: nanbield
+    branch: scarthgap
 repos:
  meta-arm:
@@ -19,6 +21,10 @@ repos:
    layers:
      meta:
      meta-poky:
    patches:
      procps:
        path: 0001-procps-fix-build-with-new-glibc-but-old-kernel-heade.patch
        repo: meta-arm
 env:
  BB_LOGCONFIG: ""
@@ -32,7 +38,6 @@ local_conf_header:
    PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
    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"
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,15 +1,13 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
    - ci/base.yml
    - ci/meta-openembedded.yml
    - ci/poky-tiny.yml
    - ci/meta-secure-core.yml
-
+    - kas/corstone1000-image-configuration.yml
 local_conf_header:
    extrapackages: |
    # Intentionally blank to prevent perf from being added to the image in base.yml
 target:
-  - corstone1000-image
+  - core-image-minimal
  - perf
@@ -0,0 +1,10 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
    - kas/corstone1000-firmware-only.yml
 target:
  - corstone1000-flash-firmware-image
  - perf
@@ -1,12 +1,9 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  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"
 machine: corstone1000-fvp
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -0,0 +1,21 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
 local_conf_header:
  cve: |
    INHERIT += "cve-check"
    # Allow the runner environment to provide an API key
    NVDCVE_API_KEY = "${@d.getVar('BB_ORIGENV').getVar('NVDCVE_API_KEY') or ''}"
    # Just show the warnings for our layers
    CVE_CHECK_SHOW_WARNINGS = "0"
    CVE_CHECK_SHOW_WARNINGS:layer-arm-toolchain = "1"
    CVE_CHECK_SHOW_WARNINGS:layer-meta-arm = "1"
    CVE_CHECK_SHOW_WARNINGS:layer-meta-arm-bsp = "1"
    CVE_CHECK_SHOW_WARNINGS:layer-meta-arm-systemready = "1"
    # Ignore the kernel, we sometime carry kernels in meta-arm
    CVE_CHECK_SHOW_WARNINGS:pn-linux-yocto = "0"
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -6,6 +8,6 @@ local_conf_header:
    SKIP_RECIPE[gcc-cross-arm] = "Using external toolchain"
    TCMODE = "external-arm"
    EXTERNAL_TOOLCHAIN = "${TOPDIR}/toolchains/${TARGET_ARCH}"
-    # Temporary workaround for a number binaries in the toolchains that are using 32bit timer API
+    # Disable ptest as this pulls target compilers, which don't
-    # This must be done here instead of the recipe because of all the libraries in the toolchain have the issue
+    # work with external toolchain currently
-    INSANE_SKIP:append = " 32bit-time"
+    DISTRO_FEATURES:remove = "ptest"
@@ -0,0 +1,34 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
    - ci/fvp-base.yml
    - ci/meta-openembedded.yml
    - ci/testimage.yml
 local_conf_header:
  trusted_services: |
    # Enable the needed test suites
    TEST_SUITES = " ping ssh trusted_services"
    # Include all Secure Partitions into the image
    MACHINE_FEATURES:append = " arm-ffa ts-crypto ts-storage ts-its"
    MACHINE_FEATURES:append = " ts-attestation ts-smm-gateway optee-spmc-test"
    MACHINE_FEATURES:append = " ts-block-storage ts-fwu"
    # 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"
    CORE_IMAGE_EXTRA_INSTALL += "optee-test"
    # Set the TS environment
    TS_ENV="sp"
    # Enable and configure semihosting
    FVP_CONFIG[cluster0.cpu0.semihosting-cwd] = "${DEPLOY_DIR_IMAGE}"
    FVP_CONFIG[cluster0.cpu1.semihosting-cwd] = "${DEPLOY_DIR_IMAGE}"
    FVP_CONFIG[cluster0.cpu2.semihosting-cwd] = "${DEPLOY_DIR_IMAGE}"
    FVP_CONFIG[cluster0.cpu3.semihosting-cwd] = "${DEPLOY_DIR_IMAGE}"
    FVP_CONFIG[cluster1.cpu0.semihosting-cwd] = "${DEPLOY_DIR_IMAGE}"
    FVP_CONFIG[cluster1.cpu1.semihosting-cwd] = "${DEPLOY_DIR_IMAGE}"
    FVP_CONFIG[cluster1.cpu2.semihosting-cwd] = "${DEPLOY_DIR_IMAGE}"
    FVP_CONFIG[cluster1.cpu3.semihosting-cwd] = "${DEPLOY_DIR_IMAGE}"
    FVP_CONFIG[semihosting-enable] = "True"
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -5,3 +7,7 @@ header:
    - ci/fvp.yml
 machine: fvp-base
 target:
  - core-image-sato
  - boot-wrapper-aarch64
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 # Simple target to build the FVPs that are publically available
 header:
@@ -22,4 +24,3 @@ target:
  - nativesdk-fvp-corstone1000
  - nativesdk-fvp-n1-edge
  - nativesdk-fvp-sgi575
  - nativesdk-fvp-tc1
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,6 +0,0 @@
 header:
  version: 14
  includes:
    - ci/base.yml
 machine: generic-arm64
@@ -0,0 +1,18 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
    - ci/base.yml
 repos:
  poky:
    layers:
      meta-yocto-bsp:
 local_conf_header:
  bootloader: |
    # If running genericarm64 in a qemu we need to manually build the bootloader
    EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 machine: genericarm64
@@ -2,7 +2,7 @@
 set -u -e
 BASENAME=arm-gnu-toolchain
-VER=${VER:-12.2.rel1}
+VER=${VER:-13.2.Rel1}
 HOST_ARCH=${HOST_ARCH:-$(uname -m)}
 # Use the standard kas container locations if nothing is passed into the script
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -3,17 +3,28 @@
 # This script is expecting an input of machine name, optionally followed by a
 # colon and a list of one or more parameters separated by commas between
 # brackets.  For example, the following are acceptable:
-# corstone1000-mps3
+#   corstone1000-mps3
-# fvp-base: [testimage]
+#   fvp-base: [testimage]
-# qemuarm64-secureboot: [clang, glibc, testimage]
+#   qemuarm64-secureboot: [clang, glibc, testimage]
 # This argument should be quoted to avoid expansion and to be handled
 # as a single value.
 #
 # Any further arguments will be handled as further yml file basenames.
 #
 # Turn this list into a series of yml files separated by colons to pass to kas
 set -e -u
-FILES="ci/$(echo $1 | cut -d ':' -f 1).yml"
+# First, parse the GitLab CI job name (CI_JOB_NAME via $1) and accumulate a list
 # of Kas files.
 JOBNAME="$1"
 shift
-for i in $(echo $1 | cut -s -d ':' -f 2 | sed 's/[][,]//g'); do
+# The base name of the job
 FILES="ci/$(echo $JOBNAME | cut -d ':' -f 1).yml"
 # The list of matrix variations
 for i in $(echo $JOBNAME | cut -s -d ':' -f 2 | sed 's/[][,]//g'); do
 	# Given that there are no yml files for gcc or glibc, as those are the
 	# defaults, we can simply ignore those parameters.  They are necessary
 	# to pass in so that matrix can correctly setup all of the permutations
@@ -24,4 +35,9 @@ for i in $(echo $1 | cut -s -d ':' -f 2 | sed 's/[][,]//g'); do
 	FILES+=":ci/$i.yml"
 done
 # Now pick up any further names
 for i in $*; do
 	FILES+=":ci/$i.yml"
 done
 echo $FILES
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -5,7 +7,7 @@ repos:
  meta-secure-core:
    url: https://github.com/Wind-River/meta-secure-core.git
    layers:
-      meta:
+      meta-secure-core-common:
      meta-signing-key:
      meta-efi-secure-boot:
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -5,4 +7,4 @@ header:
 repos:
  meta-virtualization:
-    url: git://git.yoctoproject.org/meta-virtualization
+    url: https://git.yoctoproject.org/meta-virtualization
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,14 +0,0 @@
 header:
  version: 14
  includes:
    - ci/generic-arm64.yml
 local_conf_header:
  failing_tests: |
    DEFAULT_TEST_SUITES:remove = "parselogs"
 machine: qemu-generic-arm64
 target:
  - core-image-sato
  - sbsa-acs
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -7,6 +9,8 @@ machine: qemuarm-secureboot
 target:
  - core-image-base
-  - optee-examples
+
-  - optee-test
+local_conf_header:
-  - optee-os-tadevkit
+  optee: |
    IMAGE_INSTALL:append = " optee-test optee-client optee-os-ta"
    TEST_SUITES:append = " optee ftpm"
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -7,6 +9,8 @@ machine: qemuarm64-secureboot
 target:
  - core-image-base
-  - optee-examples
+
-  - optee-test
+local_conf_header:
-  - optee-os-tadevkit
+  optee: |
    IMAGE_INSTALL:append = " optee-test optee-client optee-os-ta"
    TEST_SUITES:append = " optee ftpm"
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -0,0 +1,12 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
    - ci/base.yml
 machine: sbsa-ref
 target:
  - core-image-sato
  - sbsa-acs
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -0,0 +1,11 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
 local_conf_header:
  sstate_mirror: |
    BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687"
    SSTATE_MIRRORS = "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH"
    BB_HASHSERVE = "auto"
    BB_SIGNATURE_HANDLER = "OEEquivHash"
@@ -1,11 +0,0 @@
 header:
  version: 14
  includes:
    - ci/base.yml
    - ci/fvp.yml
    - ci/meta-openembedded.yml
 machine: tc1
 target:
  - core-image-minimal
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -12,7 +14,7 @@ local_conf_header:
  slirp: |
    TEST_RUNQEMUPARAMS = "slirp"
  sshd: |
-    IMAGE_FEATURES:append = " ssh-server-dropbear"
+    IMAGE_FEATURES += "ssh-server-dropbear"
  sshkeys: |
    CORE_IMAGE_EXTRA_INSTALL += "ssh-pregen-hostkeys"
  universally_failing_tests: |
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -16,5 +18,3 @@ target:
  - nativesdk-gcc-aarch64-none-elf
  - gcc-arm-none-eabi
  - nativesdk-gcc-arm-none-eabi
  - gcc-arm-none-eabi-11.2
  - nativesdk-gcc-arm-none-eabi-11.2
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
@@ -1,3 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
 header:
  version: 14
  includes:
@@ -18,17 +18,18 @@ features for each [Secure Partition][^2] you would like to include:
 | ----------------- | --------------- |
 | Attestation       | ts-attesation   |
 | Crypto            | ts-crypto       |
 | Firmware Update   | ts-fwu
 | 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 |
+| spm-test[1-4]     | 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`.)
+   (Please see ` meta-arm/recipes-kernel/arm-tstee`.)
   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.
@@ -44,9 +45,13 @@ Other steps depend on your machine/platform definition:
   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.
 4. Trusted Services supports an SPMC agonistic binary format. To build SPs to this format the `TS_ENV` variable is to be
   set to `sp`. The resulting SP binaries should be able to boot under any FF-A v1.1 compliant SPMC implementation.
 ## Normal World applications
-Optionally for testing purposes you can add `packagegroup-ts-tests` into your image. It includes 
+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
@@ -62,4 +67,4 @@ See `ci/trusted-services.yml` for an example how to include them into an image.
 [^3]: https://trusted-services.readthedocs.io/en/integration/deployments/test-executables.html
-[^4]: https://optee.readthedocs.io/en/latest/building/gits/optee_test.html
+[^4]: https://optee.readthedocs.io/en/latest/building/gits/optee_test.html
@@ -8,10 +8,5 @@ env:
  # The full testimage run typically takes around 12-24h on fvp-base.
  TEST_OVERALL_TIMEOUT: "${@ 24*60*60}"
 local_conf_header:
  systemready-ir-acs: |
    IMAGE_CLASSES:append = " testimage"
 target:
  - arm-systemready-ir-acs
@@ -1,14 +1,11 @@
 header:
-  version: 11
+  version: 14
-env:
+distro: poky
  DISPLAY: ""
 distro: poky-tiny
 defaults:
  repos:
-    refspec: master
+    branch: master
 repos:
  meta-arm:
@@ -19,29 +16,32 @@ repos:
  poky:
    url: https://git.yoctoproject.org/git/poky
-    refspec: 31dd418207f6c95ef0aad589cd03cd2a4c9a8bf2
+    # commit: 2e9c2a2381105f1306bcbcb54816cbc5d8110eff
    layers:
      meta:
      meta-poky:
      meta-yocto-bsp:
  meta-openembedded:
    url: https://git.openembedded.org/meta-openembedded
-    refspec: 5a01ab461c9bcabcbb2298236602373948f8f073
+    # commit: 1750c66ae8e4268c472c0b2b94748a59d6ef866d
    layers:
      meta-oe:
      meta-python:
      meta-perl:
  meta-secure-core:
    url: https://github.com/wind-river/meta-secure-core.git
    # commit: e29165a1031dcf601edbed1733cedd64826672a5
    layers:
-      meta:
+      meta-secure-core-common:
      meta-signing-key:
      meta-efi-secure-boot:
 local_conf_header:
  base: |
    CONF_VERSION = "2"
  setup: |
    PACKAGE_CLASSES = "package_ipk"
    BB_NUMBER_THREADS ?= "16"
    PARALLEL_MAKE ?= "-j16"
@@ -50,4 +50,4 @@ local_conf_header:
 machine: unset
 target:
-  - corstone1000-image
+  - corstone1000-flash-firmware-image
@@ -0,0 +1,23 @@
 ---
 header:
  version: 14
 local_conf_header:
  firmwarebuild: |
    BBMULTICONFIG:remove = "firmware"
    # Need to ensure the rescue linux options are selected
    OVERRIDES .= ":firmware"
    # Need to ensure we build with a small libc
    TCLIBC="musl"
  mass-storage: |
    # Ensure the Mass Storage device is absent
    FVP_CONFIG[board.msd_mmc.p_mmc_file] = "invalid.dat"
  test-configuration: |
    TEST_SUITES = "_qemutiny ping"
    # Remove Dropbear SSH as it will not fit into the corstone1000 image.
    IMAGE_FEATURES:remove = "ssh-server-dropbear"
    CORE_IMAGE_EXTRA_INSTALL:remove = "ssh-pregen-hostkeys"
@@ -1,16 +1,23 @@
 header:
-  version: 11
+  version: 14
  includes:
    - kas/corstone1000-base.yml
    - kas/corstone1000-image-configuration.yml
    - kas/corstone1000-firmware-only.yml
    - kas/fvp-eula.yml
-machine: corstone1000-fvp
+env:
  DISPLAY:
  WAYLAND_DISPLAY:
  XAUTHORITY:
 local_conf_header:
-    fvp-config: |
+  testimagefvp: |
-        # Remove Dropbear SSH as it will not fit into the corstone1000 image.
+    LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA"
-        IMAGE_FEATURES:remove = " ssh-server-dropbear"
+    IMAGE_CLASSES += "fvpboot"
        INHERIT += "fvpboot"
-target:
+  mass-storage: |
-  - corstone1000-image
+    # Ensure the Mass Storage device is absent
    FVP_CONFIG[board.msd_mmc.p_mmc_file] = "invalid.dat"
 machine: corstone1000-fvp
@@ -0,0 +1,49 @@
 header:
  version: 14
 local_conf_header:
  extrapackages: |
    # Intentionally blank to prevent perf from being added to the image in base.yml
  firmwarebuild: |
    # Only needed as kas doesn't add it automatically unless you have 2 targets in seperate configs
    BBMULTICONFIG ?= "firmware"
  distrosetup: |
    DISTRO_FEATURES = "usbhost ipv4"
  initramfsetup: |
    # Telling the build system which image is responsible of the generation of the initramfs rootfs
    INITRAMFS_IMAGE_BUNDLE:firmware = "1"
    INITRAMFS_IMAGE:firmware ?= "corstone1000-recovery-image"
    IMAGE_FSTYPES:firmware:pn-corstone1000-recovery-image = "${INITRAMFS_FSTYPES}"
    IMAGE_NAME_SUFFIX:firmware = ""
    # enable mdev/busybox for init
    INIT_MANAGER:firmware = "mdev-busybox"
    VIRTUAL-RUNTIME_init_manager:firmware = "busybox"
    # prevent the kernel image from being included in the intramfs rootfs
    PACKAGE_EXCLUDE:firmware += "kernel-image-*"
    # Disable openssl in kmod to shrink the initramfs size
    PACKAGECONFIG:remove:firmware:pn-kmod = "openssl"
  imageextras: |
    # Don't include kernel binary in rootfs /boot path
    RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
    # all optee packages
    CORE_IMAGE_EXTRA_INSTALL += "optee-client"
    # TS PSA API tests commands for crypto, its, ps and iat
    CORE_IMAGE_EXTRA_INSTALL += "packagegroup-ts-tests-psa"
    CORE_IMAGE_EXTRA_INSTALL:firmware += "packagegroup-ts-tests-psa"
    # external system firmware
    CORE_IMAGE_EXTRA_INSTALL:firmware += "external-system-elf"
  capsule: |
    CAPSULE_EXTENSION = "uefi.capsule"
    CAPSULE_FW_VERSION = "6"
    CAPSULE_NAME = "${MACHINE}-v${CAPSULE_FW_VERSION}"
@@ -1,6 +1,8 @@
 header:
-  version: 11
+  version: 14
  includes:
    - kas/corstone1000-base.yml
    - kas/corstone1000-image-configuration.yml
    - kas/corstone1000-firmware-only.yml
 machine: corstone1000-mps3
@@ -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 = "nanbield"
+LAYERSERIES_COMPAT_meta-arm-bsp = "nanbield scarthgap"
 LAYERDEPENDS_meta-arm-bsp = "core meta-arm"
 # This won't be used by layerindex-fetch, but works everywhere else
@@ -24,3 +24,7 @@ BBFILES_DYNAMIC += " \
    meta-arm-systemready:${LAYERDIR}/dynamic-layers/meta-arm-systemready/*/*/*.bb \
    meta-arm-systemready:${LAYERDIR}/dynamic-layers/meta-arm-systemready/*/*/*.bbappend \
 "
 WARN_QA:append:layer-meta-arm-bsp = " patch-status"
 addpylib ${LAYERDIR}/lib oeqa
@@ -14,7 +14,13 @@ TEST_SUITES = "fvp_boot"
 # FVP Config
 FVP_PROVIDER ?= "fvp-corstone1000-native"
 FVP_EXE ?= "FVP_Corstone-1000"
-FVP_CONSOLE ?= "host_terminal_0"
+FVP_CONSOLES[default] = "host_terminal_0"
 FVP_CONSOLES[tf-a] = "host_terminal_1"
 FVP_CONSOLES[se] = "secenc_terminal"
 FVP_CONSOLES[extsys] = "extsys_terminal"
 #Disable Time Annotation
 FASTSIM_DISABLE_TA = "0"
 # FVP Parameters
 FVP_CONFIG[se.trustedBootROMloader.fname] ?= "bl1.bin"
@@ -32,7 +38,7 @@ FVP_CONFIG[se.nvm.update_raw_image] ?= "0"
 FVP_CONFIG[se.cryptocell.USER_OTP_FILTERING_DISABLE] ?= "1"
 # Boot image
-FVP_DATA ?= "board.flash0=${IMAGE_NAME}.wic@0x68000000"
+FVP_DATA ?= "board.flash0=corstone1000-flash-firmware-image-${MACHINE}.wic@0x68000000"
 # External system (cortex-M3)
 FVP_CONFIG[extsys_harness0.extsys_flashloader.fname] ?= "es_flashfw.bin"
@@ -46,13 +52,24 @@ 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.diagnostics] ?= "0"
 FVP_CONFIG[board.msd_mmc.p_max_block_count] ?= "0xFFFF"
 FVP_CONFIG[board.msd_config.pl180_fifo_depth] ?= "16"
 FVP_CONFIG[board.msd_mmc.support_unpadded_images] ?= "true"
 FVP_CONFIG[board.msd_mmc.p_mmc_file] ?= "${IMAGE_NAME}.wic"
 # MMC2 card configuration
 FVP_CONFIG[board.msd_mmc_2.card_type] ?= "SDHC"
 FVP_CONFIG[board.msd_mmc_2.p_fast_access] ?= "0"
-FVP_CONFIG[board.msd_mmc_2.diagnostics] ?= "2"
+FVP_CONFIG[board.msd_mmc_2.diagnostics] ?= "0"
 FVP_CONFIG[board.msd_mmc_2.p_max_block_count] ?= "0xFFFF"
-FVP_CONFIG[board.msd_config_2.pl180_fifo_depth] ?= "16"
+FVP_CONFIG[board.msd_config_2.pl180_fifo_depth] ?= "16"
 FVP_CONFIG[board.msd_mmc_2.support_unpadded_images] ?= "true"
 FVP_CONFIG[board.msd_mmc_2.p_mmc_file] ?= "corstone1000-esp-image-${MACHINE}.wic"
 # Virtio-Net configuration
 FVP_CONFIG[board.virtio_net.enabled] ?= "1"
 FVP_CONFIG[board.virtio_net.hostbridge.interfaceName] ?= "eth1"
 FVP_CONFIG[board.virtio_net.hostbridge.userNetworking] ?= "true"
 FVP_CONFIG[board.virtio_net.hostbridge.userNetPorts] ?= "5555=5555,8080=80,2222=22"
 FVP_CONFIG[board.virtio_net.transport] ?= "legacy"
@@ -4,9 +4,7 @@
 #@NAME: Armv8-A Base Platform FVP machine
 #@DESCRIPTION: Machine configuration for Armv8-A Base Platform FVP model
-require conf/machine/include/arm/arch-armv8a.inc
+require conf/machine/include/arm/arch-armv8-4a.inc
 TUNE_FEATURES = "aarch64"
 ARM_SYSTEMREADY_FIRMWARE = "trusted-firmware-a:do_deploy"
 ARM_SYSTEMREADY_ACS_CONSOLE = "default"
@@ -49,6 +47,10 @@ FVP_CONFIG[bp.virtio_net.hostbridge.userNetworking] ?= "1"
 FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "2222=22"
 FVP_CONFIG[bp.virtio_rng.enabled] ?= "1"
 FVP_CONFIG[cache_state_modelled] ?= "0"
 FVP_CONFIG[cluster0.check_memory_attributes] ?= "0"
 FVP_CONFIG[cluster1.check_memory_attributes] ?= "0"
 FVP_CONFIG[cluster0.stage12_tlb_size] ?= "1024"
 FVP_CONFIG[cluster1.stage12_tlb_size] ?= "1024"
 FVP_CONFIG[bp.secureflashloader.fname] ?= "bl1-fvp.bin"
 FVP_CONFIG[bp.flashloader0.fname] ?= "fip-fvp.bin"
 FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic"
@@ -60,3 +62,4 @@ FVP_TERMINALS[bp.terminal_0] ?= "Console"
 FVP_TERMINALS[bp.terminal_1] ?= ""
 FVP_TERMINALS[bp.terminal_2] ?= ""
 FVP_TERMINALS[bp.terminal_3] ?= ""
 FVP_CONFIG[bp.secure_memory] ?= "1"
@@ -2,81 +2,64 @@ require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 MACHINEOVERRIDES =. "corstone1000:"
 # TF-M
 PREFERRED_VERSION_trusted-firmware-m ?= "2.0.%"
 # TF-A
 TFA_PLATFORM = "corstone1000"
-EXTRA_IMAGEDEPENDS += "trusted-firmware-a"
+PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%"
-PREFERRED_VERSION_trusted-firmware-a ?= "2.9.%"
+PREFERRED_VERSION_tf-a-tests ?= "2.10.%"
 PREFERRED_VERSION_tf-a-tests ?= "2.8.%"
 TFA_BL2_BINARY = "bl2-corstone1000.bin"
 TFA_FIP_BINARY = "fip-corstone1000.bin"
-# TF-M
+# optee
-EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m"
+PREFERRED_VERSION_optee-os ?= "4.1.%"
-# TF-M settings for signing host images
+# Trusted Services
-TFA_BL2_RE_IMAGE_LOAD_ADDRESS = "0x62353000"
+TS_PLATFORM = "arm/corstone1000"
-TFA_BL2_RE_SIGN_BIN_SIZE = "0x2d000"
+TS_SP_SE_PROXY_CONFIG = "corstone1000"
-TFA_FIP_RE_IMAGE_LOAD_ADDRESS = "0x68130000"
+# Include smm-gateway and se-proxy SPs into optee-os binary
-TFA_FIP_RE_SIGN_BIN_SIZE = "0x00200000"
+MACHINE_FEATURES += "ts-smm-gateway ts-se-proxy"
 RE_LAYOUT_WRAPPER_VERSION = "0.0.7"
 TFM_SIGN_PRIVATE_KEY = "${libdir}/tfm-scripts/root-RSA-3072_1.pem"
 RE_IMAGE_OFFSET = "0x1000"
 # u-boot
 PREFERRED_VERSION_u-boot ?= "2023.07%"
-EXTRA_IMAGEDEPENDS += "u-boot"
+MACHINE_FEATURES += "efi"
 EFI_PROVIDER ?= "grub-efi"
-UBOOT_CONFIG ??= "EFI"
+# Grub
-UBOOT_CONFIG[EFI] = "corstone1000_defconfig"
+LINUX_KERNEL_ARGS ?= "earlycon=pl011,0x1a510000 console=ttyAMA0,115200"
-UBOOT_ENTRYPOINT  = "0x80000000"
+GRUB_LINUX_APPEND ?= "${LINUX_KERNEL_ARGS}"
-UBOOT_LOADADDRESS = "0x80000000"
+IMAGE_CMD:wic[vardeps] += "GRUB_LINUX_APPEND"
 UBOOT_BOOTARGS = "earlycon=pl011,0x1a510000 console=ttyAMA0 loglevel=9"
 UBOOT_ARCH = "arm"
 UBOOT_EXTLINUX = "0"
 #optee
 PREFERRED_VERSION_optee-os ?= "3.22%"
 PREFERRED_VERSION_optee-client ?= "3.22%"
 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"
 # Linux kernel
-PREFERRED_PROVIDER_virtual/kernel:forcevariable = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "6.5%"
+PREFERRED_VERSION_linux-yocto ?= "6.6.%"
-KERNEL_IMAGETYPE = "Image.gz"
+KERNEL_IMAGETYPE = "Image"
-
+KERNEL_IMAGETYPE:firmware = "Image.gz"
 INITRAMFS_IMAGE_BUNDLE ?= "1"
 #telling the build system which image is responsible of the generation of the initramfs rootfs
 INITRAMFS_IMAGE = "corstone1000-initramfs-image"
 IMAGE_NAME_SUFFIX = ""
 # 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-*"
 # enable this feature for kernel debugging
 # MACHINE_FEATURES += "corstone1000_kernel_debug"
 # login terminal serial port settings
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 IMAGE_FSTYPES += "wic"
 # Need to clear the suffix so TESTIMAGE_AUTO works
 IMAGE_NAME_SUFFIX = ""
 WKS_FILE ?= "efi-disk-no-swap.wks.in"
 WKS_FILE:firmware ?= "corstone1000-flash-firmware.wks.in"
 # making sure EXTRA_IMAGEDEPENDS will be used while creating the image
 WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
-WKS_FILE ?= "corstone1000-image.corstone1000.wks"
+# If not building under the firmware multiconf we need to build the actual firmware
 FIRMWARE_DEPLOYMENT ?= "firmware-deploy-image"
 FIRMWARE_DEPLOYMENT:firmware ?= ""
 EXTRA_IMAGEDEPENDS += "${FIRMWARE_DEPLOYMENT}"
-# Disable openssl in kmod to shink the initramfs size
+ARM_SYSTEMREADY_FIRMWARE = "${FIRMWARE_DEPLOYMENT}:do_deploy \
-PACKAGECONFIG:remove:pn-kmod = "openssl"
+                            corstone1000-esp-image:do_image_complete \
                           "
 ARM_SYSTEMREADY_ACS_CONSOLE ?= "default"
@@ -1,36 +0,0 @@
 TUNE_FEATURES = "aarch64"
 require conf/machine/include/arm/arch-armv8a.inc
 MACHINEOVERRIDES =. "tc:"
 # Das U-boot
 UBOOT_MACHINE ?= "total_compute_defconfig"
 UBOOT_RD_LOADADDRESS = "0x88000000"
 UBOOT_RD_ENTRYPOINT = "0x88000000"
 UBOOT_LOADADDRESS = "0x80080000"
 UBOOT_ENTRYPOINT = "0x80080000"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 # OP-TEE
 PREFERRED_VERSION_optee-os ?= "3.20%"
 PREFERRED_VERSION_optee-client ?= "3.20%"
 PREFERRED_VERSION_optee-test ?= "3.20%"
 # Cannot use the default zImage on arm64
 KERNEL_IMAGETYPE = "Image"
 KERNEL_IMAGETYPES += "fitImage"
 KERNEL_CLASSES = " kernel-fitimage "
 IMAGE_FSTYPES += "cpio.gz"
 INITRAMFS_IMAGE ?= "core-image-minimal"
 IMAGE_NAME_SUFFIX = ""
 SERIAL_CONSOLES = "115200;ttyAMA0"
 EXTRA_IMAGEDEPENDS += "trusted-firmware-a optee-os"
 PREFERRED_VERSION_trusted-firmware-a ?= "2.8.%"
 # FIXME - there is signed image dependency/race with testimage.
 # This should be fixed in oe-core
 TESTIMAGEDEPENDS:append = " virtual/kernel:do_deploy"
@@ -19,7 +19,7 @@ WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
 # Use kernel provided by yocto
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "6.5%"
+PREFERRED_VERSION_linux-yocto ?= "6.6%"
 # RTL8168E Gigabit Ethernet Controller is attached to the PCIe interface
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
@@ -27,16 +27,21 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168"
 # TF-A
 EXTRA_IMAGEDEPENDS += "trusted-firmware-a"
 TFA_PLATFORM = "n1sdp"
 PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%"
 PREFERRED_VERSION_tf-a-tests ?= "2.10.%"
 # SCP
 EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
 #UEFI EDK2 firmware
 EXTRA_IMAGEDEPENDS += "edk2-firmware"
-PREFERRED_VERSION_edk2-firmware ?= "202305"
+PREFERRED_VERSION_edk2-firmware ?= "202311"
 #optee
-PREFERRED_VERSION_optee-os ?= "3.22.%"
+PREFERRED_VERSION_optee-os ?= "4.1.%"
 PREFERRED_VERSION_optee-os-tadevkit ?= "4.1.%"
 PREFERRED_VERSION_optee-test ?= "4.1.%"
 PREFERRED_VERSION_optee-client ?= "4.1.%"
 #grub-efi
 EFI_PROVIDER ?= "grub-efi"
@@ -1,14 +1,17 @@
 #@TYPE: Machine
-#@NAME: qemu-generic-arm64
+#@NAME: sbsa-ref
-#@DESCRIPTION: Generic Arm64 machine for typical SystemReady platforms, which
+#@DESCRIPTION: Reference SBSA machine in qemu-system-aarch64 on Neoverse N2
 #have working firmware and boot via EFI.
-MACHINEOVERRIDES =. "generic-arm64:"
+require conf/machine/include/arm/armv9a/tune-neoversen2.inc
 require conf/machine/generic-arm64.conf
 require conf/machine/include/qemu.inc
-EXTRA_IMAGEDEPENDS += "edk2-firmware"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 KERNEL_IMAGETYPE = "Image"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
 MACHINE_FEATURES = " alsa bluetooth efi qemu-usermode rtc screen usbhost vfat wifi"
 IMAGE_FSTYPES += "wic.qcow2"
 # This unique WIC file is necessary because kernel boot args cannot be passed
 # because there is no default kernel (see below).  There is no default kernel
@@ -17,17 +20,23 @@ EXTRA_IMAGEDEPENDS += "edk2-firmware"
 # boot arg (which we need for testimage), we have to have a WIC file unique to
 # this platform.
 WKS_FILE = "qemu-efi-disk.wks.in"
-IMAGE_FSTYPES += "wic.qcow2"
+
 EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}"
 SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
 EXTRA_IMAGEDEPENDS += "edk2-firmware"
 QB_SYSTEM_NAME = "qemu-system-aarch64"
 QB_MACHINE = "-machine sbsa-ref"
 QB_CPU = "-cpu neoverse-n2"
 QB_MEM = "-m 1024"
 QB_DEFAULT_FSTYPE = "wic.qcow2"
 QB_NETWORK_DEVICE = "-device virtio-net-pci,netdev=net0,mac=@MAC@"
 QB_DRIVE_TYPE = "/dev/hd"
 QB_ROOTFS_OPT = "-drive file=@ROOTFS@,if=ide,format=qcow2"
 QB_DEFAULT_KERNEL = "none"
-QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd -pflash @DEPLOY_DIR_IMAGE@/SBSA_FLASH0.fd -pflash @DEPLOY_DIR_IMAGE@/SBSA_FLASH1.fd"
+QB_OPT_APPEND = "-device usb-tablet -device usb-kbd -pflash @DEPLOY_DIR_IMAGE@/SBSA_FLASH0.fd -pflash @DEPLOY_DIR_IMAGE@/SBSA_FLASH1.fd"
 QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
 QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon"
 # sbsa-ref is a true virtual machine so can't use KVM
@@ -1,31 +0,0 @@
 # Configuration for TC1
 #@TYPE: Machine
 #@NAME: TC1
 #@DESCRIPTION: Machine configuration for TC1
 require conf/machine/include/tc.inc
 TEST_TARGET = "OEFVPTarget"
 TEST_SUITES = "fvp_boot"
 # FVP Config
 FVP_PROVIDER ?= "fvp-tc1-native"
 FVP_EXE ?= "FVP_TC1"
 # FVP Parameters
 FVP_CONFIG[css.scp.ROMloader.fname] ?= "scp_romfw.bin"
 FVP_CONFIG[css.trustedBootROMloader.fname] ?= "bl1-tc.bin"
 FVP_CONFIG[board.flashloader0.fname] ?= "fip_gpt-tc.bin"
 #FVP_CONFIG[board.hostbridge.userNetworking] ?= "true"
 #FVP_CONFIG[board.hostbridge.userNetPorts] ?= "2222=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=fitImage-core-image-minimal-tc1-tc1@0x20000000"
@@ -0,0 +1,12 @@
 version: 2
 build:
  os: "ubuntu-22.04"
  tools:
    python: "3.9"
 sphinx:
  configuration: meta-arm-bsp/documentation/corstone1000/conf.py
 formats:
  - pdf
 python:
  install:
    - requirements: meta-arm-bsp/documentation/requirements.txt
@@ -10,6 +10,77 @@ Change Log
 This document contains a summary of the new features, changes and
 fixes in each release of Corstone-1000 software stack.
 ***************
 Version 2023.11
 ***************
 Changes
 =======
 - Making Corstone-1000  SystemReady IR 2.0 certifiable
 - Allow booting Debian & OpenSUSE on FVP
 - Add support for two MMC cards for the FVP
 - Add signed capsule update support
 - Enable on-disk capsule update
 - Add the feature of purging specific DT nodes in U-Boot before Linux
 - Add Ethernet over VirtIO support in U-Boot
 - Add support for unaligned MMC card images
 - Reducing the out-of-tree patches by upstreaming them to the corresponding open-source projects
 - SW components upgrades
 - Bug fixes
 Corstone-1000 components versions
 =================================
 +-------------------------------------------+-----------------------------------------------------+
 | arm-ffa-tee                               |                   1.1.2-r0                          |
 +-------------------------------------------+-----------------------------------------------------+
 | linux-yocto                               |                   6.5.7                             |
 +-------------------------------------------+-----------------------------------------------------+
 | u-boot                                    |                   2023.07                           |
 +-------------------------------------------+-----------------------------------------------------+
 | external-system                           |    0.1.0+gitAUTOINC+8c9dca74b1-r0                   |
 +-------------------------------------------+-----------------------------------------------------+
 | optee-client                              |                   3.22.0                            |
 +-------------------------------------------+-----------------------------------------------------+
 | optee-os                                  |                   3.22.0                            |
 +-------------------------------------------+-----------------------------------------------------+
 | trusted-firmware-a                        |                   2.9.0                             |
 +-------------------------------------------+-----------------------------------------------------+
 | trusted-firmware-m                        |                   1.8.1                             |
 +-------------------------------------------+-----------------------------------------------------+
 | libts                                     |                       08b3d39471                    |
 +-------------------------------------------+-----------------------------------------------------+
 | ts-newlib                                 |                   4.1.0                             |
 +-------------------------------------------+-----------------------------------------------------+
 | ts-psa-{crypto, iat, its. ps}-api-test    |                   38cb53a4d9                        |
 +-------------------------------------------+-----------------------------------------------------+
 | ts-sp-{se-proxy, smm-gateway}             |                   08b3d39471                        |
 +-------------------------------------------+-----------------------------------------------------+
 Yocto distribution components versions
 ======================================
 +-------------------------------------------+------------------------------+
 | meta-arm                                  | nanbield                     |
 +-------------------------------------------+------------------------------+
 | poky                                      | nanbield                     |
 +-------------------------------------------+------------------------------+
 | meta-openembedded                         | nanbield                     |
 +-------------------------------------------+------------------------------+
 | meta-secure-core                          | nanbield                     |
 +-------------------------------------------+------------------------------+
 | busybox                                   |                   1.36.1     |
 +-------------------------------------------+------------------------------+
 | musl                                      |                   1.2.4      |
 +-------------------------------------------+------------------------------+
 | gcc-arm-none-eabi                         |          11.2-2022.02        |
 +-------------------------------------------+------------------------------+
 | gcc-cross-aarch64                         |                   13.2.0     |
 +-------------------------------------------+------------------------------+
 | openssl                                   |                   3.1.3      |
 +-------------------------------------------+------------------------------+
 ***************
 Version 2023.06
 ***************
@@ -1,11 +1,21 @@
 ..
- # Copyright (c) 2022, Arm Limited.
+ # Copyright (c) 2022, 2024, Arm Limited.
 #
 # SPDX-License-Identifier: MIT
-################
+#################
-ARM Corstone1000
+Arm Corstone-1000
-################
+#################
 *************************
 Disclaimer
 *************************
 Arm reference solutions are Arm public example software projects that track and
 pull upstream components, incorporating their respective security fixes
 published over time. Arm partners are responsible for ensuring that the
 components they use contain all the required security fixes, if and when they
 deploy a product derived from Arm reference solutions.
 .. toctree::
   :maxdepth: 1
@@ -19,6 +19,27 @@ 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.11
 ***********************
 Known Issues or Limitations
 ---------------------------
 - Use Ethernet over VirtIO due to lan91c111 Ethernet driver support dropped from U-Boot.
 - Temporally removing the External system support in Linux due to it using multiple custom devicetree bindings that caused problems with SystemReady IR 2.0 certification. For External system support please refer to the version 2023.06. We are aiming to restore it in a more standardised manner in our next release.
 - 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) approximately take 30 minutes to complete for FVP and MPS3.
 - Corstone-1000 SoC on FVP doesn't have a secure debug peripheral. It does on the MPS3.
 - See previous release notes for the known limitations regarding ACS tests.
 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.23_25
   https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps
 ***********************
 Release notes - 2023.06
 ***********************
@@ -53,7 +53,7 @@ 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 
+TrustedFirmware-M(`TF-M`_) as runtime software. The software design on
 Secure Enclave follows Firmware Framework for M class
 processor (`FF-M`_) specification.
@@ -72,8 +72,10 @@ 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
+Communication between the external system and Host (Cortex-A35) is performed
-using MHU as transport mechanism and rpmsg messaging system.
+using MHU as transport mechanism and rpmsg messaging system (the external system
 support in Linux is disabled in this release. More info about this change can be found in the
 release-notes).
 Overall, the Corstone-1000 architecture is designed to cover a range
 of Power, Performance, and Area (PPA) applications, and enable extension
@@ -138,10 +140,13 @@ flow path for such calls.
 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
+solution relies on the `RSE communication protocol
-a doorbell for communication between two cores. Corstone-1000 implements
+<https://tf-m-user-guide.trustedfirmware.org/platform/arm/rse/rse_comms.html>`_
-isolation level 2. Cortex-M0+ MPU (Memory Protection Unit) is used to implement
+which is a lightweight serialization of the psa_call() API. It can use shared
-isolation level 2.
+memory and MHU interrupts as a doorbell for communication between two cores
 but currently the whole message is forwarded through the MHU channels in Corstone-1000.
 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
@@ -157,9 +162,9 @@ 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
+the device only accepts the authorized (signed) images in the firmware update
 process. Corstone-1000 supports OTA (Over the Air) firmware updates and
-follows Platform Security Firmware Update sepcification (`FWU`_).
+follows Platform Security Firmware Update specification (`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
@@ -172,7 +177,10 @@ Image (the initramfs bundle). The new images are accepted in the form of a UEFI
   :width: 690
   :alt: ExternalFlash
-
+When Firmware update is triggered, u-boot verifies the capsule by checking the
 capsule signature, version number and size. Then it signals the Secure Enclave
 that can start writing UEFI capsule into the flash. Once this operation finishes
 ,Secure Enclave resets the entire system.
 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
@@ -230,7 +238,7 @@ References
 .. _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
+.. _FF-M: https://developer.arm.com/architectures/Firmware%20Framework%20for%20M-Profile
 .. _FWU: https://developer.arm.com/documentation/den0118/a/
 .. _OPTEE-OS: https://github.com/OP-TEE/optee_os
 .. _PSA: https://www.psacertified.org/
@@ -6,7 +6,6 @@
 jinja2==3.1.1
 # Required to build the documentation
-sphinx==4.5.0
+sphinx~=5.0
-sphinx_rtd_theme==1.0.0
+sphinx_rtd_theme~=2.0.0
 sphinx-copybutton==0.5.0
 docutils==0.17.1
@@ -1,32 +0,0 @@
 # TC1 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 TC1 platform with detailed instructions for
 syncing and building the source code and running on TC1 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/tc1/user-guide.rst
 ## Building
 In the local.conf file, MACHINE should be set as follows:
 MACHINE = "tc1"
 To build the required binaries for tc1, 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 TC1 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/tc1/user-guide.rst
@@ -0,0 +1,5 @@
 # The release of EDK2 after 202402 should fix this
 NUMA: Failed to initialise from firmware
 # TODO: we should be using bochsdrm over efifb?
 efifb: cannot reserve video memory at 0x80000000
@@ -0,0 +1 @@
 COMPATIBLE_MACHINE:fvp-base = "fvp-base"
@@ -38,15 +38,20 @@ do_compile() {
 do_compile[cleandirs] = "${B}"
 do_install() {
-    install -D -p -m 0644 ${B}/product/${PRODUCT}/firmware/release/bin/firmware.bin ${D}/firmware/es_flashfw.bin
+    install -D -p -m 0644 ${B}/product/${PRODUCT}/firmware/release/bin/firmware.bin ${D}${nonarch_base_libdir}/firmware/es_flashfw.bin
    install -D -p -m 0644 ${B}/product/${PRODUCT}/firmware/release/bin/firmware.elf ${D}${nonarch_base_libdir}/firmware/es_flashfw.elf
 }
-FILES:${PN} = "/firmware"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/es_flashfw.bin"
-SYSROOT_DIRS += "/firmware"
+FILES:${PN}-elf = "${nonarch_base_libdir}/firmware/es_flashfw.elf"
 PACKAGES += "${PN}-elf"
 INSANE_SKIP:${PN}-elf += "arch"
 SYSROOT_DIRS += "${nonarch_base_libdir}/firmware"
 inherit deploy
 do_deploy() {
-    cp -rf ${D}/firmware/* ${DEPLOYDIR}/
+    cp -rf ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/
 }
 addtask deploy after do_install
@@ -1,8 +0,0 @@
 # TC specific configuration
 COMPATIBLE_MACHINE = "(tc?)"
 HAFNIUM_PLATFORM = "secure_tc"
 do_compile() {
    PATH="${S}/prebuilts/linux-x64/clang/bin:$PATH" oe_runmake -C ${S}
 }
@@ -0,0 +1,25 @@
 SUMMARY = "Corstone1000 platform esp Image"
 DESCRIPTION = "This builds a simple image file that only contains an esp \
               partition for use when running the SystemReady IR ACS tests."
 LICENSE = "MIT"
 COMPATIBLE_MACHINE = "corstone1000"
 # IMAGE_FSTYPES must be set before 'inherit image'
 # https://docs.yoctoproject.org/ref-manual/variables.html#term-IMAGE_FSTYPES
 IMAGE_FSTYPES = "wic"
 inherit image
 IMAGE_FEATURES = ""
 IMAGE_LINGUAS = ""
 PACKAGE_INSTALL = ""
 # This builds a very specific image so we can ignore any customization
 WKS_FILE = "efi-disk-esp-only.wks.in"
 WKS_FILE:firmware = "efi-disk-esp-only.wks.in"
 EXTRA_IMAGEDEPENDS = ""
 # Don't write an fvp configuration file for this image as it can't run
 IMAGE_POSTPROCESS_COMMAND:remove = "do_write_fvpboot_conf;"
@@ -0,0 +1,11 @@
 COMPATIBLE_MACHINE = "corstone1000"
 FIRMWARE_BINARIES = "corstone1000-flash-firmware-image-${MACHINE}.wic \
                     bl1.bin \
                     es_flashfw.bin \
                     ${CAPSULE_NAME}.${CAPSULE_EXTENSION} \
                     corstone1000_capsule_cert.crt \
                     corstone1000_capsule_key.key \
                    "
 do_deploy[mcdepends] = "mc::firmware:corstone1000-flash-firmware-image:do_image_complete"
@@ -0,0 +1,96 @@
 SUMMARY = "Corstone1000 platform Image"
 DESCRIPTION = "This is the main image which is the container of all the binaries \
               generated for the Corstone1000 platform."
 LICENSE = "MIT"
 COMPATIBLE_MACHINE = "corstone1000"
 # IMAGE_FSTYPES must be set before 'inherit image'
 # https://docs.yoctoproject.org/ref-manual/variables.html#term-IMAGE_FSTYPES
 IMAGE_FSTYPES = "wic uefi_capsule"
 inherit image
 inherit tfm_sign_image
 inherit uefi_capsule
 inherit deploy
 DEPENDS += "external-system \
            trusted-firmware-a \
            trusted-firmware-m \
            u-boot \
 "
 IMAGE_FEATURES = ""
 IMAGE_LINGUAS = ""
 PACKAGE_INSTALL = ""
 # The generated ${MACHINE}_image.nopt is used instead of the default wic image
 # for the capsule generation. The uefi.capsule image type doesn't have to
 # depend on the wic because of this.
 #
 # The corstone1000_capsule_cert.crt and corstone1000_capsule_key.key are installed
 # by the U-Boot recipe so this recipe has to depend on that.
 CAPSULE_IMGTYPE = ""
 CAPSULE_CERTIFICATE_PATH = "${DEPLOY_DIR_IMAGE}/corstone1000_capsule_cert.crt"
 CAPSULE_GUID:corstone1000-fvp ?= "989f3a4e-46e0-4cd0-9877-a25c70c01329"
 CAPSULE_GUID:corstone1000-mps3 ?= "df1865d1-90fb-4d59-9c38-c9f2c1bba8cc"
 CAPSULE_IMGLOCATION = "${DEPLOY_DIR_IMAGE}"
 CAPSULE_INDEX = "1"
 CAPSULE_MONOTONIC_COUNT = "1"
 CAPSULE_PRIVATE_KEY_PATH = "${DEPLOY_DIR_IMAGE}/corstone1000_capsule_key.key"
 UEFI_FIRMWARE_BINARY = "${B}/${MACHINE}_image.nopt"
 # TF-A settings for signing host images
 TFA_BL2_BINARY = "bl2-corstone1000.bin"
 TFA_FIP_BINARY = "fip-corstone1000.bin"
 TFA_BL2_RE_IMAGE_LOAD_ADDRESS = "0x62353000"
 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"
 RE_IMAGE_OFFSET = "0x1000"
 # Offsets for the .nopt image generation
 TFM_OFFSET = "102400"
 FIP_OFFSET = "479232"
 KERNEL_OFFSET = "2576384"
 do_sign_images() {
    # Sign TF-A BL2
    sign_host_image ${RECIPE_SYSROOT}/firmware/${TFA_BL2_BINARY} \
        ${TFA_BL2_RE_IMAGE_LOAD_ADDRESS} ${TFA_BL2_RE_SIGN_BIN_SIZE}
    # Update BL2 in the FIP image
    cp ${RECIPE_SYSROOT}/firmware/${TFA_FIP_BINARY} .
    fiptool update --tb-fw \
        ${TFM_IMAGE_SIGN_DEPLOY_DIR}/signed_${TFA_BL2_BINARY} \
        ${TFM_IMAGE_SIGN_DIR}/${TFA_FIP_BINARY}
    # Sign the FIP image
    sign_host_image ${TFM_IMAGE_SIGN_DIR}/${TFA_FIP_BINARY} \
        ${TFA_FIP_RE_IMAGE_LOAD_ADDRESS} ${TFA_FIP_RE_SIGN_BIN_SIZE}
 }
 do_sign_images[depends] = "\
    fiptool-native:do_populate_sysroot \
    "
 # This .nopt image is not the same as the one which is generated by meta-arm/meta-arm/classes/wic_nopt.bbclass.
 # The meta-arm/meta-arm/classes/wic_nopt.bbclass removes the partition table from the wic image, but keeps the
 # second bank. This function creates a no-partition image with only the first bank.
 create_nopt_image() {
    dd conv=notrunc bs=1 if=${DEPLOY_DIR_IMAGE}/bl2_signed.bin of=${B}/${MACHINE}_image.nopt
    dd conv=notrunc bs=1 if=${DEPLOY_DIR_IMAGE}/tfm_s_signed.bin of=${B}/${MACHINE}_image.nopt seek=${TFM_OFFSET}
    dd conv=notrunc bs=1 if=${DEPLOY_DIR_IMAGE}/signed_fip-corstone1000.bin of=${B}/${MACHINE}_image.nopt seek=${FIP_OFFSET}
    dd conv=notrunc bs=1 if=${DEPLOY_DIR_IMAGE}/Image.gz-initramfs-${MACHINE}.bin of=${B}/${MACHINE}_image.nopt seek=${KERNEL_OFFSET}
 }
 do_image_uefi_capsule[depends] += " linux-yocto:do_deploy"
 do_image_uefi_capsule[mcdepends] += " ${@bb.utils.contains('BBMULTICONFIG', 'firmware', 'mc::firmware:linux-yocto:do_deploy', '', d)}"
 do_image_uefi_capsule[prefuncs] += "create_nopt_image"
 do_deploy() {
    install -m 0755 ${B}/${MACHINE}_image.nopt  ${DEPLOYDIR}
 }
 addtask deploy after do_image_uefi_capsule
@@ -1,38 +0,0 @@
 SUMARY = "Corstone1000 platform Image"
 DESCRIPTION = "This is the main image which is the container of all the binaries \
               generated for the Corstone1000 platform."
 LICENSE = "MIT"
 COMPATIBLE_MACHINE = "corstone1000"
 inherit image
 inherit tfm_sign_image
 inherit  uefi_capsule
 PACKAGE_INSTALL = ""
 IMAGE_FSTYPES += "wic uefi_capsule"
 UEFI_FIRMWARE_BINARY = "${PN}-${MACHINE}.${CAPSULE_IMGTYPE}"
 UEFI_CAPSULE_CONFIG = "${THISDIR}/files/${PN}-capsule-update-image.json"
 CAPSULE_IMGTYPE = "wic"
 do_sign_images() {
    # Sign TF-A BL2
    sign_host_image ${RECIPE_SYSROOT}/firmware/${TFA_BL2_BINARY} \
        ${TFA_BL2_RE_IMAGE_LOAD_ADDRESS} ${TFA_BL2_RE_SIGN_BIN_SIZE}
    # Update BL2 in the FIP image
    cp ${RECIPE_SYSROOT}/firmware/${TFA_FIP_BINARY} .
    fiptool update --tb-fw \
        ${TFM_IMAGE_SIGN_DEPLOY_DIR}/signed_${TFA_BL2_BINARY} \
        ${TFM_IMAGE_SIGN_DIR}/${TFA_FIP_BINARY}
    # Sign the FIP image
    sign_host_image ${TFM_IMAGE_SIGN_DIR}/${TFA_FIP_BINARY} \
        ${TFA_FIP_RE_IMAGE_LOAD_ADDRESS} ${TFA_FIP_RE_SIGN_BIN_SIZE}
 }
 do_sign_images[depends] = "\
    trusted-firmware-a:do_populate_sysroot \
    fiptool-native:do_populate_sysroot \
    "
@@ -1,25 +0,0 @@
 SUMARY = "Corstone1000 platform Initramfs Image"
 DESCRIPTION = "This is the main Linux image which includes an initramfs kernel/rootfs bundle."
 LICENSE = "MIT"
 COMPATIBLE_MACHINE = "corstone1000"
 IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
 inherit core-image
 # By default all basic packages required for a bootable system are installed
 # by core-image . These packages are: packagegroup-core-boot and
 # packagegroup-base-extended
 inherit image-buildinfo
 #package management is not supported in corstone1000
 IMAGE_FEATURES:remove = "package-management"
 # all optee packages
 IMAGE_INSTALL += "optee-client"
 # TS PSA API tests commands for crypto, its, ps and iat
 IMAGE_INSTALL += "packagegroup-ts-tests-psa"
@@ -0,0 +1,7 @@
 require recipes-core/images/core-image-minimal.bb
 # The core-image-minimal is used for the initramfs bundle for the
 # Corstone1000 but the testimage task caused hanging errors. This is
 # why the core-image-minimal is forked here so the testimage task can
 # be disabled as it is not relevant for the Corstone1000.
 IMAGE_CLASSES:remove = "testimage"
@@ -1,11 +0,0 @@
 {
    "Payloads": [
        {
            "FwVersion": "5",
            "Guid": "e2bb9c06-70e9-4b14-97a3-5a7913176e3f",
            "LowestSupportedVersion": "1",
            "Payload": "$UEFI_FIRMWARE_BINARY",
            "UpdateImageIndex": "0"
        }
    ]
 }
@@ -0,0 +1,4 @@
 MACHINE_DEPLOY_FIRMWARE_REQUIRE ?= ""
 MACHINE_DEPLOY_FIRMWARE_REQUIRE:corstone1000 = "corstone1000-firmware-deploy-image.inc"
 require ${MACHINE_DEPLOY_FIRMWARE_REQUIRE}
@@ -13,9 +13,6 @@ DEPENDS += "n1sdp-board-firmware"
 EXTRA_OECMAKE:append = " \
    -DSCP_N1SDP_SENSOR_LIB_PATH=${RECIPE_SYSROOT}/n1sdp-board-firmware_source/LIB/sensor.a \
 "
 # scp-firmware version aligning to Arm Reference Solutions N1SDP-2023.06.22 Release
 SRCREV = "543ae8ca3c9e38da3058311118fa3ceef1da47f7"
 PV .= "+git"
 do_install:append() {
   fiptool \
@@ -1,5 +1,6 @@
 # SGI575 specific SCP configurations and build instructions
 COMPATIBLE_MACHINE:sgi575 = "sgi575"
 SCP_PRODUCT_GROUP = "neoverse-rd"
 SCP_LOG_LEVEL = "INFO"
@@ -1,5 +0,0 @@
 # TC specific SCP configuration
 COMPATIBLE_MACHINE = "(tc1)"
 FW_TARGETS = "scp"
@@ -1,162 +0,0 @@
 From fa7ab9b40babee29d2aadb267dfce7a96f8989d4 Mon Sep 17 00:00:00 2001
 From: Mohamed Omar Asaker <mohamed.omarasaker@arm.com>
 Date: Mon, 9 Jan 2023 13:59:06 +0000
 Subject: [PATCH] feat(corstone1000): bl2 loads fip based on metadata
 Previously bl2 was reading the boot_index directly with a hard coded
 address and then set the fip image spec with fip offsets base based on
 the boot_index value.
 This commit removes this logic and rely on PSA_FWU_SUPPORT
 which reads the fip partition based on the active firmware bank written in
 metadata.
 Note: fip partition contains signature area at the begining. Hence, the fip
 image starts at fip partition + fip signature area size.
 Upstream-Status: Pending
 Signed-off-by: Mohamed Omar Asaker <mohamed.omarasaker@arm.com>
 ---
 bl2/bl2_main.c                                |  4 +++
 .../corstone1000/common/corstone1000_plat.c   | 32 ++++++-------------
 .../common/include/platform_def.h             | 12 +++----
 tools/cert_create/Makefile                    |  4 +--
 tools/fiptool/Makefile                        |  4 +--
 5 files changed, 24 insertions(+), 32 deletions(-)
 diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c
 index ce83692e0ebc..1a9febc007b2 100644
 --- a/bl2/bl2_main.c
 +++ b/bl2/bl2_main.c
@@ -87,6 +87,10 @@ void bl2_main(void)
 	/* Perform remaining generic architectural setup in S-EL1 */
 	bl2_arch_setup();
 +#if ARM_GPT_SUPPORT
 +	partition_init(GPT_IMAGE_ID);
 +#endif
 +
 #if PSA_FWU_SUPPORT
 	fwu_init();
 #endif /* PSA_FWU_SUPPORT */
 diff --git a/plat/arm/board/corstone1000/common/corstone1000_plat.c b/plat/arm/board/corstone1000/common/corstone1000_plat.c
 index 0235f8b8474c..7f9708a82489 100644
 --- a/plat/arm/board/corstone1000/common/corstone1000_plat.c
 +++ b/plat/arm/board/corstone1000/common/corstone1000_plat.c
@@ -33,36 +33,17 @@ const mmap_region_t plat_arm_mmap[] = {
 static void set_fip_image_source(void)
 {
 	const struct plat_io_policy *policy;
 -	/*
 -	 * metadata for firmware update is written at 0x0000 offset of the flash.
 -	 * PLAT_ARM_BOOT_BANK_FLAG contains the boot bank that TF-M is booted.
 -	 * As per firmware update spec, at a given point of time, only one bank
 -	 * is active. This means, TF-A should boot from the same bank as TF-M.
 -	 */
 -	volatile uint32_t *boot_bank_flag = (uint32_t *)(PLAT_ARM_BOOT_BANK_FLAG);
 -
 -	if (*boot_bank_flag > 1) {
 -		VERBOSE("Boot_bank is set higher than possible values");
 -	}
 -
 -	VERBOSE("Boot bank flag = %u.\n\r", *boot_bank_flag);
 	policy = FCONF_GET_PROPERTY(arm, io_policies, FIP_IMAGE_ID);
 	assert(policy != NULL);
 	assert(policy->image_spec != 0UL);
 +	/* FIP Partition contains Signature area at the begining which TF-A doesn't expect */
 	io_block_spec_t *spec = (io_block_spec_t *)policy->image_spec;
 +	spec->offset += FIP_SIGNATURE_AREA_SIZE;
 +	spec->length -= FIP_SIGNATURE_AREA_SIZE;
 -	if ((*boot_bank_flag) == 0) {
 -		VERBOSE("Booting from bank 0: fip offset = 0x%lx\n\r",
 -						PLAT_ARM_FIP_BASE_BANK0);
 -		spec->offset = PLAT_ARM_FIP_BASE_BANK0;
 -	} else {
 -		VERBOSE("Booting from bank 1: fip offset = 0x%lx\n\r",
 -						PLAT_ARM_FIP_BASE_BANK1);
 -		spec->offset = PLAT_ARM_FIP_BASE_BANK1;
 -	}
 }
 void bl2_platform_setup(void)
@@ -75,6 +56,13 @@ void bl2_platform_setup(void)
 	set_fip_image_source();
 }
 +void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1,
 +			       u_register_t arg2, u_register_t arg3)
 +{
 +	arm_bl2_early_platform_setup((uintptr_t)arg0, (meminfo_t *)arg1);
 +	NOTICE("CS1k: early at bl2_platform_setup\n");
 +}
 +
 /* corstone1000 only has one always-on power domain and there
  * is no power control present
  */
 diff --git a/plat/arm/board/corstone1000/common/include/platform_def.h b/plat/arm/board/corstone1000/common/include/platform_def.h
 index 584d485f3ea7..0bfab05a482b 100644
 --- a/plat/arm/board/corstone1000/common/include/platform_def.h
 +++ b/plat/arm/board/corstone1000/common/include/platform_def.h
@@ -173,16 +173,16 @@
 /* NOR Flash */
 -#define PLAT_ARM_BOOT_BANK_FLAG		UL(0x08002000)
 -#define PLAT_ARM_FIP_BASE_BANK0		UL(0x081EF000)
 -#define PLAT_ARM_FIP_BASE_BANK1		UL(0x0916F000)
 -#define PLAT_ARM_FIP_MAX_SIZE		UL(0x1ff000)  /* 1.996 MB */
 -
 #define PLAT_ARM_NVM_BASE		V2M_FLASH0_BASE
 #define PLAT_ARM_NVM_SIZE		(SZ_32M)  /* 32 MB */
 +#define PLAT_ARM_FIP_MAX_SIZE		UL(0x1ff000)  /* 1.996 MB */
 -#define PLAT_ARM_FLASH_IMAGE_BASE	PLAT_ARM_FIP_BASE_BANK0
 +#define PLAT_ARM_FLASH_IMAGE_BASE	UL(0x08000000)
 #define PLAT_ARM_FLASH_IMAGE_MAX_SIZE	PLAT_ARM_FIP_MAX_SIZE
 +#define PLAT_ARM_FIP_OFFSET_IN_GPT	(0x86000)
 +
 +/* FIP Information */
 +#define FIP_SIGNATURE_AREA_SIZE         (0x1000)      /* 4 KB */
 /*
  * Some data must be aligned on the biggest cache line size in the platform.
 diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile
 index 042e844626bd..45b76a022f91 100644
 --- a/tools/cert_create/Makefile
 +++ b/tools/cert_create/Makefile
@@ -78,8 +78,8 @@ INC_DIR += -I ./include -I ${PLAT_INCLUDE} -I ${OPENSSL_DIR}/include
 # directory. However, for a local build of OpenSSL, the built binaries are
 # located under the main project directory (i.e.: ${OPENSSL_DIR}, not
 # ${OPENSSL_DIR}/lib/).
 -LIB_DIR := -L ${OPENSSL_DIR}/lib -L ${OPENSSL_DIR}
 -LIB := -lssl -lcrypto
 +LIB_DIR := -L ${OPENSSL_DIR}/lib -L ${OPENSSL_DIR} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS}
 +LIB := -lssl -lcrypto ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS}
 HOSTCC ?= gcc
 diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile
 index 2ebee33931ba..dcfd314bee89 100644
 --- a/tools/fiptool/Makefile
 +++ b/tools/fiptool/Makefile
@@ -39,7 +39,7 @@ HOSTCCFLAGS += -DUSING_OPENSSL3=$(USING_OPENSSL3)
 # directory. However, for a local build of OpenSSL, the built binaries are
 # located under the main project directory (i.e.: ${OPENSSL_DIR}, not
 # ${OPENSSL_DIR}/lib/).
 -LDLIBS := -L${OPENSSL_DIR}/lib -L${OPENSSL_DIR} -lcrypto
 +LDLIBS := -L${OPENSSL_DIR}/lib -L${OPENSSL_DIR} -lcrypto ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS} ${BUILD_LDFLAGS}
 ifeq (${V},0)
   Q := @
@@ -47,7 +47,7 @@ else
   Q :=
 endif
 -INCLUDE_PATHS := -I../../include/tools_share  -I${OPENSSL_DIR}/include
 +INCLUDE_PATHS := -I../../include/tools_share  -I${OPENSSL_DIR}/include ${BUILD_CFLAGS} ${BUILD_CFLAGS} ${BUILD_CFLAGS} ${BUILD_CFLAGS} ${BUILD_CFLAGS} ${BUILD_CFLAGS}
 HOSTCC ?= gcc
@@ -0,0 +1,32 @@
 From d70a07562d3b0a7b4441922fd3ce136565927d04 Mon Sep 17 00:00:00 2001
 From: Emekcan Aras <Emekcan.Aras@arm.com>
 Date: Wed, 21 Feb 2024 07:57:36 +0000
 Subject: [PATCH] fix(corstone1000): pass spsr value explicitly
 Passes spsr value for BL32 (OPTEE) explicitly between different boot
 stages.
 Upstream-Status: Pending
 Signed-off-by: Emekcan Aras <Emekcan.Aras@arm.com>
 ---
 .../corstone1000/common/corstone1000_bl2_mem_params_desc.c     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c b/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c
 index fe521a9fa..2cc096f38 100644
 --- a/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c
 +++ b/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c
@@ -72,7 +72,8 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = {
 		SET_STATIC_PARAM_HEAD(ep_info, PARAM_EP,
 			VERSION_2, entry_point_info_t, NON_SECURE | EXECUTABLE),
 		.ep_info.pc = BL33_BASE,
 -
 +		.ep_info.spsr = SPSR_64(MODE_EL2, MODE_SP_ELX,
 +				       DISABLE_ALL_EXCEPTIONS),
 		SET_STATIC_PARAM_HEAD(image_info, PARAM_EP,
 			VERSION_2, image_info_t, 0),
 		.image_info.image_base = BL33_BASE,
 -- 
 2.25.1
--- a/Show More
+++ b/Show More