Revert "subtree updates"
Needs to go through CI
This reverts commit fc7e7973f3119e2bad511209aa336537dc5ffbed.
diff --git a/meta-arm/ci/corstone500.yml b/meta-arm/ci/corstone500.yml
new file mode 100644
index 0000000..2172bc1
--- /dev/null
+++ b/meta-arm/ci/corstone500.yml
@@ -0,0 +1,12 @@
+header:
+ version: 14
+ includes:
+ - ci/base.yml
+ - ci/fvp.yml
+ - ci/poky-tiny.yml
+
+local_conf_header:
+ fvp-config: |
+ IMAGE_FEATURES:remove = " ssh-server-dropbear"
+
+machine: corstone500
diff --git a/meta-arm/ci/fvps.yml b/meta-arm/ci/fvps.yml
index 1bced29..cf4103e 100644
--- a/meta-arm/ci/fvps.yml
+++ b/meta-arm/ci/fvps.yml
@@ -15,6 +15,7 @@
target:
- nativesdk-fvp-base-a-aem
+ - nativesdk-fvp-corstone500
- nativesdk-fvp-corstone1000
- nativesdk-fvp-n1-edge
- nativesdk-fvp-sgi575
diff --git a/meta-arm/ci/jobs-to-kas b/meta-arm/ci/jobs-to-kas
index eea6e46..b8615a5 100755
--- a/meta-arm/ci/jobs-to-kas
+++ b/meta-arm/ci/jobs-to-kas
@@ -3,7 +3,7 @@
# 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
+# corstone500
# fvp-base: [testimage]
# qemuarm64-secureboot: [clang, glibc, testimage]
#
diff --git a/meta-arm/ci/n1sdp-optee.yml b/meta-arm/ci/n1sdp-optee.yml
deleted file mode 100644
index f2b50ab..0000000
--- a/meta-arm/ci/n1sdp-optee.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-header:
- version: 14
-
-# Config specific for the optee-xtests
-local_conf_header:
- optee-test: |
- # Include ARM FFA
- MACHINE_FEATURES:append = " arm-ffa"
- # Include trusted services
- TEST_SUITES:append = " trusted_services"
- # Include Optee xtests
- IMAGE_INSTALL:append = " optee-test"