ubootRaspberryPi*: add patch to fix bootstd behavior

This patch enables the raspberry pi (and really any board using standard boot without BOOTSTD_FULL) to boot properly when `boot_targets` only specifies the uclass of the device to boot from (e.g. "mmc" rather than "mmc0").
NixOS · Oct 9, 2023 · 6a12107 · 6a12107
1 parent 1b6f79e
commit 6a12107
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...onfigs-rpi-allow-for-bigger-kernels.patch → ...01-rpi.env-allow-for-bigger-kernels.patch b/...onfigs-rpi-allow-for-bigger-kernels.patch → ...01-rpi.env-allow-for-bigger-kernels.patch
@@ -1,7 +1,7 @@
-From 05769cd401f443f29547dbacd1b722e9a099b66b Mon Sep 17 00:00:00 2001
+From 30c64236cca889cc54e9100d050cef2715692c72 Mon Sep 17 00:00:00 2001
 From: Jared Baur <[email protected]>
-Date: Mon, 2 Oct 2023 18:32:34 -0700
-Subject: [PATCH] configs/rpi: allow for bigger kernels
+Date: Fri, 6 Oct 2023 23:34:57 -0700
+Subject: [PATCH 1/2] rpi.env: allow for bigger kernels
 
 ---
  board/raspberrypi/rpi/rpi.env | 16 ++++++++--------

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
@@ -21,6 +21,7 @@
 , armTrustedFirmwareRK3399
 , armTrustedFirmwareS905
 , buildPackages
+, fetchpatch2
 }:
 
 let
@@ -47,7 +48,11 @@ let
     src = if src == null then defaultSrc else src;
 
     patches = [
-      ./0001-configs-rpi-allow-for-bigger-kernels.patch
+      ./0001-rpi.env-allow-for-bigger-kernels.patch
+      (fetchpatch2 {
+        url = "https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/raw/";
+        hash = "sha256-GJHmfYDmJjqHBY+fgkyHrqyJYMzgvJksHXSZz8sK1A8=";
+      })
     ] ++ extraPatches;
 
     postPatch = ''