diff options
Diffstat (limited to 'meta-arm/ci')
-rw-r--r-- | meta-arm/ci/corstone1000-common.yml | 32 | ||||
-rw-r--r-- | meta-arm/ci/corstone1000-firmware-only.yml | 25 | ||||
-rw-r--r-- | meta-arm/ci/corstone1000-fvp.yml | 5 |
3 files changed, 44 insertions, 18 deletions
diff --git a/meta-arm/ci/corstone1000-common.yml b/meta-arm/ci/corstone1000-common.yml index 5720b783d2..4c71517651 100644 --- a/meta-arm/ci/corstone1000-common.yml +++ b/meta-arm/ci/corstone1000-common.yml @@ -9,34 +9,40 @@ 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" + CORE_IMAGE_EXTRA_INSTALL += "optee-client" # TS PSA API tests commands for crypto, its, ps and iat - IMAGE_INSTALL += "packagegroup-ts-tests-psa" + CORE_IMAGE_EXTRA_INSTALL += "packagegroup-ts-tests-psa" target: - - corstone1000-flash-firmware-image + - core-image-minimal - perf diff --git a/meta-arm/ci/corstone1000-firmware-only.yml b/meta-arm/ci/corstone1000-firmware-only.yml new file mode 100644 index 0000000000..9cc4299a8e --- /dev/null +++ b/meta-arm/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/ci/corstone1000-fvp.yml b/meta-arm/ci/corstone1000-fvp.yml index 25f8edf880..c4e5737947 100644 --- a/meta-arm/ci/corstone1000-fvp.yml +++ b/meta-arm/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 |