5 files changed, 24 insertions, 7 deletions
diff --git a/meta-arm/kas/arm-systemready-linux-distros-fedora.yml b/meta-arm/kas/arm-systemready-linux-distros-fedora.yml
new file mode 100644
index 0000000000..b2b23d7853
--- /dev/null
+++ b/meta-arm/kas/arm-systemready-linux-distros-fedora.yml
@@ -0,0 +1,7 @@
+header:
+  version: 16
+  includes:
+    - kas/arm-systemready-firmware.yml
+
+target:
+  - arm-systemready-linux-distros-fedora
diff --git a/meta-arm/kas/corstone1000-base.yml b/meta-arm/kas/corstone1000-base.yml
index a8b986030b..33f64f11f2 100644
--- a/meta-arm/kas/corstone1000-base.yml
+++ b/meta-arm/kas/corstone1000-base.yml
@@ -5,7 +5,7 @@ distro: poky
 
 defaults:
   repos:
-    branch: master
+    branch: scarthgap
 
 repos:
   meta-arm:
@@ -16,14 +16,14 @@ repos:
 
   poky:
     url: https://git.yoctoproject.org/git/poky
-    # commit: 2e9c2a2381105f1306bcbcb54816cbc5d8110eff
+    commit: c5df9c829a549ca002c36afd6bdf23639831502e
     layers:
       meta:
       meta-poky:
 
   meta-openembedded:
     url: https://git.openembedded.org/meta-openembedded
-    # commit: 1750c66ae8e4268c472c0b2b94748a59d6ef866d
+    commit: 6de0ab744341ad61b0661aa28d78dc6767ce0786
     layers:
       meta-oe:
       meta-python:
@@ -31,7 +31,7 @@ repos:
 
   meta-secure-core:
     url: https://github.com/wind-river/meta-secure-core.git
-    # commit: e29165a1031dcf601edbed1733cedd64826672a5
+    commit: 13cb4867fb1245581c80da3b94b72c4b4f15d67e
     layers:
       meta-secure-core-common:
       meta-signing-key:
diff --git a/meta-arm/kas/corstone1000-firmware-only.yml b/meta-arm/kas/corstone1000-firmware-only.yml
index f16403676c..6192a40872 100644
--- a/meta-arm/kas/corstone1000-firmware-only.yml
+++ b/meta-arm/kas/corstone1000-firmware-only.yml
@@ -4,6 +4,8 @@ header:
 
 local_conf_header:
   firmwarebuild: |
+    BBMULTICONFIG:remove = "firmware"
+
     # Need to ensure the rescue linux options are selected
     OVERRIDES .= ":firmware"
 
diff --git a/meta-arm/kas/corstone1000-fvp.yml b/meta-arm/kas/corstone1000-fvp.yml
index 0d6d5feeed..527fd1d804 100644
--- a/meta-arm/kas/corstone1000-fvp.yml
+++ b/meta-arm/kas/corstone1000-fvp.yml
@@ -13,7 +13,6 @@ env:
 
 local_conf_header:
   testimagefvp: |
-    LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA"
     IMAGE_CLASSES += "fvpboot"
 
   mass-storage: |
diff --git a/meta-arm/kas/corstone1000-image-configuration.yml b/meta-arm/kas/corstone1000-image-configuration.yml
index 2b2852230b..4c3172a5a9 100644
--- a/meta-arm/kas/corstone1000-image-configuration.yml
+++ b/meta-arm/kas/corstone1000-image-configuration.yml
@@ -15,8 +15,8 @@ local_conf_header:
   initramfsetup: |
     # Telling the build system which image is responsible of the generation of the initramfs rootfs
     INITRAMFS_IMAGE_BUNDLE:firmware = "1"
-    INITRAMFS_IMAGE:firmware ?= "core-image-minimal"
-    IMAGE_FSTYPES:firmware:pn-core-image-minimal = "${INITRAMFS_FSTYPES}"
+    INITRAMFS_IMAGE:firmware ?= "corstone1000-recovery-image"
+    IMAGE_FSTYPES:firmware:pn-corstone1000-recovery-image = "${INITRAMFS_FSTYPES}"
     IMAGE_NAME_SUFFIX:firmware = ""
 
     # enable mdev/busybox for init
@@ -38,3 +38,12 @@ local_conf_header:
 
     # 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}"