From 692c412f7673b4ea9f655abfe6b358fa5bea1b84 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 10 Sep 2026 15:36:29 +0300 Subject: [PATCH 1/3] qcom-ptool: update qcom-ptool revision The following changes were merged in qcom-ptool: Dmitry Baryshkov (1): qrb2210-rb1-abl: provide a pre-edk2 version of partition tables Igor Opaniuk (5): board: add multi-storage board model and composition resolver tests: cover the board composition resolver gen_partition: add multi-storage --board invocation cli: add show subcommand for resolved board specs tests: cover board-mode gen_partition and the show subcommand Vivek Puar (1): platforms/glymur-crd: specify dtb file name in SPI-NOR partition conf Assisted-by: Claude:claude-opus-5[1m] Signed-off-by: Dmitry Baryshkov --- recipes-bsp/partition/qcom-ptool.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/partition/qcom-ptool.inc b/recipes-bsp/partition/qcom-ptool.inc index 8bea1acc3..d4c787628 100644 --- a/recipes-bsp/partition/qcom-ptool.inc +++ b/recipes-bsp/partition/qcom-ptool.inc @@ -3,4 +3,4 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b0a8acd90d872086b279ead88af03369" SRC_URI = "git://github.com/qualcomm-linux/qcom-ptool.git;branch=main;protocol=https" -SRCREV = "b63a84c16f4247178024d3f7a532441d0a4e1d01" +SRCREV = "9a38c842132362bb635edfe2b1172a7d12f9a875" From d1ba9548f2bb0f8fe2a632dd0bf29aec1cf9ed30 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 10 Sep 2026 15:40:38 +0300 Subject: [PATCH 2/3] Revert "firmware-qcom-boot-qrb2210-rb1: drop no longer used recipe" The RB1 board shows regressions with the edk2-based boot firmware, so the board has to go back to the u-boot based rescue-image boot firmware. The recipe providing it was dropped once rb1-core-kit stopped referencing it, so bring it back. To prevent conflicts with the edk2 firmware, use qrb2210-rb1 subdir for the firmware. This reverts commit 1f3f22db70fd ("firmware-qcom-boot-qrb2210-rb1: drop no longer used recipe"). Assisted-by: Claude:claude-opus-5[1m] Signed-off-by: Dmitry Baryshkov --- .../firmware-qcom-boot-qrb2210-rb1_23.12.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb b/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb new file mode 100644 index 000000000..b2c2fe6b5 --- /dev/null +++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb @@ -0,0 +1,13 @@ +SUMMARY = "Prebuilt bootlader images for Qualcomm RB1" + +LICENSE = "LicenseRef-LICENSE.qcom" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbe399f2c983ad51768f4561587f000" + +SRC_URI = "https://artifacts.codelinaro.org/artifactory/clo-549-96boards-backup/96boards/rb1/linaro/rescue/23.12/rb1-bootloader-emmc-linux-47528.zip" +SRC_URI[sha256sum] = "c75b6c63eb24c8ca36dad08ba4d4e93f3f4cd7dce60cf1b6dfb5790dc181cc3d" + +BOOTBINARIES = "rb1-bootloader-emmc-linux-47528" + +QCOM_BOOT_IMG_SUBDIR = "qrb2210-rb1" + +include firmware-qcom-boot-common.inc From 900ac44409b90e2ff1c95f37cd6a98dfa04dddc0 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 10 Sep 2026 15:41:29 +0300 Subject: [PATCH 3/3] Revert "rb1-core-kit: switch to the new edk2-based boot firmware" The RB1 board shows regressions with the edk2-based boot firmware, so switch the machine back to the u-boot based boot firmware: restore u-boot as the bootloader provider and drop the CDT firmware, which is only needed by the edk2 based release. Bring back the qbootctl dependency as well, since the android bootloader needs to be told that the boot was successful, otherwise it switches to slot B and fails to boot. Switch the partition layout to the pre-edk2 qrb2210-rb1-abl variant too, as the qrb2210-rb1 one now describes the edk2 firmware. This reverts commit 6b6b73d4c07a ("rb1-core-kit: switch to the new edk2-based boot firmware"). Assisted-by: Claude:claude-opus-5[1m] Signed-off-by: Dmitry Baryshkov --- conf/machine/rb1-core-kit.conf | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/conf/machine/rb1-core-kit.conf b/conf/machine/rb1-core-kit.conf index e13e904ed..9407d3ad5 100644 --- a/conf/machine/rb1-core-kit.conf +++ b/conf/machine/rb1-core-kit.conf @@ -6,6 +6,7 @@ require conf/machine/include/qcom-qcm2290.inc MACHINE_FEATURES = "efi usbhost usbgadget alsa wifi bluetooth" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" UBOOT_CONFIG = "qrb2210-rb1" QCOM_DTB_DEFAULT ?= "qrb2210-rb1" @@ -19,9 +20,11 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \ packagegroup-rb1-hexagon-dsp-binaries \ " -QCOM_CDT_FILE = "cdt_rb1_core_kit" -QCOM_BOOT_FILES_SUBDIR = "qrb2210" -QCOM_PARTITION_FILES_SUBDIR ?= "partitions/qrb2210-rb1/emmc" +# Helper util to tell the android bootloader to mark the boot as successfull. +# The boot firmware will switch to slot B and fail to boot otherwise. +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "qbootctl" -QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qrb2210" -QCOM_CDT_FIRMWARE = "firmware-qcom-cdt-qrb2210" +QCOM_BOOT_FILES_SUBDIR = "qrb2210-rb1" +QCOM_PARTITION_FILES_SUBDIR ?= "partitions/qrb2210-rb1-abl/emmc" + +QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qrb2210-rb1"