Merge pull request #124 from ElvishJerricco/upstream-uboot

use nixpkgs upstream uboot
This commit is contained in:
Travis Staton 2025-02-21 20:23:23 -05:00 committed by GitHub
commit b9f91f70ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 26 deletions

16
flake.lock generated
View file

@ -61,8 +61,7 @@
"rpi-linux-6_12_11-src": "rpi-linux-6_12_11-src",
"rpi-linux-6_6_67-src": "rpi-linux-6_6_67-src",
"rpi-linux-stable-src": "rpi-linux-stable-src",
"rpicam-apps-src": "rpicam-apps-src",
"u-boot-src": "u-boot-src"
"rpicam-apps-src": "rpicam-apps-src"
}
},
"rpi-bluez-firmware-src": {
@ -183,19 +182,6 @@
"repo": "rpicam-apps",
"type": "github"
}
},
"u-boot-src": {
"flake": false,
"locked": {
"lastModified": 1719857238,
"narHash": "sha256-mJ2TBy0Y5ZtcGFgtU5RKr0UDUp5FWzojbFb+o/ebRJU=",
"type": "tarball",
"url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2"
},
"original": {
"type": "tarball",
"url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2"
}
}
},
"root": "root",

View file

@ -3,10 +3,6 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
u-boot-src = {
flake = false;
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2";
};
rpi-linux-stable-src = {
flake = false;
url = "github:raspberrypi/linux/stable_20241008";

View file

@ -1,5 +1,4 @@
{ u-boot-src
, rpi-linux-stable-src
{ rpi-linux-stable-src
, rpi-linux-6_6_67-src
, rpi-linux-6_12_11-src
, rpi-firmware-src
@ -84,14 +83,10 @@ in
compressFirmwareZstd = x: x;
# provide generic rpi arm64 u-boot
uboot-rpi-arm64 = final.buildUBoot rec {
uboot-rpi-arm64 = final.buildUBoot {
defconfig = "rpi_arm64_defconfig";
extraMeta.platforms = [ "aarch64-linux" ];
filesToInstall = [ "u-boot.bin" ];
version = "2024.04";
patches = [ ];
makeFlags = [ ];
src = u-boot-src;
# In raspberry pi sbcs the firmware manipulates the device tree in
# a variety of ways before handing it off to the linux kernel. [1]
# Since we have installed u-boot in place of a linux kernel we may