NixOS/mobile-nixos
1
1
Fork 0
mirror of https://github.com/NixOS/mobile-nixos.git synced 2024-12-14 09:16:39 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #435 from samueldr-wip/device/pinetab-u-boot-2021.10

Browse Source 
pine64-pinetab: u-boot: 2021.01 -> 2021.10
This commit is contained in:
Samuel Dionne-Riel 2021-12-27 19:12:51 -05:00 committed by GitHub
commit 8a105e1776
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devices/pine64-pinephone/u-boot/default.nix
View File

@ -11,12 +11,6 @@
}:
let
pw = id: sha256: fetchpatch {
inherit sha256;
name = "${id}.patch";
url = "https://patchwork.ozlabs.org/patch/${id}/raw/";
};
pine64Patch = rev: sha256: fetchpatch {
inherit sha256;
name = "pine64-${rev}.patch";

46
devices/pine64-pinetab/u-boot/default.nix
View File

@ -11,12 +11,6 @@
}:
let
pw = id: sha256: fetchpatch {
inherit sha256;
name = "${id}.patch";
url = "https://patchwork.ozlabs.org/patch/${id}/raw/";
};
pine64Patch = rev: sha256: fetchpatch {
inherit sha256;
name = "pine64-${rev}.patch";
@ -41,36 +35,6 @@ in
BL31 = "${crustATF}/bl31.bin";
SCP = "${crustFirmware}/scp.bin";
extraPatches = [
# usb: Make USB_MUSB_PIO_ONLY selected by USB_MUSB_SUNXI
# https://patchwork.ozlabs.org/patch/1202024
(pw "1202024" "0c196zk1s3pq3wdv909sxmjgqpll2hwb817bpbghkfkyyknl96vg")
# sunxi: support asymmetric dual rank DRAM on A64/R40
# https://patchwork.ozlabs.org/patch/1312857
(pw "1312857" "0w8caf936y7f1r2lvdqar9n3dfkm461lm3k5hfwxd7biwyd386nk")
# sunxi: Add arm64 FEL support
# https://patchwork.ozlabs.org/patch/1402908
(pw "1402908" "1pm6zr7xgafw04rb95237q1mxb8xa6k2lmhzfsj0x0gxal96rw2v")
# sunxi: dram: h6: Improve DDR3 config detection
# https://patchwork.ozlabs.org/patch/1410521
(pw "1410521" "1vmalpf3wl3ii592qsh57g11qfrkmx40hlg8mza1330np2xfgb7v")
# Enable led on boot to notify user of boot status
# https://gitlab.com/pine64-org/u-boot/-/commit/1a72bd9f5b0d75361b0852ed515d40a47c1e9bfe
(pine64Patch "1a72bd9f5b0d75361b0852ed515d40a47c1e9bfe" "0z6md01qcsf6xwb6hyn4cgxjz2d0dhv05k5hrqp9kwsh9yghchqq")
# pinephone: Add volume_key environment variable
# https://gitlab.com/pine64-org/u-boot/-/commit/2ce71f93c215bf87a9a64a93c3b2c28a86158e5b
(pine64Patch "2ce71f93c215bf87a9a64a93c3b2c28a86158e5b" "1x5p0p6zyd4y7yigyikhlwhrywqmd0kpkdnb38583svqzadbr9gw")
# sunxi: DT: A64: Add wifi to PinePhone DTS
# https://gitlab.com/pine64-org/u-boot/-/commit/b2f2ff6913788437dddf64fa9bcef875e260ec1e
(pine64Patch "b2f2ff6913788437dddf64fa9bcef875e260ec1e" "0rj3nx067r4y1n7s7l953v8y23l17vc0w5j47dqx3fim8frnq7j3")
];
filesToInstall = ["u-boot-sunxi-with-spl.bin" "u-boot.img" "u-boot.dtb"];
# The current u-boot build doesn't know about the USB controllers.
@ -90,10 +54,10 @@ in
CONFIG_OF_LIST="sun50i-a64-pinetab"
'';
}).overrideAttrs(old: rec {
version = "2021.01";
version = "2021.10";
src = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
sha256 = "0m04glv9kn3bhs62sn675w60wkrl4m3a4hnbnnw67s3l198y21xl";
sha256 = "1m0bvwv8r62s4wk4w3cmvs888dhv9gnfa98dczr4drk2jbhj7ryd";
};
postInstall = ''
cp .config $out/build.config
@ -107,4 +71,10 @@ in
p.setuptools # for pkg_resources
]))
] ++ old.nativeBuildInputs;
patches = [
# Enable led on boot to notify user of boot status
# https://gitlab.com/pine64-org/u-boot/-/commit/1a72bd9f5b0d75361b0852ed515d40a47c1e9bfe
(pine64Patch "1a72bd9f5b0d75361b0852ed515d40a47c1e9bfe" "0z6md01qcsf6xwb6hyn4cgxjz2d0dhv05k5hrqp9kwsh9yghchqq")
];
})