3 files changed, 6 insertions, 47 deletions
diff --git a/meta-arm/kas/corstone1000-base.yml b/meta-arm/kas/corstone1000-base.yml
index 85706dc0f4..161312fbcc 100644
--- a/meta-arm/kas/corstone1000-base.yml
+++ b/meta-arm/kas/corstone1000-base.yml
@@ -1,6 +1,9 @@
 header:
   version: 11
 
+env:
+  DISPLAY: ""
+
 distro: poky-tiny
 
 defaults:
diff --git a/meta-arm/kas/corstone500.yml b/meta-arm/kas/corstone500.yml
deleted file mode 100644
index d40b59df3a..0000000000
--- a/meta-arm/kas/corstone500.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-header:
-  version: 11
-  includes:
-    - kas/fvp-eula.yml
-
-distro: poky-tiny
-
-defaults:
-  repos:
-    refspec: master
-
-repos:
-  meta-arm:
-    layers:
-      meta-arm:
-      meta-arm-bsp:
-      meta-arm-toolchain:
-
-  poky:
-    url: https://git.yoctoproject.org/git/poky
-    refspec: master
-    layers:
-      meta:
-      meta-poky:
-      meta-yocto-bsp:
-
-  meta-openembedded:
-    url: https://git.openembedded.org/meta-openembedded
-    refspec: master
-    layers:
-      meta-oe:
-      meta-python:
-
-local_conf_header:
-  base: |
-    CONF_VERSION = "2"
-    PACKAGE_CLASSES = "package_ipk"
-    BB_NUMBER_THREADS ?= "16"
-    PARALLEL_MAKE ?= "-j16"
-    PACKAGECONFIG:append:pn-perf = " coresight"
-  fvp-config: |
-    IMAGE_CLASSES:append = " ${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'fvpboot', '', d)}"
-
-machine: corstone500
-
-target:
-  - core-image-minimal
diff --git a/meta-arm/kas/fvp-baser-aemv8r64-bsp.yml b/meta-arm/kas/fvp-baser-aemv8r64-bsp.yml
index 9f16a3f959..366ab87eb7 100644
--- a/meta-arm/kas/fvp-baser-aemv8r64-bsp.yml
+++ b/meta-arm/kas/fvp-baser-aemv8r64-bsp.yml
@@ -3,6 +3,9 @@ header:
   includes:
     - kas/fvp-eula.yml
 
+env:
+  DISPLAY: ""
+
 distro: poky
 machine: fvp-baser-aemv8r64