From ba6f1a1e829fb691e1577d630077db2ca3b611e2 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 17 May 2019 21:56:31 -0400 Subject: [PATCH 1/5] u-boot: 2018-09 -> 2019.04 --- pkgs/misc/uboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index a17ddf440ed..875267885aa 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -4,7 +4,7 @@ }: let - buildUBoot = { version ? "2018.09" + buildUBoot = { version ? "2019.04" , filesToInstall , installDir ? "$out" , defconfig @@ -20,7 +20,7 @@ let src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "0s122kyz1svvs2yjzj4j9qravl3ra4vn0fjqgski7rlczqyg56w3"; + sha256 = "1vwv4bgbl7fjcm073zrphn17hnz5h5h778f88ivdsgbb2lnpgdvn"; }; patches = [ From 6d961ec9225a44fa8ea447361a75dea377365046 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 17 May 2019 21:57:14 -0400 Subject: [PATCH 2/5] u-boot: Adds Pine64LTS The name of the board is indeed A64-LTS, but upstream U-Boot names it pine64-lts so let's keep the U-Boot moniker. This previously was supported using the SOPINE build. --- pkgs/misc/uboot/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 875267885aa..b9325db9d51 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -195,6 +195,13 @@ in rec { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootPine64LTS = buildUBoot rec { + defconfig = "pine64-lts_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootQemuAarch64 = buildUBoot rec { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c923ff2d9b4..ba95e21298c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15881,6 +15881,7 @@ in ubootOrangePiZeroPlus2H5 ubootPcduino3Nano ubootPine64 + ubootPine64LTS ubootQemuAarch64 ubootQemuArm ubootRaspberryPi From 6663a888f24e608e00973fe7a6a1e4b55b1c26c9 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 17 May 2019 21:58:47 -0400 Subject: [PATCH 3/5] u-boot: Adds Pinebook --- pkgs/misc/uboot/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index b9325db9d51..6fe1a2081d2 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -202,6 +202,13 @@ in rec { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootPinebook = buildUBoot rec { + defconfig = "pinebook_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootQemuAarch64 = buildUBoot rec { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba95e21298c..219943b7c36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15882,6 +15882,7 @@ in ubootPcduino3Nano ubootPine64 ubootPine64LTS + ubootPinebook ubootQemuAarch64 ubootQemuArm ubootRaspberryPi From b69c4744e3862216e6b2cb3ccc46fc098f3a470b Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 18 May 2019 13:40:06 -0400 Subject: [PATCH 4/5] arm-trusted-firmware: 2.0 -> 2.1 --- pkgs/misc/arm-trusted-firmware/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 73e2a96d0cd..3dba308c09c 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -6,7 +6,7 @@ let , platform , extraMakeFlags ? [] , extraMeta ? {} - , version ? "2.0" + , version ? "2.1" , ... } @ args: stdenv.mkDerivation (rec { @@ -17,7 +17,7 @@ let owner = "ARM-software"; repo = "arm-trusted-firmware"; rev = "refs/tags/v${version}"; - sha256 = "087pkwa6slxff0aiz3v42gww007nww97bl1p96fvvs7rr1y14gjx"; + sha256 = "1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From b64a5cfc728d9f3639912c96bea2208510e62190 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 18 May 2019 13:40:16 -0400 Subject: [PATCH 5/5] arm-trusted-firmware: Switch Allwinner to upstream --- pkgs/misc/arm-trusted-firmware/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 3dba308c09c..01c35d99ae7 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -57,15 +57,7 @@ in rec { inherit buildArmTrustedFirmware; armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { - version = "1.0"; - src = fetchFromGitHub { - owner = "apritzel"; - repo = "arm-trusted-firmware"; - # Branch: `allwinner` - rev = "91f2402d941036a0db092d5375d0535c270b9121"; - sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys"; - }; - platform = "sun50iw1p1"; + platform = "sun50i_a64"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["build/${platform}/release/bl31.bin"]; };