Merge pull request #767 from YoeDistro/kraj/master

Add yoe updater support for var-som-mx8 platform and update layers

Author: cbrake

CHANGELOG.md

@@ -28,13 +28,20 @@ and this project adheres to
 - Yoe updater now supports tmpfs as well as persistent overlays
 - Add yoe-installer-image to create SD card installer for eMMC
 - Switch to using ext4.xz for rootfs in updater
+- Update arm optee-os to 3.20.0
+- Upgrade bpftrace to 0.17.0
+- Fix serveral recipes in meta-freesclale to build world
+- Enable parallel execution of ptest images and fix ptest dependencies
+- Handle spaces within user $PATH in SDK installers
+- Upgrade systemd to 253.1
 
 ### Added
 
 - Add kernel specific KERNEL_OBJDUMP variable
 - Add VOLATILE_TMP_DIR variable
 - Add support for visionfive2 board
 - Add recipes - python3-rich, xdg-dbus-proxy, libavif, dav1d
+- Add yoe updater support for MX8-VAR-SOM symphony board
 
 ### Removed
 

sources/meta-arm

@@ -23,6 +23,8 @@ BBFILES_DYNAMIC += " \
     raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bbappend \
     swupdate:${LAYERDIR}/dynamic-layers/swupdate/*/*/*.bb \
     swupdate:${LAYERDIR}/dynamic-layers/swupdate/*/*/*.bbappend \
+    variscite-bsp:${LAYERDIR}/dynamic-layers/variscite-bsp/*/*/*.bb \
+    variscite-bsp:${LAYERDIR}/dynamic-layers/variscite-bsp/*/*/*.bbappend \
     webkit:${LAYERDIR}/dynamic-layers/webkit/*/*/*.bb \
     webkit:${LAYERDIR}/dynamic-layers/webkit/*/*/*.bbappend \
 "

sources/meta-clang

@@ -10,15 +10,19 @@ ACCEPT_FSL_EULA = "1"
 # Rapsberry pi firmware
 LICENSE_FLAGS_ACCEPTED += "\
     "
-IMAGE_FSTYPES:append = " wic.xz wic.bmap tar.xz"
+IMAGE_FSTYPES:append = " wic.xz wic.bmap ext4.xz"
+IMAGE_FSTYPES:remove = "tar.gz wic.bz2 ext4"
 # Yoe Updater Supported Machines ( RPI, beaglebone, C4, SAMA5D27 for now )
-#INITRAMFS_IMAGE_BUNDLE = "1"
-#WKS_FILE = "yoe-sdimage.wks"
+INITRAMFS_IMAGE_BUNDLE = "1"
 # Use yoe-initramfs-image for initramfs
-#INITRAMFS_IMAGE = "yoe-initramfs-image"
+INITRAMFS_IMAGE = "yoe-initramfs-image"
 # Use kernel+initramfs image to boot
-#IMAGE_BOOT_FILES:remove = "${KERNEL_IMAGETYPE}"
-#IMAGE_BOOT_FILES:append = " ${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin;${KERNEL_IMAGETYPE}"
+IMAGE_BOOT_FILES:remove = "${KERNEL_IMAGETYPE}"
+IMAGE_BOOT_FILES:append = " ${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin;${KERNEL_IMAGETYPE}"
+# Use default Device Tree ( LVDS )
+IMAGE_BOOT_FILES:append = " imx8qm-var-som-symphony-lvds.dtb;imx8qm-var-som-symphony.dtb"
+WKS_FILE:yoe = "yoe-imx8-sdimage.wks.in"
+WKS_FILE:yoe:pn-yoe-installer-image = "yoe-imx8-sd-installer.wks.in"
 
 # Needed for Running bitbake -ctestimage <image>
 #TEST_TARGET_IP = "10.0.0.34"

sources/meta-freescale

@@ -0,0 +1,3 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI:append:yoe = " file://0001-imx8qm_var_som-Adjust-for-boot-root-data-paritioning.patch"

sources/meta-intel

