Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

raspberryPi-*: unify Pi 3/4 #61

Open
wants to merge 1 commit into
base: development
Choose a base branch
from

Conversation

leo60228
Copy link

@leo60228 leo60228 commented Nov 7, 2021

This unifies Pi 3 and Pi 4 to use a single binary, which as a side-effect makes #59 trivial. I've not tested this beyond building yet, and preferably it should be tested on every BCM2710/BCM2711 Pi board (but at least the 3B/3B+/4B).

@colemickens
Copy link

colemickens commented Jan 10, 2022

From:

https://patchwork.ozlabs.org/project/uboot/patch/20191106144104.28177-1-matthias.bgg@kernel.org/

Provide a defconfig which allows us to boot Raspberrry Pi 4
and Raspberry Pi 3 Model B/B+
Instead of using the embedded DTB as done in RPi3 we use the
devicetree provided by the firmware.

I am not sure I totally understand these implications.

Does this mean that the DTBs copied in with this PR are loaded by the rpi firmware and then provided to u-boot? What happens if they differ from the kernel?

When I built this, it booted my 5.13 extlinux entries but not the 5.14 or 5.15 entries. I'm still looking into it.

@colemickens
Copy link

Also, the dtbs in my extlinux dtbs dirs for the rpi3 are named differently than the commit targets.

bcm2837-rpi-3-b.dtb rather than bcm2710*.

@colemickens
Copy link

I guess this is copying dtbs from the rpi-firmware. Which from the patchwork thread, seems to be what happens when u-boot is embedding their own copy of the dtb anyway... :/

@colemickens
Copy link

Okay, my issue was because we need to port the updated 0001-configs-rpi-allow-for-bigger-kernels.patch in from nixpkgs. This PR seems to boot my rpi4 at least.

@colemickens
Copy link

colemickens commented Jan 12, 2022

Okay, now that I've tested this with the larger kernel, and I've reviewed the notes about this defconfig, I'm in favor of removing draft status and merging. I can send a separate PR for updating the patch from nixpkgs.

(also, early testing indicates this "just works" with rpi02!)

@samueldr
Copy link
Contributor

Any particular reason for this still being a draft?

@leo60228
Copy link
Author

Oh, good point.

@leo60228 leo60228 marked this pull request as ready for review January 19, 2022 15:05
@samueldr
Copy link
Contributor

I'll test this at least in the cycle for -004, but given @colemickens' recent attempts, it seems like it's going to be an easy replacement.

@samueldr samueldr added this to the [blocked or WIP] milestone Jun 2, 2022
@leo60228
Copy link
Author

leo60228 commented Jul 19, 2022

Merge conflicts fixed. (note to self: test this more thoroughly, you have a Pi 3B+, 4B, and Zero 2 W...)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

3 participants