raspberry-pi: fix DTB name mapping for U-Boot#1840
Open
JamieMagee wants to merge 1 commit intoNixOS:masterfrom
Open
raspberry-pi: fix DTB name mapping for U-Boot#1840JamieMagee wants to merge 1 commit intoNixOS:masterfrom
JamieMagee wants to merge 1 commit intoNixOS:masterfrom
Conversation
JamieMagee
changed the title
- Gate on rpiVersion instead of architecture; skip for Pi 4+ where vendor and upstream DTB names already match - Fix bcm2835-rpi-zero.dtb: was copied from bcm2708-rpi-b-plus (wrong board), now uses bcm2708-rpi-zero - Drop bcm2711-rpi-4-b -> bcm2838-rpi-4-b copy; nothing uses bcm2838-* Ref: https://github.com/u-boot/u-boot/blob/master/board/raspberrypi/rpi/rpi.c
JamieMagee
force-pushed
the
raspberry-pi/dtb-fixup
branch
from
3539caa to
9be94d5
Compare
This was referenced Apr 26, 2026
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.
The
postFixupcopies vendor-named DTBs (bcm2708-*/bcm2709-*/bcm2710-*) to the upstream names (bcm2835-*/bcm2836-*/bcm2837-*) that U-Boot expects. See U-Boot rpi.c.Three fixes:
rpiVersioninstead of host architecture. Pi 4+ names already match between vendor and upstream, so skip the workaround forrpiVersion >= 4.bcm2835-rpi-zero.dtb-- was copied frombcm2708-rpi-b-plus.dtb(wrong board). Now usesbcm2708-rpi-zero.dtb.bcm2711-rpi-4-b.dtbtobcm2838-rpi-4-b.dtbcopy. Nothing usesbcm2838-*.Things done
nixos-hardwareandimporting it via
<nixos-hardware>or Flake input