@@ -0,0 +1,34 @@
+From ae4bb4e192786f1f25ffa5cdb1cc67dd40987175 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 14 Mar 2023 21:22:03 -0700
+Subject: [PATCH] imx8qm_var_som: Adjust for boot/root/data paritioning scheme
+
+Yoe Distro uses separate parition for boot and rootfs, therefore adjust
+it here in bootloader environment.
+
+Upstream-Status: Inappropriate [Yoe Specific]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ include/configs/imx8qm_var_som.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/configs/imx8qm_var_som.h
++++ b/include/configs/imx8qm_var_som.h
+@@ -93,7 +93,7 @@
+ 	CONFIG_MFG_ENV_SETTINGS \
+ 	M4_BOOT_ENV \
+ 	AHAB_ENV \
+-	"bootdir=/boot\0" \
++	"bootdir=\0" \
+ 	"script=boot.scr\0" \
+ 	"image=Image.gz\0" \
+ 	"panel=VAR-WVGA-LCD\0" \
+@@ -126,7 +126,7 @@
+ 		"bootaux ${m41_addr} 1;\0" \
+ 	"optargs=setenv bootargs ${bootargs} ${kernelargs};\0" \
+ 	"mmcargs=setenv bootargs console=${console},${baudrate} earlycon som_wifi=${som_wifi} " \
+-		"root=/dev/mmcblk${mmcblk}p${mmcpart} rootfstype=ext4 rootwait rw\0 " \
++		"root=/dev/mmcblk${mmcblk}p2 rootfstype=ext4 rootwait rw\0 " \
+ 	"loadbootscript=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bootdir}/${script};\0" \
+ 	"bootscript=echo Running bootscript from mmc ...; " \
+ 		"source\0" \

sources/meta-openembedded

@@ -0,0 +1 @@
+CONFIG_OVERLAY_FS=y

sources/meta-yoe/conf/layer.conf

@@ -0,0 +1,2 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://overlayfs.cfg"

sources/meta-yoe/conf/projects/var-som-mx8/config.conf

@@ -0,0 +1,56 @@
+# We use updater to handle disk/SD management, therefore remove 96boards-tools
+IMAGE_INSTALL:remove = "96boards-tools"
+
+KERNEL_IMAGE = "${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin"
+
+KERNEL_ARTEFACTS = "\
+    ${KERNEL_IMAGETYPE} \
+    imx8qm-var-som-symphony-dp-m4.dtb \
+    imx8qm-var-som-symphony-dp.dtb \
+    imx8qm-var-som-symphony-hdmi-m4.dtb \
+    imx8qm-var-som-symphony-hdmi.dtb \
+    imx8qm-var-som-symphony-lvds.dtb \
+    imx8qm-var-som-symphony-lvds-m4.dtb \
+    "
+DTBO_ARTEFACTS = "\
+    "
+
+ROOTFS_ARTEFACTS = "rootfs.ext4.xz"
+
+BOOTLOADER_ARTEFACTS = "\
+    imx-boot \
+    dpfw.bin \
+    hdmirxfw.bin \
+    hdmitxfw.bin \
+    "
+UPDATE_IMAGES = "version.txt ${BOOTLOADER_ARTEFACTS} ${KERNEL_ARTEFACTS} ${DTBO_ARTEFACTS} ${ROOTFS_ARTEFACTS}"
+
+do_updater() {
+        echo "IMG_VERSION = ${IMG_VERSION}"
+        rm -rf ${TOPDIR}/deploy/${MACHINE}
+        install -d ${TOPDIR}/deploy/${MACHINE}
+        OLDPWD="$PWD"
+        cd ${TOPDIR}/deploy/${MACHINE}
+        echo "${IMG_VERSION}" > version.txt
+        install ${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext4.xz ${ROOTFS_ARTEFACTS}
+        for f in ${KERNEL_ARTEFACTS} ${BOOTLOADER_ARTEFACTS}
+        do
+            install ${DEPLOY_DIR_IMAGE}/$f $f
+        done
+        #default device tree file One of the dtbs from BOOTLOADER_ARTEFACTS here we choose 'lvds' one
+        install imx8qm-var-som-symphony-lvds.dtb imx8qm-var-som-symphony.dtb
+
+        for f in ${DTBO_ARTEFACTS}
+        do
+            install -D ${DEPLOY_DIR_IMAGE}/`basename $f` $f
+        done
+        # Match kernel image with wic
+        rm ${KERNEL_IMAGETYPE}
+        install ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE} ${KERNEL_IMAGETYPE}
+        sha256sum ${UPDATE_IMAGES}  > update.sha256
+        rm -rf ${TOPDIR}/deploy/${UPDATE_IMAGE_NAME}_${IMG_VERSION}.upd
+        ls ${UPDATE_IMAGES_} | cpio -ov -H newc > ${TOPDIR}/deploy/${UPDATE_IMAGE_NAME}_${IMG_VERSION}.upd
+        install ${TOPDIR}/deploy/${UPDATE_IMAGE_NAME}_${IMG_VERSION}.upd ${DEPLOY_DIR_IMAGE}/${UPDATE_IMAGE_NAME}_${IMG_VERSION}.upd
+        cd ${OLDPWD}
+        rm -rf ${TOPDIR}/deploy/${MACHINE}
+}

