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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

uboot: 2019.10 -> 2020.01 #78216

Merged
merged 2 commits into from Jan 22, 2020
Merged

uboot: 2019.10 -> 2020.01 #78216

merged 2 commits into from Jan 22, 2020

Conversation

samueldr
Copy link
Member

Motivation for this change

Update u-boot!

This update to u-boot got our patches included. We're patch-free for most u-boots! 馃帀

There is one platform that was removed way back, in January 2019. Made the proper alias. (ubootBeagleboneBlack -> ubootAmx335xEVM).

Tested

Cross-compilation will fail on current unstable. Cross-compilation was tested rebased on current staging.

  • Cross-compiled
    • aarch64-linux
    • armv7l-linux
  • Compiled natively
    • aarch64-linux
# cross-compiled aarch64-linux
nix-build --keep-going --no-out-link -A pkgsCross.aarch64-multiplatform.ubootBananaPim64 -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.ubootQemuAarch64 -A pkgsCross.aarch64-multiplatform.ubootRaspberryPi3_64bit -A pkgsCross.aarch64-multiplatform.ubootRock64 -A pkgsCross.aarch64-multiplatform.ubootRockPro64 -A pkgsCross.aarch64-multiplatform.ubootSopine

# cross-compiled armv7l-linux
nix-build --keep-going --no-out-link -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.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.ubootUtilite -A pkgsCross.armv7l-hf-multiplatform.ubootWandboard

# native aarch64-linux
nix-build --keep-going --no-out-link -A ubootBananaPim64 -A ubootOdroidC2 -A ubootOrangePiZeroPlus2H5 -A ubootPine64 -A ubootPine64LTS -A ubootPinebook -A ubootQemuAarch64 -A ubootRaspberryPi3_64bit -A ubootRock64 -A ubootRockPro64 -A ubootSopine
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • (partial) Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • (partial) Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@samueldr
uboot: 2019.10 -> 2020.01
ca931ca 
In addition, removes the python2 dependency. Anyway, it was required for
the updated revision to build.
@samueldr
uboot: ubootBeagleboneBlack -> ubootAmx335xEVM
7943c33 
See u-boot@8fa7f65dd02c176ee6021eaf40114560b8954ba2

>    configs: Remove am335x_boneblack_defconfig
>
>    The am335x_evm_defconfig supports all am335x_boneblack variants. Remove
>    the redundant am335x_boneblack_defconfig.
@ofborg ofborg bot requested a review from dezgeg January 21, 2020 22:19
@samueldr samueldr requested a review from flokli January 21, 2020 23:16
@flokli
Copy link
Contributor

flokli commented Jan 21, 2020 via email

lopsided98
lopsided98 approved these changes Jan 22, 2020
View reviewed changes
Copy link
Contributor

@lopsided98 lopsided98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Boots on my Raspberry Pi 1B and Digilent Zybo Z7 (not yet in upstream nixpkgs), which are the only devices I can physically access right now.

@samueldr samueldr merged commit 90441b4 into NixOS:master Jan 22, 2020
@samueldr samueldr deleted the u-boot/update/2020.01 branch January 25, 2020 18:13
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/january-2020-in-nixos/5771/1

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

@lopsided98 lopsided98 lopsided98 approved these changes

@dezgeg dezgeg Awaiting requested review from dezgeg

@flokli flokli Awaiting requested review from flokli

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@samueldr @flokli @nixos-discourse @lopsided98