From patchwork Tue Feb 20 15:47:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: drew.reed@arm.com X-Patchwork-Id: 39814 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C990C5475B for ; Tue, 20 Feb 2024 15:47:56 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16434.1708444070444095438 for ; Tue, 20 Feb 2024 07:47:50 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: drew.reed@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2519A1007; Tue, 20 Feb 2024 07:48:29 -0800 (PST) Received: from C02DP1BVML7H.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 61F173F73F; Tue, 20 Feb 2024 07:47:49 -0800 (PST) From: drew.reed@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Drew Reed Subject: [PATCH 1/4] meta-arm: Support firmware building under a multiconfig Date: Tue, 20 Feb 2024 15:47:38 +0000 Message-ID: <20240220154741.66754-2-drew.reed@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220154741.66754-1-drew.reed@arm.com> References: <20240220154741.66754-1-drew.reed@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 20 Feb 2024 15:47:56 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5388 From: Drew Reed To enable building rescue or bootstrap images that can be included into firmware a "firmware" multiconfig option is required to allow the building with different options to any mass storage image they may also be built. As this multiconfig build will occur under a different TMPDIR, we also provide a deployment image to allow easy copying of the firmware into another deploy dir. Signed-off-by: Drew Reed --- meta-arm/conf/multiconfig/firmware.conf | 13 ++++++++ .../images/firmware-deploy-image.bb | 31 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 meta-arm/conf/multiconfig/firmware.conf create mode 100644 meta-arm/recipes-bsp/images/firmware-deploy-image.bb diff --git a/meta-arm/conf/multiconfig/firmware.conf b/meta-arm/conf/multiconfig/firmware.conf new file mode 100644 index 00000000..95de4d24 --- /dev/null +++ b/meta-arm/conf/multiconfig/firmware.conf @@ -0,0 +1,13 @@ +# Config that can be used to build firmware in a seperate tmp area +# and with a smaller libc enabled by default + +DISTROOVERRIDES = "firmware" + +TMPDIR:append = "_${MACHINE}" +TCLIBC="musl" + +# Ignore the testimage flags to include ssh-server-dropbear +IMAGE_CLASSES:remove = "testimage" +IMAGE_FEATURES:remove = "ssh-server-dropbear" +CORE_IMAGE_EXTRA_INSTALL:remove = "ssh-pregen-hostkeys" +TESTIMAGE_AUTO = "0" diff --git a/meta-arm/recipes-bsp/images/firmware-deploy-image.bb b/meta-arm/recipes-bsp/images/firmware-deploy-image.bb new file mode 100644 index 00000000..76c82738 --- /dev/null +++ b/meta-arm/recipes-bsp/images/firmware-deploy-image.bb @@ -0,0 +1,31 @@ +SUMMARY = "Firmware image deploying multi-config firmware" +DESCRIPTION = "Image for deploying a firmware set on platforms using multi-config" +LICENSE = "MIT" + +inherit deploy nopackages + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE ?= "invalid" +do_configure[noexec] = "1" +do_compile[noexec] = "1" +do_install[noexec] = "1" + +# Users of this recipe are expected to provide the list of firmware images +# that need to be deployed by setting this variable. +FIRMWARE_BINARIES ?= "" + +do_deploy() { + firmware_loc="${TMPDIR}_${MACHINE}/deploy/images/${MACHINE}" + for firmware in ${FIRMWARE_BINARIES}; do + echo "cp -av ${firmware_loc}/${firmware} ${DEPLOYDIR}/" + cp -av "${firmware_loc}/${firmware}" ${DEPLOYDIR}/ + if [ -L "${firmware_loc}/${firmware}" ]; then + echo "cp -av ${firmware_loc}/$(readlink ${firmware_loc}/${firmware}) ${DEPLOYDIR}/" + cp -av "${firmware_loc}/$(readlink ${firmware_loc}/${firmware})" ${DEPLOYDIR}/ + fi + done +} + +do_deploy[umask] = "022" + +addtask deploy after do_prepare_recipe_sysroot From patchwork Tue Feb 20 15:47:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: drew.reed@arm.com X-Patchwork-Id: 39816 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88D8DC54788 for ; Tue, 20 Feb 2024 15:47:56 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16436.1708444071597374956 for ; Tue, 20 Feb 2024 07:47:51 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: drew.reed@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4BC58FEC; Tue, 20 Feb 2024 07:48:30 -0800 (PST) Received: from C02DP1BVML7H.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5BEC83F73F; Tue, 20 Feb 2024 07:47:50 -0800 (PST) From: drew.reed@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Drew Reed Subject: [PATCH 2/4] bsp,ci: Build Corstone-1000 firmware under multiconfig Date: Tue, 20 Feb 2024 15:47:39 +0000 Message-ID: <20240220154741.66754-3-drew.reed@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220154741.66754-1-drew.reed@arm.com> References: <20240220154741.66754-1-drew.reed@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 20 Feb 2024 15:47:56 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5389 From: Drew Reed By building the Corstone-1000 firmware under the firmware multiconfig we can also build a minimal standard core image to be mounted in the fvp as a mass storage device. To do this we had to enable the MMC card interface in the Corstone-1000 kernel configuration. Signed-off-by: Drew Reed --- ci/corstone1000-common.yml | 28 +++++++++------- ci/corstone1000-fvp.yml | 5 --- .../conf/machine/corstone1000-fvp.conf | 3 +- .../conf/machine/include/corstone1000.inc | 13 ++++++-- .../corstone1000-firmware-deploy-image.inc | 11 +++++++ .../images/firmware-deploy-image.bbappend | 4 +++ .../linux/files/corstone1000/defconfig | 33 +++++++++++++++++++ .../wic/corstone1000-flash-firmware.wks.in | 2 +- meta-arm-bsp/wic/efi-disk-no-swap.wks.in | 10 ++++++ 9 files changed, 89 insertions(+), 20 deletions(-) create mode 100644 meta-arm-bsp/recipes-bsp/images/corstone1000-firmware-deploy-image.inc create mode 100644 meta-arm-bsp/recipes-bsp/images/firmware-deploy-image.bbappend create mode 100644 meta-arm-bsp/wic/efi-disk-no-swap.wks.in diff --git a/ci/corstone1000-common.yml b/ci/corstone1000-common.yml index 5720b783..50327694 100644 --- a/ci/corstone1000-common.yml +++ b/ci/corstone1000-common.yml @@ -9,27 +9,33 @@ local_conf_header: extrapackages: | # Intentionally blank to prevent perf from being added to the image in base.yml + firmwarebuild: | + # Only needed as kas doesn't add it automatically unless you have 2 targets in seperate configs + BBMULTICONFIG ?= "firmware" + distrosetup: | DISTRO_FEATURES = "usbhost ipv4" initramfsetup: | # Telling the build system which image is responsible of the generation of the initramfs rootfs - INITRAMFS_IMAGE_BUNDLE = "1" - INITRAMFS_IMAGE ?= "core-image-minimal" - IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" - IMAGE_NAME_SUFFIX = "" + INITRAMFS_IMAGE_BUNDLE:firmware = "1" + INITRAMFS_IMAGE:firmware ?= "core-image-minimal" + IMAGE_FSTYPES:firmware:pn-core-image-minimal = "${INITRAMFS_FSTYPES}" + IMAGE_NAME_SUFFIX:firmware = "" # enable mdev/busybox for init - INIT_MANAGER = "mdev-busybox" - VIRTUAL-RUNTIME_init_manager = "busybox" + INIT_MANAGER:firmware = "mdev-busybox" + VIRTUAL-RUNTIME_init_manager:firmware = "busybox" # prevent the kernel image from being included in the intramfs rootfs - PACKAGE_EXCLUDE += "kernel-image-*" - # Don't include kernel binary in rootfs /boot path - RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" + PACKAGE_EXCLUDE:firmware += "kernel-image-*" # Disable openssl in kmod to shrink the initramfs size - PACKAGECONFIG:remove:pn-kmod = "openssl" + PACKAGECONFIG:remove:firmware:pn-kmod = "openssl" + + imageextras: | + # Don't include kernel binary in rootfs /boot path + RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" # all optee packages IMAGE_INSTALL += "optee-client" @@ -38,5 +44,5 @@ local_conf_header: IMAGE_INSTALL += "packagegroup-ts-tests-psa" target: - - corstone1000-flash-firmware-image + - core-image-minimal - perf diff --git a/ci/corstone1000-fvp.yml b/ci/corstone1000-fvp.yml index 25f8edf8..c4e57379 100644 --- a/ci/corstone1000-fvp.yml +++ b/ci/corstone1000-fvp.yml @@ -4,9 +4,4 @@ header: - ci/corstone1000-common.yml - ci/fvp.yml -local_conf_header: - fvp-config: | - # Remove Dropbear SSH as it will not fit into the corstone1000 image. - IMAGE_FEATURES:remove = " ssh-server-dropbear" - machine: corstone1000-fvp diff --git a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf index 9c070b3d..b15c0faa 100644 --- a/meta-arm-bsp/conf/machine/corstone1000-fvp.conf +++ b/meta-arm-bsp/conf/machine/corstone1000-fvp.conf @@ -35,7 +35,7 @@ FVP_CONFIG[se.nvm.update_raw_image] ?= "0" FVP_CONFIG[se.cryptocell.USER_OTP_FILTERING_DISABLE] ?= "1" # Boot image -FVP_DATA ?= "board.flash0=${IMAGE_NAME}.wic@0x68000000" +FVP_DATA ?= "board.flash0=corstone1000-flash-firmware-image-${MACHINE}.wic@0x68000000" # External system (cortex-M3) FVP_CONFIG[extsys_harness0.extsys_flashloader.fname] ?= "es_flashfw.bin" @@ -53,6 +53,7 @@ FVP_CONFIG[board.msd_mmc.diagnostics] ?= "2" FVP_CONFIG[board.msd_mmc.p_max_block_count] ?= "0xFFFF" FVP_CONFIG[board.msd_config.pl180_fifo_depth] ?= "16" FVP_CONFIG[board.msd_mmc.support_unpadded_images] ?= "true" +FVP_CONFIG[board.msd_mmc.p_mmc_file] ?= "${IMAGE_NAME}.wic" # MMC2 card configuration FVP_CONFIG[board.msd_mmc_2.card_type] ?= "SDHC" diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 373dd04c..a88f19c4 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -35,7 +35,8 @@ IMAGE_CMD:wic[vardeps] += "GRUB_LINUX_APPEND" # Linux kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto ?= "6.6.%" -KERNEL_IMAGETYPE = "Image.gz" +KERNEL_IMAGETYPE = "Image" +KERNEL_IMAGETYPE:firmware = "Image.gz" # add FF-A support in the kernel MACHINE_FEATURES += "arm-ffa" # enable this feature for kernel debugging @@ -44,7 +45,15 @@ MACHINE_FEATURES += "arm-ffa" # login terminal serial port settings SERIAL_CONSOLES ?= "115200;ttyAMA0" -WKS_FILE ?= "corstone1000-flash-firmware.wks.in" +IMAGE_FSTYPES += "wic" +# Need to clear the suffix so TESTIMAGE_AUTO works +IMAGE_NAME_SUFFIX = "" +WKS_FILE ?= "efi-disk-no-swap.wks.in" +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)}" diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-firmware-deploy-image.inc b/meta-arm-bsp/recipes-bsp/images/corstone1000-firmware-deploy-image.inc new file mode 100644 index 00000000..2d192745 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/images/corstone1000-firmware-deploy-image.inc @@ -0,0 +1,11 @@ +COMPATIBLE_MACHINE = "corstone1000" + +FIRMWARE_BINARIES = "corstone1000-flash-firmware-image-${MACHINE}.wic \ + bl1.bin \ + es_flashfw.bin \ + corstone1000-flash-firmware-image-${MACHINE}.wic.uefi.capsule \ + corstone1000_capsule_cert.crt \ + corstone1000_capsule_key.key \ + " + +do_deploy[mcdepends] = "mc::firmware:corstone1000-flash-firmware-image:do_image_complete" diff --git a/meta-arm-bsp/recipes-bsp/images/firmware-deploy-image.bbappend b/meta-arm-bsp/recipes-bsp/images/firmware-deploy-image.bbappend new file mode 100644 index 00000000..888db54c --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/images/firmware-deploy-image.bbappend @@ -0,0 +1,4 @@ +MACHINE_DEPLOY_FIRMWARE_REQUIRE ?= "" +MACHINE_DEPLOY_FIRMWARE_REQUIRE:corstone1000 = "corstone1000-firmware-deploy-image.inc" + +require ${MACHINE_DEPLOY_FIRMWARE_REQUIRE} diff --git a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/defconfig b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/defconfig index 8abcaed4..d67e9484 100644 --- a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/defconfig +++ b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/defconfig @@ -89,3 +89,36 @@ CONFIG_LIBCRC32C=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_DEBUG_FS=y CONFIG_PANIC_TIMEOUT=5 +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=y +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_GPIO is not set +# CONFIG_REGULATOR_VCTRL is not set +# CONFIG_REGULATOR_VEXPRESS is not set +CONFIG_MMC=y +# CONFIG_PWRSEQ_EMMC is not set +CONFIG_PWRSEQ_SIMPLE=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=8 +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_ARMMMCI=y +# CONFIG_MMC_STM32_SDMMC is not set +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_DW is not set +# CONFIG_MMC_VUB300 is not set +# CONFIG_MMC_USHC is not set +# CONFIG_MMC_USDHI6ROL0 is not set +# CONFIG_MMC_CQHCI is not set +# CONFIG_MMC_HSQ is not set +# CONFIG_MMC_MTK is not set +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +CONFIG_EXT3_FS=y +CONFIG_EXT4_FS=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set diff --git a/meta-arm-bsp/wic/corstone1000-flash-firmware.wks.in b/meta-arm-bsp/wic/corstone1000-flash-firmware.wks.in index 71ab20f2..88559dee 100644 --- a/meta-arm-bsp/wic/corstone1000-flash-firmware.wks.in +++ b/meta-arm-bsp/wic/corstone1000-flash-firmware.wks.in @@ -1,4 +1,4 @@ -# WIC partitioning for corstone1000 +# WIC partitioning for corstone1000 internal flash # Layout and maximum sizes (to be defined): # diff --git a/meta-arm-bsp/wic/efi-disk-no-swap.wks.in b/meta-arm-bsp/wic/efi-disk-no-swap.wks.in new file mode 100644 index 00000000..61902dfd --- /dev/null +++ b/meta-arm-bsp/wic/efi-disk-no-swap.wks.in @@ -0,0 +1,10 @@ +# short-description: Create an EFI disk image without a swap partition +# long-description: Creates a partitioned EFI disk image that the user +# can directly dd to boot media. This image will not contain a swap +# partition but will contain custom machine specific grub arguments. + +part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --label boot --active --align 1024 --use-uuid + +part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid + +bootloader --ptable gpt --timeout=1 --append="${GRUB_LINUX_APPEND}" From patchwork Tue Feb 20 15:47:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: drew.reed@arm.com X-Patchwork-Id: 39815 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94018C5478B for ; Tue, 20 Feb 2024 15:47:56 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.16338.1708444072553726682 for ; Tue, 20 Feb 2024 07:47:52 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: drew.reed@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 46ABE1007; Tue, 20 Feb 2024 07:48:31 -0800 (PST) Received: from C02DP1BVML7H.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 833F53F73F; Tue, 20 Feb 2024 07:47:51 -0800 (PST) From: drew.reed@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Drew Reed Subject: [PATCH 3/4] bsp: Restore the ability to build firmware only Date: Tue, 20 Feb 2024 15:47:40 +0000 Message-ID: <20240220154741.66754-4-drew.reed@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220154741.66754-1-drew.reed@arm.com> References: <20240220154741.66754-1-drew.reed@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 20 Feb 2024 15:47:56 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5390 From: Drew Reed 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 --- 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 --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}" From patchwork Tue Feb 20 15:47:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: drew.reed@arm.com X-Patchwork-Id: 39813 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 608A0C54787 for ; Tue, 20 Feb 2024 15:47:56 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.16340.1708444073580574667 for ; Tue, 20 Feb 2024 07:47:53 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: drew.reed@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 40D55FEC; Tue, 20 Feb 2024 07:48:32 -0800 (PST) Received: from C02DP1BVML7H.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7E8BD3F73F; Tue, 20 Feb 2024 07:47:52 -0800 (PST) From: drew.reed@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Drew Reed Subject: [PATCH 4/4] ci: Add back testing of firmware only builds Date: Tue, 20 Feb 2024 15:47:41 +0000 Message-ID: <20240220154741.66754-5-drew.reed@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220154741.66754-1-drew.reed@arm.com> References: <20240220154741.66754-1-drew.reed@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 20 Feb 2024 15:47:56 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5391 From: Drew Reed Signed-off-by: Drew Reed --- .gitlab-ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1b8dd24..15cf4ecd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,14 +123,18 @@ corstone1000-fvp: extends: .build parallel: matrix: - - TESTING: [testimage, tftf] + - FIRMWARE: corstone1000-firmware-only + TESTING: [testimage, tftf] + - FIRMWARE: none + TESTING: testimage corstone1000-mps3: extends: .build parallel: matrix: - - TESTING: [none, tftf] - + - FIRMWARE: corstone1000-firmware-only + TESTING: [none, tftf] + - FIRMWARE: none fvp-base: extends: .build