arrakis merge: remove megaraid dependency for arm archs

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

diff --git a/hake/RuleDefs.hs b/hake/RuleDefs.hs
index b7a84fe..851e35e 100644 (file)
--- a/hake/RuleDefs.hs
+++ b/hake/RuleDefs.hs
@@ -1144,6 +1144,7 @@ flat ((LibDeps t):xs) = flat t ++ flat xs
 str2dep :: String -> LibDepTree
 str2dep  str
     | str == "vfs"           = libvfs_deps_all
+    | str == "vfs_ramfsonly" = LibDeps $ [ LibDep "vfs_ramfs" ]
     | str == "vfs_nonfs"     = libvfs_deps_nonfs
     | str == "posixcompat"   = libposixcompat_deps
     | str == "lwip"          = liblwip_deps

diff --git a/lib/barrelfish/arch/arm/pmap_arch.c b/lib/barrelfish/arch/arm/pmap_arch.c
index 293c6ad..26f493d 100644 (file)
--- a/lib/barrelfish/arch/arm/pmap_arch.c
+++ b/lib/barrelfish/arch/arm/pmap_arch.c
@@ -101,6 +101,10 @@ vregion_flags_to_kpi_paging_flags(vregion_flags_t flags)
         // XXX mask out write-combining flag on ARM
         flags &= ~VREGION_FLAGS_WRITE_COMBINING;
     }
+    if ((flags & VREGION_FLAGS_VTD_SNOOP) != 0) {
+        // XXX mask out vtd-snooping flag on ARM
+        flags &= ~VREGION_FLAGS_VTD_SNOOP;
+    }
     if ((flags & VREGION_FLAGS_GUARD) != 0) {
         flags = 0;
     }

diff --git a/lib/vfs/Hakefile b/lib/vfs/Hakefile
index c621972..7239869 100644 (file)
--- a/lib/vfs/Hakefile
+++ b/lib/vfs/Hakefile
@@ -49,5 +49,16 @@
                                             ("ata_rw28", ["ahci", "rpcclient"])
                                           ],
                   flounderDefs = [ "monitor" ]
+                },
+  build library { target = "vfs_ramfs",
+                  cFiles = [ "vfs.c", "vfs_path.c", "fopen.c", "vfs_ramfs.c",
+                             "cache.c", "vfs_cache.c", "fdtab.c", "vfs_fd.c"
+                           ],
+                  addCFlags = [ "-DDISABLE_NFS", "-DDISABLE_BLOCKDEV" ],
+                  flounderBindings = [ "trivfs", "bcache" ],
+                  flounderExtraBindings = [ ("trivfs", ["rpcclient"]),
+                                            ("bcache", ["rpcclient"])
+                                          ],
+                  flounderDefs = [ "monitor" ]
                 }
 ]

