raspberrypi-uboot: Init #38342

bkchr · 2018-04-02T16:35:12Z

Adds a bootloader for raspberry pi that uses uboot and also handles the
raspberrry pi firmware. The firmware and uboot are copied into /boot
in the installation process. The boot entries are created by calling
the generic-extlinux-compatible builder.

Motivation for this change

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
Fits CONTRIBUTING.md.

bkchr · 2018-04-02T16:36:40Z

@bachp fyi.

bjornfor · 2018-04-02T17:08:39Z

nixos/modules/system/boot/loader/raspberrypi-uboot/builder.sh

+#! @bash@/bin/sh -e
+
+# Delete old boot folder content
+rm -rf /boot/*


Oh, that looks a bit scary. Can you make updating the boot files a bit more "atomic". (Disclaimer: I haven't looked at how other raspi distros do this.)

Yeah, I also thought about that. I could first write all the files to a temporary directory and then swap these directories. Or do you have any better idea.

If that works, perfect. But /boot might be a mountpoint, right? That may complicate things.

I don't have a concrete idea. However, one I'd like to say that perhaps a trap can be used for some added robustness. For example, if the original files are first moved to a .bak directory, and the trap restores from .bak in case of error.

Why not move the old files to /boot/old or similar like it is done in raspberrypi loader?

bachp · 2018-04-02T18:56:07Z

One general note. Wouldn't it be possible to add this to the existing raspberry pi loader? There seems to be a lot of duplication.

I was thinking that updating u-boot could just be an option that can be disabled so behavior would be similar as it is now.

bachp · 2018-04-04T19:55:12Z

@bkchr This module is working for me. 👍

However I still think this might be better done as an extension to the existing module rather than a new one.

bachp · 2018-04-04T20:06:45Z

nixos/modules/system/boot/loader/raspberrypi-uboot/raspberrypi.nix

+
+        # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
+        # when attempting to show low-voltage or overtemperature warnings.
+        avoid_warnings=1


It would be nice to be able to change the content of the config.txt via the module option.

Yeah, I already thought about that and will integrate that also.

bkchr · 2018-04-04T20:14:43Z

@bachp yeah I will integrate it into the existing module.

bkchr · 2018-04-05T15:36:55Z

I moved the stuff back into the original raspberrypi bootloader. I would like to have uboot mounting the /root filesystem, to directly load the kernels and prevent copying them to /boot. But, I don't know if we could get to this point with uboot while still be able to select which kernel/configuration-version to boot.

I'm also still planing to integrate modification of the config.txt via the bootloader options.

bkchr · 2018-04-05T19:32:59Z

Okay, I'm finished.

@dezgeg are you also responsible for this?

dezgeg · 2018-04-08T10:55:15Z

nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix

+{ config, pkgs }:
+
+let
+  is64bit = pkgs.stdenv.is64bit;


I think conventionally stdenv.isAarch64 would be better.

dezgeg · 2018-04-08T10:55:27Z

nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix

+  cfg = config.boot.loader.raspberryPi;
+
+  uboot =
+    if cfg.version == 2 then


What about version 1?

dezgeg · 2018-04-08T11:06:15Z

nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix

+          '';
+        };
+
+        startx = mkOption {


I think a generic solution to set any possible configuration option would be better instead of just these two. E.g. either make it an option set like:

boot.loader.raspberryPi.firmwareConfig = { start_x = 1; arm_freq = 950; }

or just as plain text:

boot.loader.raspberryPi.firmwareConfig = '' arm_freq=950 '';

dezgeg · 2018-04-08T11:07:43Z

nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix

+      else
+        pkgs.ubootRaspberryPi3_32bit
+    else
+      throw ("raspberrypi-uboot: unknown version: " ++ cfg.version);


In NixOS configurations, throw shouldn't be used to validate stuff but the assertions option.

dezgeg · 2018-04-08T11:08:25Z

nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix

@@ -5,7 +5,7 @@ with lib;
 let
  cfg = config.boot.loader.raspberryPi;

-  builder = pkgs.substituteAll {
+  builder_generic = pkgs.substituteAll {


The naming convention is camelCase, i.e. builderGeneric.

Uboot is copied into `/boot` in the installation process. The boot entries are created by calling the `generic-extlinux-compatible` builder.

The `firmwareConfig` option will be appended to `/boot/config.txt`.

bkchr · 2018-04-09T09:06:36Z

@dezgeg I addressed your comments :)

dezgeg · 2018-04-22T15:27:08Z

Sorry this took so long. I tested this on my Pi 1 and on a Pi 3, seems to work fine.

bkchr · 2018-04-22T15:55:09Z

@dezgeg np, ty :)

GrahamcOfBorg added 6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Apr 2, 2018

bjornfor reviewed Apr 2, 2018

View reviewed changes

bkchr force-pushed the raspberrypi_uboot2 branch from f49357c to 883fe67 Compare April 3, 2018 09:20

bachp requested changes Apr 4, 2018

View reviewed changes

bkchr force-pushed the raspberrypi_uboot2 branch 3 times, most recently from c0a7393 to 540ffe3 Compare April 5, 2018 10:56

bkchr force-pushed the raspberrypi_uboot2 branch 4 times, most recently from fa12804 to fc67009 Compare April 5, 2018 18:32

bkchr mentioned this pull request Apr 6, 2018

Raspberry Pi 3 Support #22014

Closed

dezgeg reviewed Apr 8, 2018

View reviewed changes

bkchr force-pushed the raspberrypi_uboot2 branch 2 times, most recently from 07eefa7 to c7e6ff7 Compare April 8, 2018 22:13

bkchr added 2 commits April 9, 2018 00:40

raspberrypi-bootloader: Adds support for using uboot

0bdd1b9

Uboot is copied into `/boot` in the installation process. The boot entries are created by calling the `generic-extlinux-compatible` builder.

raspberrypi-bootloader: Adds firmwareConfig config option

5a2aea0

The `firmwareConfig` option will be appended to `/boot/config.txt`.

bkchr force-pushed the raspberrypi_uboot2 branch from c7e6ff7 to 5a2aea0 Compare April 8, 2018 22:40

dezgeg merged commit 6ed495c into NixOS:master Apr 22, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

raspberrypi-uboot: Init #38342

raspberrypi-uboot: Init #38342

bkchr commented Apr 2, 2018 •

edited

bkchr commented Apr 2, 2018

bjornfor Apr 2, 2018

bkchr Apr 2, 2018

bjornfor Apr 2, 2018

bachp Apr 2, 2018

bachp commented Apr 2, 2018

bachp commented Apr 4, 2018 •

edited

bachp Apr 4, 2018

bkchr Apr 4, 2018

bkchr commented Apr 4, 2018

bkchr commented Apr 5, 2018

bkchr commented Apr 5, 2018

dezgeg Apr 8, 2018

dezgeg Apr 8, 2018

dezgeg Apr 8, 2018

dezgeg Apr 8, 2018

dezgeg Apr 8, 2018

bkchr commented Apr 9, 2018

dezgeg commented Apr 22, 2018

bkchr commented Apr 22, 2018

raspberrypi-uboot: Init #38342

raspberrypi-uboot: Init #38342

Conversation

bkchr commented Apr 2, 2018 • edited

Motivation for this change

Things done

bkchr commented Apr 2, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bachp commented Apr 2, 2018

bachp commented Apr 4, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bkchr commented Apr 4, 2018

bkchr commented Apr 5, 2018

bkchr commented Apr 5, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bkchr commented Apr 9, 2018

dezgeg commented Apr 22, 2018

bkchr commented Apr 22, 2018

bkchr commented Apr 2, 2018 •

edited

bachp commented Apr 4, 2018 •

edited