Merge branch 'staging-next' into staging

2021-02-02 19:46:31 +01:00
parent ce9de14677 8e3e72d51b
commit 75153ede17
51 changed files with 540 additions and 267 deletions
@@ -76,8 +76,8 @@ let
      def assemble_qemu_flags():
          flags = "-cpu max"
          ${if system == "x86_64-linux"
-            then ''flags += " -m 768"''
-            else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"''
+            then ''flags += " -m 1024"''
+            else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"''
          }
          return flags