arm/qemu-efi-disk: add rootwait to bootargs
PATCH 1/2 arm/qemu-efi-disk: add rootwait to bootargs
Adding "rootwait" to bootargs for uniformity with the other wic files, and this _could_ resolve Yocto Bugzilla Bug 15562 (as the intermittent inability to find the root disk could be because of a race between needing the disk and it not being mounted yet).
--- meta-arm/wic/qemu-efi-disk.wks.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm/wic/qemu-efi-disk.wks.in +1 -1
@@ -8,4 +8,4 @@ part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid part swap --size 44 --label swap --fstype=swap --use-uuid -bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 ip=dhcp" +bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 ip=dhcp"
Signature · 1 line
2.39.3 (Apple Git-146)
PATCH 2/2 arm/arm-tstee: pin kernel to 6.6 to workaround issue
arm-tstee doesn't compile on 6.8 or newer kernels. Temporarily pin the kernels of machines using this package back to 6.6 while developing a fix.
--- meta-arm-bsp/conf/machine/fvp-base.conf | 2 ++ meta-arm/conf/machine/qemuarm64-secureboot.conf | 3 +++ 2 files changed, 5 insertions(+)
meta-arm-bsp/conf/machine/fvp-base.conf +2 -0
@@ -23,6 +23,8 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KERNEL_DTB_NAME = "fvp-base-revc.dtb" KERNEL_DEVICETREE = "arm/${KERNEL_DTB_NAME}" KERNEL_IMAGETYPE = "Image" +#FIXME - Working around arm-tstee not compiling on kernels greater than 6.8 +PREFERRED_VERSION_linux-yocto ?= "6.6.%" EXTRA_IMAGEDEPENDS += "trusted-firmware-a"
meta-arm/conf/machine/qemuarm64-secureboot.conf +3 -0
@@ -3,6 +3,9 @@ MACHINEOVERRIDES =. "qemuarm64:" require ${COREBASE}/meta/conf/machine/qemuarm64.conf KMACHINE = "qemuarm64" +#FIXME - Working around arm-tstee not compiling on kernels greater than 6.8 +PREFERRED_VERSION_linux-yocto ?= "6.6.%" +PREFERRED_VERSION_linux-yocto-rt ?= "6.6.%" # secure=on can't ever use KVM, so force it off QEMU_USE_KVM = ""
Signature · 1 line
2.39.3 (Apple Git-146)
Jon Mason
AppliedQuoted 6 lines · Jon Mason
Adding "rootwait" to bootargs for uniformity with the other wic files, and this _could_ resolve Yocto Bugzilla Bug 15562 (as the intermittent inability to find the root disk could be because of a race between needing the disk and it not being mounted yet).
Applied, thanks!
[1/2] arm/qemu-efi-disk: add rootwait to bootargs
commit: 05c0b9bd1f9b67fee8a18505c841285a9f0c302a
[2/2] arm/arm-tstee: pin kernel to 6.6 to workaround issue
commit: dd0f6111b43de42084eeffc74b479201f6e24647Best regards,
Signature · 1 line
Jon Mason <[email protected]>