diff --git a/lib/vfs/vfs.c b/lib/vfs/vfs.c
index bb0dc05..b34047d 100644 (file)
--- a/lib/vfs/vfs.c
+++ b/lib/vfs/vfs.c
@@ -150,11 +150,23 @@ errval_t vfs_mount(const char *mountpoint, const char *uri)
     } else if (strncmp(uri, "ramfs", len) == 0) {
         err = vfs_ramfs_mount(uri, &m->st, &m->ops);
     } else if (strncmp(uri, "blockdevfs", len) == 0) {
+#ifndef DISABLE_BLOCKDEV
         err = vfs_blockdevfs_mount(uri, &m->st, &m->ops);
+#else
+        err = VFS_ERR_UNKNOWN_FILESYSTEM;
+#endif
     } else if (strncmp(uri, "fat16", len) == 0) {
+#ifndef DISABLE_BLOCKDEV
         err = vfs_fat_mount(uri, &m->st, &m->ops);
+#else
+        err = VFS_ERR_UNKNOWN_FILESYSTEM;
+#endif
     } else if (strncmp(uri, "fat32", len) == 0) {
+#ifndef DISABLE_BLOCKDEV
         err = vfs_fat_mount(uri, &m->st, &m->ops);
+#else
+        err = VFS_ERR_UNKNOWN_FILESYSTEM;
+#endif
     } else {
         debug_printf("VFS: unknown file system %.*s\n", (int)len, uri);
         err = VFS_ERR_UNKNOWN_FILESYSTEM;

diff --git a/usr/angler/Hakefile b/usr/angler/Hakefile
index aabee40..6ab40de 100644 (file)
--- a/usr/angler/Hakefile
+++ b/usr/angler/Hakefile
@@ -13,5 +13,5 @@
 
 [ build application { target = "angler",
                       cFiles = [ "angler.c" ],
-                      addLibraries = libDeps [ "vfs", "angler" ]
+                      addLibraries = libDeps [ "angler" ]
                     } ]

diff --git a/usr/drivers/cpuboot/Hakefile b/usr/drivers/cpuboot/Hakefile
index af1429f..2b656c8 100644 (file)
--- a/usr/drivers/cpuboot/Hakefile
+++ b/usr/drivers/cpuboot/Hakefile
@@ -34,7 +34,7 @@ in [
         architectures = ["k1om"]
     },
     build template {
-        addLibraries = libDeps ["vfs", "spawndomain", "elf", "octopus", "bench"],
+        addLibraries = libDeps ["vfs_ramfs", "spawndomain", "elf", "octopus", "bench"],
         cFiles = ["common.c", "main.c", "armboot.c"],
         architectures = ["armv7", "armv5"]
     }

diff --git a/usr/drivers/e10k/Hakefile b/usr/drivers/e10k/Hakefile
index 42a99fa..2c085b4 100644 (file)
--- a/usr/drivers/e10k/Hakefile
+++ b/usr/drivers/e10k/Hakefile
@@ -45,7 +45,7 @@
                       cFiles = [ "e10k_vf.c", "e10k_phy.c", "sleep.c",
                                  "e10k_qdriver.c", "helper.c"],
                       mackerelDevices = [ "e10k", "e10k_q", "e10k_vf" ],
-                      flounderBindings = [ "e10k_vf" ],
+                      flounderBindings = [ "e10k_vf", "net_queue_manager" ],
                       flounderExtraBindings = [ ("e10k_vf", ["rpcclient"]) ],
                       flounderDefs = [ "e10k_vf" ],
                       flounderExtraDefs = [ ("e10k_vf",["rpcclient"]) ],
@@ -82,7 +82,7 @@
 
   build application { target = "e10k_queue_elb",
                       cFiles = [ "e10k_qdriver.c", "helper.c" ],
-                      flounderBindings = [ "net_queue_manager", "net_soft_filters", "e10k" ],
+                      flounderBindings = [ "net_queue_manager", "net_soft_filters", "e10k", "e10k_vf" ],
                       --flounderBindings = [ "e10k" ],
                       mackerelDevices = [ "e10k", "e10k_q" ],
                       addLibraries = libDeps ["ethernet_latency_benchmark", "bench",

diff --git a/usr/fish/Hakefile b/usr/fish/Hakefile
index cb9e753..d680d38 100644 (file)
--- a/usr/fish/Hakefile
+++ b/usr/fish/Hakefile
@@ -22,7 +22,7 @@
   build application { target = "fish",
                       cFiles = [ "fish_common.c", "fish_arm.c", "font.c" ],
                       flounderExtraBindings = [("octopus", ["rpcclient"])],
-                      addLibraries = libDeps ["trace", "skb", "vfs", "lwip", "octopus" ],
+                      addLibraries = libDeps ["trace", "skb", "vfs_ramfs", "lwip", "octopus" ],
                       flounderBindings = [ "pixels" ],
                       architectures = [  "armv7" ]
                     }

diff --git a/usr/kaluga/Hakefile b/usr/kaluga/Hakefile
index b6b66d7..aceca23 100644 (file)
--- a/usr/kaluga/Hakefile
+++ b/usr/kaluga/Hakefile
@@ -12,12 +12,22 @@
 
 [ build application { target = "kaluga",
                       cFiles = (find withSuffices [".c"]),
-                         flounderDefs = [ "monitor" ],
+                      flounderDefs = [ "monitor" ],
                       flounderBindings = [ "octopus" ],
                       flounderExtraDefs = [ ("monitor_blocking",["rpcclient"]) ],
                       flounderTHCStubs = [ "octopus" ],
                       addLibraries = libDeps [ "skb", "octopus", "vfs",
                                                "spawndomain", "elf", "mm",
                                                "trace" ],
-                      architectures = [ "x86_64", "x86_32", "armv7" ] }
+                      architectures = [ "x86_64", "x86_32" ] },
+ build application { target = "kaluga",
+                      cFiles = (find withSuffices [".c"]),
+                      flounderDefs = [ "monitor" ],
+                      flounderBindings = [ "octopus" ],
+                      flounderExtraDefs = [ ("monitor_blocking",["rpcclient"]) ],
+                      flounderTHCStubs = [ "octopus" ],
+                      addLibraries = libDeps [ "skb", "octopus", "vfs_ramfs",
+                                               "spawndomain", "elf", "mm",
+                                               "trace" ],
+                      architectures = [ "armv7" ] }
 ]

diff --git a/usr/spawnd/Hakefile b/usr/spawnd/Hakefile
index e87fda1..5547468 100644 (file)
--- a/usr/spawnd/Hakefile
+++ b/usr/spawnd/Hakefile
@@ -11,11 +11,21 @@
 --------------------------------------------------------------------------
 
 [ build application { target = "spawnd",
-                     cFiles = [ "main.c", "service.c", "ps.c" ],
-                     addLibraries = libDeps [ "spawndomain", "elf", "trace", "skb",
-                                       "dist", "vfs", "lwip" ],
-                     flounderDefs = [ "monitor", "monitor_blocking" ],
+                      cFiles = [ "main.c", "service.c", "ps.c" ],
+                      addLibraries = libDeps [ "spawndomain", "elf", "trace", "skb",
+                                               "dist", "vfs_noblockdev", "lwip" ],
+                      flounderDefs = [ "monitor", "monitor_blocking" ],
                       flounderExtraDefs = [ ("monitor_blocking",["rpcclient"]) ],
-                     flounderBindings = [ "spawn" ]
+                      flounderBindings = [ "spawn" ],
+                      architectures = [ "x86_64", "x86_32" ]
+                    },
+  build application { target = "spawnd",
+                      cFiles = [ "main.c", "service.c", "ps.c" ],
+                      addLibraries = libDeps [ "spawndomain", "elf", "trace", "skb",
+                                       "dist", "vfs_ramfs", "lwip" ],
+                      flounderDefs = [ "monitor", "monitor_blocking" ],
+                      flounderExtraDefs = [ ("monitor_blocking",["rpcclient"]) ],
+                      flounderBindings = [ "spawn" ],
+                      architectures = [ "armv5", "armv7", "armv8" ]
                     }
 ]

diff --git a/usr/startd/Hakefile b/usr/startd/Hakefile
index ad7938f..d3ba6f2 100644 (file)
--- a/usr/startd/Hakefile
+++ b/usr/startd/Hakefile
@@ -11,8 +11,15 @@
 --------------------------------------------------------------------------
 
 [ build application { target = "startd",
-                     cFiles = [ "main.c", "spawn.c" ],
-                     addLibraries = libDeps [ "spawndomain", "elf", "trace",
-                                       "dist", "vfs", "lwip" ]
+                      cFiles = [ "main.c", "spawn.c" ],
+                      addLibraries = libDeps [ "spawndomain", "elf", "trace",
+                                       "dist", "vfs" ],
+                      architectures = [ "x86_64", "x86_32" ]
+                   },
+ build application { target = "startd",
+                     cFiles = [ "main.c", "spawn.c" ],
+                     addLibraries = libDeps [ "spawndomain", "elf", "trace",
+                                       "dist", "vfs_ramfs" ],
+                     architectures = [ "armv5", "armv7", "armv8" ]
                    }
 ]

diff --git a/usr/tests/filetests/Hakefile b/usr/tests/filetests/Hakefile
index d4067f0..bbb1f14 100644 (file)
--- a/usr/tests/filetests/Hakefile
+++ b/usr/tests/filetests/Hakefile
@@ -11,14 +11,27 @@
 [
   build application { target = "fread_test",
                       cFiles = [ "fread_test.c" ],
-                      addLibraries = libDeps ["vfs", "lwip" ]
+                      addLibraries = libDeps ["vfs", "lwip" ],
+                      architectures = [ "x86_64", "x86_32" ]
                     },
   build application { target = "fscanf_test",
                       cFiles = [ "fscanf_test.c" ],
-                      addLibraries = libDeps ["vfs", "lwip" ]
+                      addLibraries = libDeps ["vfs", "lwip" ],
+                      architectures = [ "x86_64", "x86_32" ]
+                    },
+  build application { target = "fread_test",
+                      cFiles = [ "fread_test.c" ],
+                      addLibraries = libDeps ["vfs_ramfs" ],
+                      architectures = [ "armv5", "armv7", "armv8" ]
+                    },
+  build application { target = "fscanf_test",
+                      cFiles = [ "fscanf_test.c" ],
+                      addLibraries = libDeps ["vfs_ramfs" ],
+                      architectures = [ "armv5", "armv7", "armv8" ]
                     },
   build application { target = "fat_test",
                       cFiles = [ "fat_test.c" ],
-                      addLibraries = libDeps ["vfs", "lwip" ]
+                      addLibraries = libDeps ["vfs", "lwip" ],
+                      architectures = [ "x86_64", "x86_32" ]
                     }
   ]