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.

Sign up for GitHub

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

Jump to bottom

uboot: 2021.04 -> 2021.10 #140552

Merged
merged 3 commits into from
Oct 5, 2021
Merged

uboot: 2021.04 -> 2021.10 #140552

merged 3 commits into from
Oct 5, 2021

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Oct 5, 2021 •
edited
Loading

Motivation for this change

Update U-Boot.

This includes changes from #139865, but ported forward to 2021.10.

@K900 I'll need a test to validate it actually works on a C0 variant.

This also includes changes from #125448, but ported forward to 2021.10.

@zhaofengli, it would be nice of you to test, but I guess that's not needed as your instructions on the PR were followed and it started just fine under QEMU.

I have not yet tested the build on any hardware.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.
 $ nix-build --keep-going --no-out-link \<nixpkgs\> -A pkgsCross.armv7l-hf-multiplatform.ubootA20OlinuxinoLime -A pkgsCross.armv7l-hf-multiplatform.ubootAmx335xEVM -A pkgsCross.armv7l-hf-multiplatform.ubootBananaPi -A pkgsCross.armv7l-hf-multiplatform.ubootBananaPim3 -A pkgsCross.armv7l-hf-multiplatform.ubootBeagleboneBlack -A pkgsCross.armv7l-hf-multiplatform.ubootClearfog -A pkgsCross.armv7l-hf-multiplatform.ubootJetsonTK1 -A pkgsCross.armv7l-hf-multiplatform.ubootNovena -A pkgsCross.armv7l-hf-multiplatform.ubootOdroidXU3 -A pkgsCross.armv7l-hf-multiplatform.ubootOrangePiPc -A pkgsCross.armv7l-hf-multiplatform.ubootOrangePiZero -A pkgsCross.armv7l-hf-multiplatform.ubootPcduino3Nano -A pkgsCross.armv7l-hf-multiplatform.ubootQemuArm -A pkgsCross.armv7l-hf-multiplatform.ubootRaspberryPi2 -A pkgsCross.armv7l-hf-multiplatform.ubootRaspberryPi3_32bit -A pkgsCross.armv7l-hf-multiplatform.ubootRaspberryPi4_32bit -A pkgsCross.armv7l-hf-multiplatform.ubootUtilite -A pkgsCross.armv7l-hf-multiplatform.ubootWandboard

 $ nix-build --keep-going --no-out-link \<nixpkgs\> -A pkgsCross.aarch64-multiplatform.ubootBananaPim64 -A pkgsCross.aarch64-multiplatform.ubootNanoPCT4 -A pkgsCross.aarch64-multiplatform.ubootOdroidC2 -A pkgsCross.aarch64-multiplatform.ubootOrangePiZeroPlus2H5 -A pkgsCross.aarch64-multiplatform.ubootPine64 -A pkgsCross.aarch64-multiplatform.ubootPine64LTS -A pkgsCross.aarch64-multiplatform.ubootPinebook -A pkgsCross.aarch64-multiplatform.ubootPinebookPro -A pkgsCross.aarch64-multiplatform.ubootQemuAarch64 -A pkgsCross.aarch64-multiplatform.ubootROCPCRK3399 -A pkgsCross.aarch64-multiplatform.ubootRaspberryPi3_64bit -A pkgsCross.aarch64-multiplatform.ubootRaspberryPi4_64bit -A pkgsCross.aarch64-multiplatform.ubootRock64 -A pkgsCross.aarch64-multiplatform.ubootRockPi4 -A pkgsCross.aarch64-multiplatform.ubootRockPro64 -A pkgsCross.aarch64-multiplatform.ubootSopine

samueldr and others added 3 commits October 4, 2021 20:57
@samueldr
uboot: 2021.04 -> 2021.10
32a9c0a
@K900 @samueldr
ubootRaspberryPi4: provide fix for C0 revisions
b0f99ad 
Provide a (yet unmerged) patch that allows NixOS to boot correctly on
new Pi4 boards using the BCM2711C0 SoC. Revert this when the patch is
available in mainline U-Boot.

Co-authored-by: Samuel Dionne-Riel <samuel@dionne-riel.com>
@zhaofengli @samueldr
ubootQemuRiscv64Smode: init
1ef6c4b
@ofborg ofborg bot requested review from dezgeg and lopsided98 October 5, 2021 01:53
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 5, 2021
@samueldr samueldr mentioned this pull request Oct 5, 2021
Closed
@K900
Copy link
Contributor

K900 commented Oct 5, 2021

It works!

@K900 K900 mentioned this pull request Oct 5, 2021
Closed
12 tasks
@samueldr samueldr merged commit 7882b7f into NixOS:master Oct 5, 2021
@samueldr samueldr deleted the updates/u-boot-2021.10 branch October 5, 2021 22:27
@K900 K900 mentioned this pull request Oct 6, 2021
Closed
This was referenced Oct 8, 2021
Closed
Closed
@K900 K900 mentioned this pull request Oct 26, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dezgeg dezgeg Awaiting requested review from dezgeg

@lopsided98 lopsided98 Awaiting requested review from lopsided98

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@samueldr @K900 @zhaofengli