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

U-Boot: Add Orange Pi Zero Plus2 (H5) build #47187

Merged
merged 1 commit into from Sep 25, 2018
Merged

U-Boot: Add Orange Pi Zero Plus2 (H5) build #47187

merged 1 commit into from Sep 25, 2018

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Sep 22, 2018 •
edited

Motivation for this change

Adds support for that board.

The board is supported by mainline U-Boot, and uses the mainline build. It works right; HDMI starts, can boot the NixOS ARM mainline AArch64 img.

While unrelated to this PR, note that the mainline kernel currently has issues starting the HDMI output, so anyone using 4.18.6 mainline kernel on a NixOS image, use a serial device to confirm whether it works or not.

The instructions to flash are as expected from AArch64 allwinner. After using dd on the SD card:

dd if=u-boot-sunxi-with-spl.bin of=/dev/sdX bs=1024 seek=8

And while still directly unrelated to this PR; useful to know that booting from the 8GB internal eMMC works; boot from an SD system, and dd the NixOS AArch64 image, and then dd the u-boot binary using the same command, but substituting for the right /dev/mmcblk device.

Things done
  • ✔️ Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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)
  • ✔️ Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • ✔️ 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)
  • ✔️ Fits CONTRIBUTING.md.

@samueldr
Copy link
Member Author

@GrahamcOfBorg build ubootOrangePiZeroPlus2H5

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: ubootOrangePiZeroPlus2H5

Partial log (click to expand)

/nix/store/hal8c4sxf5w71jj3f0i1hvzfhk87ym5h-uboot-orangepi_zero_plus2_defconfig-2018.09

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: ubootOrangePiZeroPlus2H5

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: ubootOrangePiZeroPlus2H5

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@samueldr
Copy link
Member Author

Since I hacked on it on the community machine, it shows up as a one-line success. Here's the log:

dezgeg
dezgeg reviewed Sep 23, 2018
View reviewed changes
pkgs/misc/uboot/default.nix
@@ -158,6 +158,13 @@ in rec {
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};

ubootOrangePiZeroPlus2H5 = buildUBoot rec {
Copy link
Contributor

Choose a reason for hiding this comment

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

ubootOrangePiZeroPlus2H5 would come before ubootOrangePiPc in alphabetic order.

Copy link
Member Author

Choose a reason for hiding this comment

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

Z comes after P, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

D'oh, of course. Needed more coffee clearly...

dezgeg
dezgeg reviewed Sep 23, 2018
View reviewed changes
pkgs/top-level/all-packages.nix Outdated
@@ -14751,6 +14751,7 @@ with pkgs;
ubootSopine
ubootUtilite
ubootWandboard
ubootOrangePiZeroPlus2H5
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed, according to the alphabetical order of Z coming after P.

@samueldr samueldr force-pushed the feature/u-boot/orangepizeroplus2h5 branch from a1a0593 to 0501360 Compare September 23, 2018 02:49
@dezgeg dezgeg merged commit 12051db into NixOS:master Sep 25, 2018
@samueldr samueldr deleted the feature/u-boot/orangepizeroplus2h5 branch February 12, 2019 02:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dezgeg dezgeg dezgeg left review comments

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@samueldr @GrahamcOfBorg @dezgeg