From 25a4ef905f3f8cebf6b5780376ede454403eddef Mon Sep 17 00:00:00 2001 From: Marcel Novotny Date: Sat, 5 Jun 2021 01:20:46 +0200 Subject: [PATCH 1/2] armTrustedFirmwareAllwinnerH616: init --- pkgs/misc/arm-trusted-firmware/default.nix | 6 ++++++ pkgs/misc/uboot/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 3 files changed, 8 insertions(+) diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index f3e2f0dca239..f5500d207a1d 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -80,6 +80,12 @@ in { filesToInstall = ["build/${platform}/release/bl31.bin"]; }; + armTrustedFirmwareAllwinnerH616 = buildArmTrustedFirmware rec { + platform = "sun50i_h616"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["build/${platform}/release/bl31.bin"]; + }; + armTrustedFirmwareQemu = buildArmTrustedFirmware rec { platform = "qemu"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index cd401907125b..59ac7a6dc834 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -11,6 +11,7 @@ , swig , meson-tools , armTrustedFirmwareAllwinner +, armTrustedFirmwareAllwinnerH616 , armTrustedFirmwareRK3328 , armTrustedFirmwareRK3399 , armTrustedFirmwareS905 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d2e41482eef..13ae272911ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20057,6 +20057,7 @@ in buildArmTrustedFirmware armTrustedFirmwareTools armTrustedFirmwareAllwinner + armTrustedFirmwareAllwinnerH616 armTrustedFirmwareQemu armTrustedFirmwareRK3328 armTrustedFirmwareRK3399 From 4990b7f876fd4012897c2307b251dc04de24a092 Mon Sep 17 00:00:00 2001 From: Marcel Novotny Date: Sat, 5 Jun 2021 01:24:06 +0200 Subject: [PATCH 2/2] ubootOrangePiZero2: init --- 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 59ac7a6dc834..059552fdc9af 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -278,6 +278,13 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootOrangePiZero2 = buildUBoot { + defconfig = "orangepi_zero2_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareAllwinnerH616}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootPcduino3Nano = buildUBoot { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; extraMeta.platforms = ["armv7l-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13ae272911ad..91670ae29c48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21455,6 +21455,7 @@ in ubootOrangePiPc ubootOrangePiZeroPlus2H5 ubootOrangePiZero + ubootOrangePiZero2 ubootPcduino3Nano ubootPine64 ubootPine64LTS