sources/meta-yoe/dynamic-layers/variscite-bsp/recipes-bsp/u-boot-variscite/u-boot-variscite.bbappend

@@ -0,0 +1 @@
+../updater.installer

sources/meta-yoe/dynamic-layers/variscite-bsp/recipes-bsp/u-boot-variscite/u-boot-variscite/0001-imx8qm_var_som-Adjust-for-boot-root-data-paritioning.patch

@@ -0,0 +1,93 @@
+TITLE="VAR-SOM-MX8 Symphony Board"
+PLAT="imx8qm-var-som"
+UPDATE_FILE_NAME="${PLAT}"
+
+USB_DETECTION_DELAY=4
+
+KERNEL="\
+    Image \
+    imx8qm-var-som-symphony.dtb \
+    imx8qm-var-som-symphony-dp-m4.dtb \
+    imx8qm-var-som-symphony-dp.dtb \
+    imx8qm-var-som-symphony-hdmi-m4.dtb \
+    imx8qm-var-som-symphony-hdmi.dtb \
+    imx8qm-var-som-symphony-lvds.dtb \
+    imx8qm-var-som-symphony-lvds-m4.dtb \
+"
+
+BOOT="\
+    imx-boot \
+    dpfw.bin \
+    hdmirxfw.bin \
+    hdmitxfw.bin \
+"
+
+ROOTFS="rootfs.ext4.xz"
+
+EMMC_DEVICE=/dev/mmcblk0
+SD_DEVICE=/dev/mmcblk1
+
+# Can have "emmc" or "sd", this is the install target media
+STORAGE="sd"
+# Install location is EMMC_DEVICE if STORAGE is 'emmc' and
+# SD_DEVICE if STORAGE is 'sd'
+if [ "$STORAGE" = "emmc" ]; then
+INSTALL_DEVICE=${EMMC_DEVICE}
+else
+INSTALL_DEVICE=${SD_DEVICE}
+fi
+
+INSTALL_BOOT_DEV=${INSTALL_DEVICE}p1
+INSTALL_ROOTFS_DEV=${INSTALL_DEVICE}p2
+INSTALL_DATA_DEV=${INSTALL_DEVICE}p3
+
+EMMC_BOOT_DEV=${EMMC_DEVICE}p1
+EMMC_ROOTFS_DEV=${EMMC_DEVICE}p2
+EMMC_DATA_DEV=${EMMC_DEVICE}p3
+
+SD_BOOT_DEV=${SD_DEVICE}p1
+SD_ROOTFS_DEV=${SD_DEVICE}p2
+SD_DATA_DEV=${SD_DEVICE}p3
+
+BOOT_MOUNT_POINT=/boot
+ROOTFS_MOUNT_POINT=/root
+DATA_MOUNT_POINT=/data
+USB_MOUNT_POINT=/media/usb
+SD_MOUNT_POINT=/media/sd
+
+# Size in 'M' for MB, 'G' for GB
+RESERVED_SIZE=2M
+BOOT_SIZE=100M
+ROOTFS_SIZE=1G
+
+FSTYPE=ext4
+BOOT_FSTYPE=ext4
+
+UPDATER_SPEECH=0
+UPDATER_CAN_PARTITION=1
+
+# Space separated list of dirs to create in /data
+# which is used by volatile-binds during main rootfs boot
+PERSISTENT_BINDS="/etc/ssh"
+
+plat_init() {
+  msg "Running $PLAT initializations ..."
+  cat /proc/cpuinfo | grep Revision | cut -d' ' -f 2 > /etc/hwrevision
+}
+
+plat_bootloader_quirks() {
+  # unlock eMMC boot partitions
+  # see https://www.kernel.org/doc/Documentation/mmc/mmc-dev-parts.txt
+  BOOTDEV=$(basename ${EMMC_DEVICE})
+  if [ -e imx-boot1 ]; then
+    if ! diff imx-boot $BOOT_MOUNT_POINT/imx-boot 2>&1 >/dev/null; then
+      msg_splash "Updating bootloader in eMMC ..."
+      echo 0 > /sys/block/${BOOTDEV}boot0/force_ro
+      dd if=imx-boot of=/dev/${BOOTDEV}boot0 seek=33 bs=1k
+      echo 1 > /sys/block/${BOOTDEV}boot0/force_ro
+      echo 0 > /sys/block/${BOOTDEV}boot1/force_ro
+      dd if=imx-boot of=/dev/${BOOTDEV}boot1 seek=33 bs=1k
+      echo 1 > /sys/block/${BOOTDEV}boot1/force_ro
+    fi
+  fi
+}

