From ba9e0d2e3fe4365dc6bd4b8c6e682ae3fff6d3f1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 4 Nov 2023 11:23:58 +0300 Subject: [PATCH] uboot: set SCP=/dev/null for all the allwinners This is required to be set explicitly now, or the build fails. --- pkgs/misc/uboot/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 376bcbb24474..45a123f3412d 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -190,6 +190,7 @@ in { defconfig = "bananapi_m64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -348,6 +349,7 @@ in { defconfig = "a64-olinuxino-emmc_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -361,6 +363,7 @@ in { defconfig = "orangepi_zero_plus2_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -381,6 +384,7 @@ in { defconfig = "orangepi_3_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinnerH6}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -394,6 +398,7 @@ in { defconfig = "pine64_plus_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -401,6 +406,7 @@ in { defconfig = "pine64-lts_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -408,6 +414,7 @@ in { defconfig = "pinebook_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; @@ -549,6 +556,7 @@ in { defconfig = "sopine_baseboard_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + SCP = "/dev/null"; filesToInstall = ["u-boot-sunxi-with-spl.bin"]; };