Skip to contentSkip to conversation

arm-bsp/fvp: move the fvp include file to the include directory

PATCH Applied Jon Mason 2 participants 3 messages Oct 3, 2022

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

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

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

---
 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%)
meta-arm-bsp/conf/machine/fvp-base-arm32.conf +1 -1
index 7343aed6..d3452b74 100644
@@ -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
meta-arm-bsp/conf/machine/fvp-base.conf +1 -1
index 04ec1120..320e22ce 100644
@@ -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"
meta-arm-bsp/conf/machine/include/fvp-common.inc renamed from meta-arm-bsp/conf/machine/fvp-common.inc +0 -0
similarity index 100%
rename from meta-arm-bsp/conf/machine/fvp-common.inc
rename to meta-arm-bsp/conf/machine/include/fvp-common.inc
Signature · 1 line
2.17.1
author
#1 lore raw

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

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.

---
 ci/base.yml      | 6 ------
 ci/testimage.yml | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
ci/base.yml +0 -6
index eff466ed..3f644c1e 100644
@@ -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
 
ci/testimage.yml +6 -0
index a26dcaf9..d7de7d06 100644
@@ -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"
Signature · 1 line
2.17.1
Applied
#2 lore raw
In reply to Jon Mason
Quoted 2 lines · Jon Mason

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,

Signature · 1 line
Jon Mason <[email protected]>