From 25dad55dcb7139d0bf496b62abd0a1008a172320 Mon Sep 17 00:00:00 2001 From: Diogo Costa Date: Sat, 1 Jun 2024 10:34:39 +0100 Subject: [PATCH] fix(baremetal): update baremetal recipe to use irq flags Signed-off-by: Diogo Costa --- pkgs/guest/baremetal.nix | 3 +-- pkgs/guest/tf/baremetal.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/guest/baremetal.nix b/pkgs/guest/baremetal.nix index ffe464b..fb48ea8 100644 --- a/pkgs/guest/baremetal.nix +++ b/pkgs/guest/baremetal.nix @@ -10,7 +10,6 @@ , setup-cfg , guest_name ? "baremetal" , baremetal_srcs_path ? " " -, irq_controller ? " " }: stdenv.mkDerivation rec { @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { export CROSS_COMPILE=${setup-cfg.toolchain_name}- if [ ARCH == "aarch64" ]; then make -C $out PLATFORM=${setup-cfg.platform_name} \ - GIC_VERSION=${irq_controller} + ${setup-cfg.irq_flags} else make -C $out PLATFORM=${setup-cfg.platform_name} fi diff --git a/pkgs/guest/tf/baremetal.nix b/pkgs/guest/tf/baremetal.nix index 8c2cfe9..4acd934 100644 --- a/pkgs/guest/tf/baremetal.nix +++ b/pkgs/guest/tf/baremetal.nix @@ -14,7 +14,6 @@ , list_tests ? " " , list_suites ? " " , log_level ? "2" -, irq_controller ? " " }: stdenv.mkDerivation rec { @@ -67,7 +66,7 @@ stdenv.mkDerivation rec { make -C $out PLATFORM=${setup-cfg.platform_name} \ BAO_TEST=1 SUITES=${list_suites} TESTS=${list_tests} \ TESTF_LOG_LEVEL=${log_level} \ - GIC_VERSION=${irq_controller} + ${setup-cfg.irq_flags} else make -C $out PLATFORM=${setup-cfg.platform_name} \ BAO_TEST=1 SUITES=${list_suites} TESTS=${list_tests} \