[PATCH 1/2] arm-bsp/fvp: move the fvp include file to the include directory

[PATCH 1/2] arm-bsp/fvp: move the fvp include file to the include directory

[Jon Mason]

Move the FVP include file to the include directory, matching what is
done for corstone1000 and other machines in meta-arm-bsp.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm-bsp/conf/machine/fvp-base-arm32.conf          | 2 +-
 meta-arm-bsp/conf/machine/fvp-base.conf                | 2 +-
 meta-arm-bsp/conf/machine/{ => include}/fvp-common.inc | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-arm-bsp/conf/machine/{ => include}/fvp-common.inc (100%)

diff --git a/meta-arm-bsp/conf/machine/fvp-base-arm32.conf b/meta-arm-bsp/conf/machine/fvp-base-arm32.conf
index 7343aed6..d3452b74 100644
--- a/meta-arm-bsp/conf/machine/fvp-base-arm32.conf
+++ b/meta-arm-bsp/conf/machine/fvp-base-arm32.conf
@@ -4,7 +4,7 @@
 #@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/fvp-common.inc
 require conf/machine/include/arm/arch-armv7a.inc
 
 # FVP u-boot configuration
diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
index 04ec1120..320e22ce 100644
--- a/meta-arm-bsp/conf/machine/fvp-base.conf
+++ b/meta-arm-bsp/conf/machine/fvp-base.conf
@@ -4,7 +4,7 @@
 #@NAME: Armv8-A Base Platform FVP machine
 #@DESCRIPTION: Machine configuration for Armv8-A Base Platform FVP model
 
-require conf/machine/fvp-common.inc
+require conf/machine/include/fvp-common.inc
 require conf/machine/include/arm/arch-armv8a.inc
 
 TUNE_FEATURES = "aarch64"
diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/include/fvp-common.inc
similarity index 100%
rename from meta-arm-bsp/conf/machine/fvp-common.inc
rename to meta-arm-bsp/conf/machine/include/fvp-common.inc
-- 
2.17.1

[PATCH 2/2] ci: move features only needed by testimage from base

[Jon Mason]

Move the features uniquely needed for system images to the testimage
file.  This should reduce the image size and amount of things needing to
be built for machines that do not run testimage.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 ci/base.yml      | 6 ------
 ci/testimage.yml | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/base.yml b/ci/base.yml
index eff466ed..3f644c1e 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -38,14 +38,8 @@ local_conf_header:
     PACKAGECONFIG:append:pn-perf = " coresight"
     INHERIT += "rm_work"
     DISTRO_FEATURES:remove = "ptest"
-  kvm: |
-    QEMU_USE_KVM = ""
   perf: |
     CORE_IMAGE_EXTRA_INSTALL += "perf"
-  sshkeys: |
-    CORE_IMAGE_EXTRA_INSTALL += "ssh-pregen-hostkeys"
-  universally_failing_tests: |
-    TEST_SUITES:remove = "opkg"
 
 machine: unset
 
diff --git a/ci/testimage.yml b/ci/testimage.yml
index a26dcaf9..d7de7d06 100644
--- a/ci/testimage.yml
+++ b/ci/testimage.yml
@@ -5,9 +5,15 @@ 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"
-- 
2.17.1

Re: [PATCH 1/2] arm-bsp/fvp: move the fvp include file to the include directory

[Jon Mason]

On Mon, 3 Oct 2022 13:15:59 -0400, Jon Mason wrote:
> Move the FVP include file to the include directory, matching what is
> done for corstone1000 and other machines in meta-arm-bsp.

Applied, thanks!

[1/2] arm-bsp/fvp: move the fvp include file to the include directory
      commit: 6655928c81517513b557dbaee555f564ba21044a
[2/2] ci: move features only needed by testimage from base
      commit: 6983e2a2a99ecc502893526a87ec6b5b9e6380fd

Best regards,
-- 
Jon Mason <jon.mason@arm.com>