From 593fbef6ec493bcc2f770369da454b42564ea2e5 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 5 Dec 2019 16:12:31 -0500 Subject: meson-tools: init at 0.1 --- pkgs/misc/meson-tools/default.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/misc/meson-tools/default.nix (limited to 'pkgs/misc') diff --git a/pkgs/misc/meson-tools/default.nix b/pkgs/misc/meson-tools/default.nix new file mode 100644 index 000000000000..02b162c88098 --- /dev/null +++ b/pkgs/misc/meson-tools/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + pname = "meson-tools"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "afaerber"; + repo = pname; + rev = "v${version}"; + sha256 = "1bvshfa9pa012yzdwapi3nalpgcwmfq7d3n3w3mlr357a6kq64qk"; + }; + + buildInputs = [ openssl ]; + + installPhase = '' + mkdir -p "$out/bin" + mv amlbootsig unamlbootsig amlinfo "$out/bin" + ''; + + meta = with lib; { + homepage = "https://github.com/afaerber/meson-tools"; + description = "Tools for Amlogic Meson ARM platforms"; + license = licenses.gpl2; + maintainers = with maintainers; [ lopsided98 ]; + }; +} -- cgit 1.4.1 From b5ec2b5c63fd2497bc7bc8a915722d9576593627 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 5 Dec 2019 16:16:06 -0500 Subject: armTrustedFirmwareTools: init This package currently contains fiptool, cert_create and sptool. --- pkgs/misc/arm-trusted-firmware/default.nix | 32 +++++++++++++++++++++++------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 26 insertions(+), 7 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 5ff131dad9dd..8736a4c843df 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, pkgsCross, buildPackages }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, pkgsCross, buildPackages }: let buildArmTrustedFirmware = { filesToInstall , installDir ? "$out" - , platform + , platform ? null , extraMakeFlags ? [] , extraMeta ? {} , version ? "2.1" , ... } @ args: stdenv.mkDerivation ({ - name = "arm-trusted-firmware-${platform}-${version}"; + name = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}-${version}"; inherit version; src = fetchFromGitHub { @@ -25,16 +25,18 @@ let # For Cortex-M0 firmware in RK3399 nativeBuildInputs = [ pkgsCross.arm-embedded.stdenv.cc ]; + buildInputs = [ openssl ]; + makeFlags = [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - "PLAT=${platform}" - ] ++ extraMakeFlags; + ] ++ (lib.optional (platform != null) "PLAT=${platform}") + ++ extraMakeFlags; installPhase = '' runHook preInstall mkdir -p ${installDir} - cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir} + cp ${lib.concatStringsSep " " filesToInstall} ${installDir} runHook postInstall ''; @@ -45,7 +47,7 @@ let # Fatal error: can't create build/sun50iw1p1/release/bl31/sunxi_clocks.o: No such file or directory enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/ARM-software/arm-trusted-firmware; description = "A reference implementation of secure world software for ARMv8-A"; license = licenses.bsd3; @@ -56,6 +58,22 @@ let in { inherit buildArmTrustedFirmware; + armTrustedFirmwareTools = buildArmTrustedFirmware rec { + extraMakeFlags = [ + "HOSTCC=${stdenv.cc.targetPrefix}gcc" + "fiptool" "certtool" "sptool" + ]; + filesToInstall = [ + "tools/fiptool/fiptool" + "tools/cert_create/cert_create" + "tools/sptool/sptool" + ]; + postInstall = '' + mkdir -p "$out/bin" + find "$out" -type f -executable -exec mv -t "$out/bin" {} + + ''; + }; + armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { platform = "sun50i_a64"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b6d4aebfd08..caae2ce34149 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15811,6 +15811,7 @@ in inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware + armTrustedFirmwareTools armTrustedFirmwareAllwinner armTrustedFirmwareQemu armTrustedFirmwareRK3328 -- cgit 1.4.1 From d00a38aa7008ce89d51d5f7c41d59a575de98e0f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 5 Dec 2019 16:17:36 -0500 Subject: armTrustedFirmwareS905: init This supports the Amlogic S905, otherwise known as Meson GXBB. --- pkgs/misc/arm-trusted-firmware/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+) (limited to 'pkgs/misc') diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 8736a4c843df..27bef4cae449 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -103,4 +103,11 @@ in { extraMeta.platforms = ["aarch64-linux"]; filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; }; + + armTrustedFirmwareS905 = buildArmTrustedFirmware rec { + extraMakeFlags = [ "bl31" ]; + platform = "gxbb"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = [ "build/${platform}/release/bl31.bin"]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index caae2ce34149..674480185663 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15816,6 +15816,7 @@ in armTrustedFirmwareQemu armTrustedFirmwareRK3328 armTrustedFirmwareRK3399 + armTrustedFirmwareS905 ; microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { }; -- cgit 1.4.1 From 884580982851dee0529f018a0bb351f192e6f1d7 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 5 Dec 2019 16:19:26 -0500 Subject: ubootOdroidC2: init --- pkgs/misc/uboot/default.nix | 51 +++++++++++++++++++++++++++++++++++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 50 insertions(+), 2 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 8a07461bb2f1..af129ff0f9a4 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bc, bison, dtc, flex -, openssl, swig, armTrustedFirmwareAllwinner, armTrustedFirmwareRK3328 -, armTrustedFirmwareRK3399 +, openssl, swig, meson-tools, armTrustedFirmwareAllwinner +, armTrustedFirmwareRK3328, armTrustedFirmwareRK3399 +, armTrustedFirmwareS905 , buildPackages }: @@ -172,6 +173,52 @@ in { filesToInstall = ["u-boot.bin" "SPL"]; }; + # Flashing instructions: + # dd if=bl1.bin.hardkernel of= conv=fsync bs=1 count=442 + # dd if=bl1.bin.hardkernel of= conv=fsync bs=512 skip=1 seek=1 + # dd if=u-boot.gxbb of= conv=fsync bs=512 seek=97 + ubootOdroidC2 = let + firmwareBlobs = fetchFromGitHub { + owner = "armbian"; + repo = "odroidc2-blobs"; + rev = "47c5aac4bcac6f067cebe76e41fb9924d45b429c"; + sha256 = "1ns0a130yxnxysia8c3q2fgyjp9k0nkr689dxk88qh2vnibgchnp"; + meta.license = lib.licenses.unfreeRedistributableFirmware; + }; + in buildUBoot { + defconfig = "odroid-c2_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["u-boot.bin" "u-boot.gxbb" "${firmwareBlobs}/bl1.bin.hardkernel"]; + postBuild = '' + # BL301 image needs at least 64 bytes of padding after it to place + # signing headers (with amlbootsig) + truncate -s 64 bl301.padding.bin + cat '${firmwareBlobs}/gxb/bl301.bin' bl301.padding.bin > bl301.padded.bin + # The downstream fip_create tool adds a custom TOC entry with UUID + # AABBCCDD-ABCD-EFEF-ABCD-12345678ABCD for the BL301 image. It turns out + # that the firmware blob does not actually care about UUIDs, only the + # order the images appear in the file. Because fiptool does not know + # about the BL301 UUID, we would have to use the --blob option, which adds + # the image to the end of the file, causing the boot to fail. Instead, we + # take advantage of the fact that UUIDs are ignored and just put the + # images in the right order with the wrong UUIDs. In the command below, + # --tb-fw is really --scp-fw and --scp-fw is the BL301 image. + # + # See https://github.com/afaerber/meson-tools/issues/3 for more + # information. + '${buildPackages.armTrustedFirmwareTools}/bin/fiptool' create \ + --align 0x4000 \ + --tb-fw '${firmwareBlobs}/gxb/bl30.bin' \ + --scp-fw bl301.padded.bin \ + --soc-fw '${armTrustedFirmwareS905}/bl31.bin' \ + --nt-fw u-boot.bin \ + fip.bin + cat '${firmwareBlobs}/gxb/bl2.package' fip.bin > boot_new.bin + '${buildPackages.meson-tools}/bin/amlbootsig' boot_new.bin u-boot.img + dd if=u-boot.img of=u-boot.gxbb bs=512 skip=96 + ''; + }; + ubootOdroidXU3 = buildUBoot { defconfig = "odroid-xu3_defconfig"; extraMeta.platforms = ["armv7l-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 674480185663..6b00dc314fec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16955,6 +16955,7 @@ in ubootGuruplug ubootJetsonTK1 ubootNovena + ubootOdroidC2 ubootOdroidXU3 ubootOrangePiPc ubootOrangePiZeroPlus2H5 -- cgit 1.4.1 From 7486e0ad2630187c71be4c174fbacfed625ba55f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 5 Dec 2019 22:09:20 -0500 Subject: uboot: add lopsided98 to maintainers --- pkgs/misc/uboot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index af129ff0f9a4..a11f99c91fde 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -95,7 +95,7 @@ let homepage = http://www.denx.de/wiki/U-Boot/; description = "Boot loader for embedded systems"; license = licenses.gpl2; - maintainers = with maintainers; [ dezgeg samueldr ]; + maintainers = with maintainers; [ dezgeg samueldr lopsided98 ]; } // extraMeta; } // removeAttrs args [ "extraMeta" ]); -- cgit 1.4.1