diff mbox series

[3/4] bsp: Restore the ability to build firmware only

Message ID 20240220154741.66754-4-drew.reed@arm.com
State New
Headers show
Series Enable Corstone-1000 multiconfig builds | expand

Commit Message

drew.reed@arm.com Feb. 20, 2024, 3:47 p.m. UTC 
From: Drew Reed <Drew.Reed@arm.com>

To allow us to continue to ship Corstone-1000 releases that only include
the firmware with the built in Linux image we need a way to build it
outside of the multiconfig builds.

Signed-off-by: Drew Reed <Drew.Reed@arm.com>
---
 ci/corstone1000-firmware-only.yml             | 25 +++++++++++++++++++
 .../conf/machine/include/corstone1000.inc     |  7 +++---
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 ci/corstone1000-firmware-only.yml
diff mbox series

Patch

diff --git a/ci/corstone1000-firmware-only.yml b/ci/corstone1000-firmware-only.yml
new file mode 100644
index 00000000..9cc4299a
--- /dev/null
+++ b/ci/corstone1000-firmware-only.yml
@@ -0,0 +1,25 @@ 
+---
+header:
+  version: 14
+
+local_conf_header:
+  rescuebuild: |
+    # Need to ensure the rescue linux options are selected
+    OVERRIDES .= ":firmware"
+
+    # Need to ensure we build with a small libc
+    TCLIBC="musl"
+
+  mass-storage: |
+    # Ensure the Mass Storage device is absent
+    FVP_CONFIG[board.msd_mmc.p_mmc_file] = "invalid.dat"
+
+  test-configuration: |
+    TEST_SUITES = "_qemutiny ping"
+    # Remove Dropbear SSH as it will not fit into the corstone1000 image.
+    IMAGE_FEATURES:remove = "ssh-server-dropbear"
+    CORE_IMAGE_EXTRA_INSTALL:remove = "ssh-pregen-hostkeys"
+
+target:
+  - corstone1000-flash-firmware-image
+  - perf
diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc
index a88f19c4..8d793426 100644
--- a/meta-arm-bsp/conf/machine/include/corstone1000.inc
+++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc
@@ -54,6 +54,7 @@  WKS_FILE:firmware ?= "corstone1000-flash-firmware.wks.in"
 # making sure EXTRA_IMAGEDEPENDS will be used while creating the image
 WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
 
-# If not build under the firmware multiconf we need to build the actual firmware
-EXTRA_IMAGEDEPENDS = "${@bb.utils.contains('DISTROOVERRIDES', 'firmware', \
-                        '', 'firmware-deploy-image', d)}"
+# If not building under the firmware multiconf we need to build the actual firmware
+FIRMWARE_DEPLOYEMENT ?= "firmware-deploy-image"
+FIRMWARE_DEPLOYEMENT:firmware ?= ""
+EXTRA_IMAGEDEPENDS += "${FIRMWARE_DEPLOYEMENT}"