CI: pin to kas 3.2 as 3.2.1 fails

For some reason the kas 3.2.1 container fails: No such file or directory: '/builds/engineering/yocto/meta-arm/ci/ci/base.yml' Note the repeated /ci/, which is wrong. Pin the kas container to 3.2 for now until this is resolved. Signed-off-by: Ross Burton <ross.burton@arm.com>
arm-bsp/juno: move to compressed initramfs image
2026-07-18 16:37:08 +00:00 · 2023-02-19 11:46:23 -05:00 · 2023-01-18 12:43:20 -05:00 · 2022-08-04 14:08:22 -04:00 · 2022-07-11 11:15:11 -04:00 · 2022-07-02 15:17:07 -04:00
8 changed files with 41 additions and 10 deletions
@@ -1,4 +1,4 @@
-image: ghcr.io/siemens/kas/kas:latest-release
+image: ghcr.io/siemens/kas/kas:3.2

  # First do a common bootstrap, and then build all the targets
 stages:
@@ -10,10 +10,10 @@ require conf/machine/include/arm/arch-armv8a.inc

 MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth optee pci"

-KERNEL_IMAGETYPE = "Image"
+KERNEL_IMAGETYPE = "Image.gz"
 KERNEL_DEVICETREE = "arm/juno.dtb arm/juno-r1.dtb arm/juno-r2.dtb"

-IMAGE_FSTYPES += "tar.bz2 ext4"
+IMAGE_FSTYPES += "tar.bz2 ext4 cpio.gz"

 SERIAL_CONSOLES = "115200;ttyAMA0"

@@ -28,3 +28,6 @@ EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno"

 # Juno u-boot configuration
 UBOOT_MACHINE = "vexpress_aemv8a_juno_defconfig"
+
+INITRAMFS_IMAGE_BUNDLE ?= "1"
+INITRAMFS_IMAGE = "core-image-minimal"
@@ -62,7 +62,7 @@ do_deploy() {
    done

    if [ "${INITRAMFS_IMAGE_BUNDLE}" -eq 1 ]; then
-        cp -L -f ${DEPLOY_DIR_IMAGE}/Image-initramfs-juno.bin \
+        cp -L -f ${DEPLOY_DIR_IMAGE}/Image.gz-initramfs-juno.bin \
            ${D}/${UNPACK_DIR}/SOFTWARE/Image
    else
        cp -L -f ${DEPLOY_DIR_IMAGE}/Image ${D}/${UNPACK_DIR}/SOFTWARE/
@@ -0,0 +1,27 @@
+From 097a43223da4fa42335944295903ede2755e2dfd Mon Sep 17 00:00:00 2001
+From: Jon Mason <jdmason@kudzu.us>
+Date: Mon, 19 Dec 2022 11:36:04 -0500
+Subject: [PATCH] configs: vexpress: modify to boot compressed initramfs
+
+Signed-off-by: Jon Mason <jdmason@kudzu.us>
+Upstream-Status: Inappropriate
+---
+ include/configs/vexpress_aemv8a.h       | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8a.h
+index cd7f6c1b9ba0..c2f5eb302076 100644
+--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
+@@ -164,6 +164,8 @@
+ 				"kernel_name=norkern\0"	\
+ 				"kernel_alt_name=Image\0"	\
+ 				"kernel_addr_r=0x80080000\0" \
+				"kernel_comp_addr_r=0x90000000\0" \
+				"kernel_comp_size=0x3000000\0" \
+ 				"initrd_name=ramdisk.img\0"	\
+ 				"initrd_addr_r=0x88000000\0"	\
+ 				"fdtfile=board.dtb\0" \
+-- 
+2.30.2
+
@@ -13,4 +13,7 @@ SRC_URI_append_corstone500 = " \
 #
 # Juno KMACHINE
 #
-SRC_URI_append_juno = " file://u-boot_vexpress_uenv.patch"
+SRC_URI_append_juno = " \
+    file://u-boot_vexpress_uenv.patch \
+    file://0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch \
+    "
@@ -14,8 +14,5 @@ LICENSE_PATH += "${LAYERDIR}/custom-licenses"
 LAYERDEPENDS_arm-toolchain = "core"
 LAYERSERIES_COMPAT_arm-toolchain = "hardknott"

-# do not error out on bbappends for missing recipes
-BB_DANGLINGAPPENDS_WARNONLY = "true"
-
 # These variables are used for armcompiler license
 BB_HASHBASE_WHITELIST_append = " ARM_TOOL_VARIANT ARMLMD_LICENSE_FILE LM_LICENSE_FILE"
@@ -56,8 +56,7 @@ LIC_FILES_CHKSUM_append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILE
 SRCREV_FORMAT_append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}"

 SRC_URI_append = " \
-    file://0002-pmf.h-made-PMF_STOTE_ENABLE-pass-Wtautological.patch  \
-    file://0003-xlat-tables-v2-remove-tautological-assert.patch \
+    file://0002-pmf.h-made-PMF_STOTE_ENABLE-pass-Wtautological.patch \
    "

 # U-boot support (set TFA_UBOOT to 1 to activate)
@@ -13,3 +13,5 @@ SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht
 SRCREV_mbedtls = "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8"

 LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRC_URI_append = " file://0003-xlat-tables-v2-remove-tautological-assert.patch"
Author	SHA1	Message	Date
Ross Burton	81ed80b573	CI: pin to kas 3.2 as 3.2.1 fails For some reason the kas 3.2.1 container fails: No such file or directory: '/builds/engineering/yocto/meta-arm/ci/ci/base.yml' Note the repeated /ci/, which is wrong. Pin the kas container to 3.2 for now until this is resolved. Signed-off-by: Ross Burton <ross.burton@arm.com>	2023-02-19 11:46:23 -05:00
Jon Mason	d7bd5a0518	arm-bsp/juno: move to compressed initramfs image Change u-boot and machine config to default to booting a compressed initramfs. This allows for easier testing. A compressed image is needed as the image is too big for the storage, and the error notifying of such is vague. Signed-off-by: Jon Mason <jon.mason@arm.com>	2023-01-18 12:43:20 -05:00
Ross Burton	8961c3e10a	arm-toolchain/layer.conf: remove BB_DANGLINGAPPENDS_WARNONLY This appears to be historical from when the toolchain was in meta-linaro. It isn't needed anymore, there's one bbappend in meta-arm-toolchain for grub which is part of oe-core, so will never be dangling. This variable has a global effect, so leaving it in here has a negative impact on users. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>	2022-08-04 14:08:22 -04:00
Jon Mason	1f815d6e9a	arm/trusted-firmware-a: Fix v2.4 recipe The previous patch didn't have the necessary space when doing an append. Luckily, the include file append before this one had an extra space. Signed-off-by: Jon Mason <jon.mason@arm.com>	2022-07-11 11:15:11 -04:00
Jon Mason	b1e01a2ced	arm/trusted-firmware-a: Fix v1.5 recipe 0003-xlat-tables-v2-remove-tautological-assert.patch does not apply on the TF-A v1.5 sources. Move that file append to the v2.4 recipe so that it will not attempt to apply for v1.5. Signed-off-by: Jon Mason <jon.mason@arm.com>	2022-07-02 15:17:07 -04:00