fix(baremetal): update baremetal recipe to use irq flags

Signed-off-by: Diogo Costa <[email protected]>
bao-project · Jun 1, 2024 · 25dad55 · 25dad55
1 parent 0f1e0be
commit 25dad55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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} \