sources/meta-yoe/dynamic-layers/variscite-bsp/recipes-kernel/linux/linux-variscite/overlayfs.cfg

@@ -0,0 +1,20 @@
+# short-description: Create SD card image with a boot partition
+# long-description:
+# Create an image that can be written onto a SD card using dd for use
+# with i.MX SoC family
+# It uses u-boot + other binaries gathered together on imx-boot file
+#
+# The disk layout used is:
+#  - ---------- -------------- -------------------
+# | | imx-boot |     installer     |    empty    |
+#  - ---------- ------------------ --------------
+# ^ ^          ^                  ^             ^
+# | |          |                  |             |
+# 0 |        8MiB              1024MiB         1024MiB + IMAGE_EXTRA_SPACE (default 10MiB)
+#   ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual
+#
+part u-boot --source rawcopy --sourceparams="file=imx-boot" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
+# 1G
+part /boot --source bootimg-partition --ondisk mmcblk --fstype=ext4 --label boot --active --align 4096 --size 1024
+
+bootloader --ptable gpt

sources/meta-yoe/dynamic-layers/variscite-bsp/recipes-kernel/linux/linux-variscite_%.bbappend

@@ -0,0 +1,24 @@
+# short-description: Create SD card image with a boot partition
+# long-description:
+# Create an image that can be written onto a SD card using dd for use
+# with i.MX SoC family
+# It uses u-boot + other binaries gathered together on imx-boot file
+#
+# The disk layout used is:
+#  - ---------- -------------- --------------
+# | | imx-boot |     boot     |    rootfs    |
+#  - ---------- -------------- --------------
+# ^ ^          ^              ^              ^
+# | |          |              |              |
+# 0 |        8MiB          72MiB          72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#   ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual
+#
+part u-boot --source rawcopy --sourceparams="file=imx-boot" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
+part /boot --source bootimg-partition --ondisk mmcblk --fstype=ext4 --label boot --active --align 4096 --size 64
+# Main Rootfs partition (1G)
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --fixed-size 1024 --align 4096 --uuid=70672ec3-5eee-49ff-b3b1-eb1fbd406bf5
+
+# User data partition (1M)
+part /data --ondisk mmcblk --fstype=ext4 --label data --fixed-size 1 --align 4096 --fsoptions "x-systemd.growfs"
+
+bootloader --ptable gpt