diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/misc/uboot | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/misc/uboot')
-rw-r--r-- | nixpkgs/pkgs/misc/uboot/default.nix | 23 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/uboot/nanonote.nix | 59 |
2 files changed, 21 insertions, 61 deletions
diff --git a/nixpkgs/pkgs/misc/uboot/default.nix b/nixpkgs/pkgs/misc/uboot/default.nix index 59f73b42439a..c841c69446fc 100644 --- a/nixpkgs/pkgs/misc/uboot/default.nix +++ b/nixpkgs/pkgs/misc/uboot/default.nix @@ -18,10 +18,10 @@ }: let - defaultVersion = "2020.07"; + defaultVersion = "2020.10"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "0sjzy262x93aaqd6z24ziaq19xjjjk5f577ivf768vmvwsgbzxf1"; + sha256 = "08m6f1bh4pdcqbxf983qdb66ccd5vak5cbzc114yf3jwq2yinj0d"; }; buildUBoot = { version ? null @@ -314,6 +314,18 @@ in { filesToInstall = ["u-boot.bin"]; }; + ubootRaspberryPi4_32bit = buildUBoot { + defconfig = "rpi_4_32b_defconfig"; + extraMeta.platforms = ["armv7l-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + + ubootRaspberryPi4_64bit = buildUBoot { + defconfig = "rpi_4_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["u-boot.bin"]; + }; + ubootRaspberryPiZero = buildUBoot { defconfig = "rpi_0_w_defconfig"; extraMeta.platforms = ["armv6l-linux"]; @@ -394,4 +406,11 @@ in { extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.img" "SPL"]; }; + + ubootRockPi4 = buildUBoot { + defconfig = "rock-pi-4-rk3399_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3399}/bl31.elf"; + filesToInstall = [ "u-boot.itb" "idbloader.img"]; + }; } diff --git a/nixpkgs/pkgs/misc/uboot/nanonote.nix b/nixpkgs/pkgs/misc/uboot/nanonote.nix deleted file mode 100644 index fb3b98f478e6..000000000000 --- a/nixpkgs/pkgs/misc/uboot/nanonote.nix +++ /dev/null @@ -1,59 +0,0 @@ -{stdenv, fetchurl, fetchgit}: - -# All this file is made for the Marvell Sheevaplug - -stdenv.mkDerivation { - name = "uboot-qb-2010.06"; - - src = fetchurl { - url = "ftp://ftp.denx.de/pub/u-boot/u-boot-2010.06.tar.bz2"; - sha256 = "1j0bl8x5i5m1pn62z450gbw30pbrj7sgs3fjp2l2giczv49cn33r"; - }; - - srcPatches = fetchgit { - url = "git://projects.qi-hardware.com/openwrt-xburst.git"; - rev = "3244d5ef9f93802f9b9b6f4405636424abf6fa83"; - sha256 = "0mg87s10hpz41dr1zbd3bcl8i64gwvh3f1nrz8cb8c49099miqla"; - }; - - patchPhase = '' - cp -R $srcPatches/package/uboot-xburst/files/* . - for a in $srcPatches/package/uboot-xburst/patches/*; do - patch -p1 < $a - done - chmod +w -R * - sed -i -e 's/console=ttyS0,57600n8//' include/configs/qi_lb60.h - # Load more than 2MiB for the kernel - sed -i -e 's/0x200000;bootm/0x400000;bootm/' include/configs/qi_lb60.h - ''; - - makeFlags = [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - ]; - - # Add reiserfs support - configurePhase = '' - make mrproper - make qi_lb60_config - ''; - - preBuild= '' - # A variable named 'src' used to affect the build in some uboot... - unset -v src - ''; - - dontStrip = true; - - installPhase = '' - mkdir -p $out - cp u-boot-nand.bin $out - cp u-boot u-boot.map $out - - mkdir -p $out/bin - cp tools/{envcrc,mkimage} $out/bin - ''; - - meta = { - platforms = stdenv.lib.platforms.mips; - }; -} |