Revert RB1 switch to the edk2 firmware - #3122
Open
Dmitry Baryshkov (lumag) wants to merge 3 commits into
Open
Conversation
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 <dmitry.baryshkov@oss.qualcomm.com>
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 1f3f22d ("firmware-qcom-boot-qrb2210-rb1: drop no longer used recipe"). Assisted-by: Claude:claude-opus-5[1m] Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
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 6b6b73d ("rb1-core-kit: switch to the new edk2-based boot firmware"). Assisted-by: Claude:claude-opus-5[1m] Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Dmitry Baryshkov (lumag)
force-pushed
the
revert-rb1-firtmware
branch
from
September 11, 2026 00:59
cba647e to
900ac44
Compare
Test Results 119 files + 52 715 suites +402 6h 1m 21s ⏱️ - 1h 39m 48s For more details on these failures, see this check. Results for commit 900ac44. ± Comparison against base commit fc9a9e4. This pull request removes 2 and adds 22 tests. Note that renamed tests count towards both.♻️ This comment has been updated with latest results. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Lately the RB1 devices have shown a lot of issues in the CI starting from the device not booting and ending with random crashes. Revert the firmware to the previous baseline.