Merge branch 'caps_next'
[barrelfish] / platforms / Hakefile
index 7271e9b..22e8457 100644 (file)
@@ -7,10 +7,10 @@
 -- ETH Zurich D-INFK, Universitaetstr. 6, CH-8092 Zurich. Attn: Systems Group.
 --
 -- Hakefile for /platforms/
--- 
+--
 --------------------------------------------------------------------------
 
-let bin_rcce_lu = [ "/sbin/" ++ f | f <- [ 
+let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                         "rcce_lu_A1",
                         "rcce_lu_A2",
                         "rcce_lu_A4",
@@ -19,7 +19,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                         "rcce_lu_A32",
                         "rcce_lu_A64" ]]
 
-    bin_rcce_bt = [ "/sbin/" ++ f | f <- [ 
+    bin_rcce_bt = [ "/sbin/" ++ f | f <- [
                         "rcce_bt_A1",
                         "rcce_bt_A4",
                         "rcce_bt_A9",
@@ -29,8 +29,6 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
 
     tests_common = [ "/sbin/" ++ f | f <- [
                         "fputest",
-                        "fread_test",
-                        "fscanf_test",
                         "hellotest",
                         "idctest",
                         "memtest",
@@ -42,12 +40,14 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                         "testerror",
                         "yield_test" ] ]
 
-    tests_x86 = [ "/sbin/" ++ f | f <- [ 
+    tests_x86 = [ "/sbin/" ++ f | f <- [
                         "tests/luatest",
                         "tests/numatest" ] ] ++ tests_common
 
-    tests_x86_64 = [ "/sbin/" ++ f | f <- [ 
+    tests_x86_64 = [ "/sbin/" ++ f | f <- [
                         "arrakis_hellotest",
+                        "fread_test",
+                        "fscanf_test",
                         "ata_rw28_test",
                         "bomp_cpu_bound",
                         "bomp_cpu_bound_progress",
@@ -83,7 +83,10 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                         "xcorecap",
                         "xcorecapserv" ] ] ++ tests_x86
 
-    tests_x86_32 = tests_x86
+    tests_x86_32 = [ "/sbin/" ++ f | f <- [
+                    "fread_test",
+                    "fscanf_test"
+                    ] ] ++ tests_x86
 
     tests_k1om = [ "/sbin/" ++ f | f <- [
                         "tests/dma_test",
@@ -91,14 +94,14 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                         "tests/xeon_phi_test",
                         "tests/xphi_nameservice_test" ] ] ++ tests_x86
 
-    bench_common = [ "/sbin/" ++ f | f <- [ 
+    bench_common = [ "/sbin/" ++ f | f <- [
                         "channel_cost_bench",
                         "flounder_stubs_buffer_bench",
                         "flounder_stubs_empty_bench",
                         "flounder_stubs_payload_bench",
                         "xcorecapbench" ]]
 
-    bench_x86 =  [ "/sbin/" ++ f | f <- [ 
+    bench_x86 =  [ "/sbin/" ++ f | f <- [
                       "multihop_latency_bench",
                       "net_openport_test",
                       "perfmontest",
@@ -112,8 +115,8 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                       "ump_send",
                       "ump_throughput" ]]
 
-    bench_x86_64 = bench_x86 ++ bin_rcce_bt ++ bin_rcce_lu ++ 
-                   [ "/sbin/" ++ f | f <- [ 
+    bench_x86_64 = bench_x86 ++ bin_rcce_bt ++ bin_rcce_lu ++
+                   [ "/sbin/" ++ f | f <- [
                         "ahci_bench",
                         "apicdrift_bench",
                         "benchmarks/bomp_mm",
@@ -145,7 +148,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
 
     bench_x86_32 = bench_x86 ++ bin_rcce_bt ++ bin_rcce_lu
 
-    bench_k1om = [ "/sbin/" ++ f | f <- [ 
+    bench_k1om = [ "/sbin/" ++ f | f <- [
                         "benchmarks/bomp_mm",
                         "benchmarks/dma_bench",
                         "benchmarks/xomp_share",
@@ -155,7 +158,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                         "benchmarks/xphi_xump_bench" ] ] ++ bench_x86
 
     -- Default list of modules to build/install for all enabled architectures
-    modules_common = [ "/sbin/" ++ f | f <- [ 
+    modules_common = [ "/sbin/" ++ f | f <- [
                           "init",
                           "chips",
                           "skb",
@@ -172,8 +175,8 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
         "/sshd_ramfs.cpio.gz" ]
 
     -- x86_64-specific modules to build by default
-    -- this should shrink as targets are ported and move into the generic list above 
-    modules_x86_64  = [ "/sbin/" ++ f | f <- [ 
+    -- this should shrink as targets are ported and move into the generic list above
+    modules_x86_64  = [ "/sbin/" ++ f | f <- [
                            "elver",
                            "cpu",
                            "acpi",
@@ -223,17 +226,17 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                            "xeon_phi",
                            "xeon_phi_mgr"
                            ]] ++ modules_common
-    
+
     -- the following are broken in the newidc system
-    modules_x86_64_broken  = [ "/sbin/" ++ f | f <- [ 
+    modules_x86_64_broken  = [ "/sbin/" ++ f | f <- [
                                   "barriers",
                                   "ipi_bench",
                                   "ring_barriers",
                                   "ssf_bcast",
                                   "lamport_bcast" ]]
-                             
+
     -- x86-32-specific module to build by default
-    modules_x86_32  = [ "/sbin/" ++ f | f <- [ 
+    modules_x86_32  = [ "/sbin/" ++ f | f <- [
                            "cpu",
                            "lpc_kbd",
                            "serial",
@@ -337,7 +340,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
    --
    -- Rules to build assorted platforms
    --
-   
+
     platform "X86_64_Basic" [ "x86_64" ]
       ([ ("x86_64", f) | f <- modules_x86_64 ]
        ++
@@ -395,7 +398,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
     platform "PandaboardES" [ "armv7" ]
     ([ ("armv7", f) | f <- pandaModules ] ++ [ ("root", "/pandaboard_image") ])
     "Standard Pandaboard ES build image and modules",
-    
+
     platform "ARMv8-GEM5" [ "armv8" ]
     ([ ("armv8", f) | f <- armv8_gem5Modules ] ++ [ ("root", "/armv8_gem5_image") ])
     "GEM5 emulator for ARM Cortex-A series multicore processors",
@@ -419,11 +422,11 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
     --
     -- Rules to build assorted boot images
     --
-    
+
     -- Build the default PandaBoard boot image
     Rule ([ In SrcTree "tools" "/tools/arm_molly/build_pandaboard_image.sh",
-            Str "--srcdir",   NoDep SrcTree "root" "/.", 
-            Str "--builddir", NoDep BuildTree "root" "/.", 
+            Str "--srcdir",   NoDep SrcTree "root" "/.",
+            Str "--builddir", NoDep BuildTree "root" "/.",
             Str "--arch armv7-a",
             Str "--menu",     In SrcTree "tools" "/hake/menu.lst.pandaboard",
             Str "--baseaddr", Str "0x82001000",
@@ -435,7 +438,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
 
     -- Build the (old) PandaBoard Cortex-M3 image
     Rule ([ In SrcTree "tools" "/tools/arm_molly/build_pandaboard_image.sh",
-            Str "--srcdir",   NoDep SrcTree "root" "/.", 
+            Str "--srcdir",   NoDep SrcTree "root" "/.",
             Str "--builddir", NoDep BuildTree "root" "/.",
             Str "--arch armv7-m",
             Str "--menu",     In SrcTree "tools" "/hake/menu.lst.armv7-m",
@@ -459,8 +462,8 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
 
     -- Build the ARMv7 GEM5 simulation image
     Rule ([ In SrcTree "tools" "/tools/arm_molly/build_pandaboard_image.sh",
-            Str "--srcdir",   NoDep SrcTree "root" "/.", 
-            Str "--builddir", NoDep BuildTree "root" "/.", 
+            Str "--srcdir",   NoDep SrcTree "root" "/.",
+            Str "--builddir", NoDep BuildTree "root" "/.",
             Str "--arch armv7-a",
             Str "--menu",     In SrcTree "tools" "/hake/menu.lst.arm_gem5_mc",
             Str "--baseaddr", Str "0x100000",
@@ -472,8 +475,8 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
 
     -- Build the ARMv8 GEM5 simulation image
     Rule ([ In SrcTree "tools" "/tools/arm_molly/build_pandaboard_image.sh",
-            Str "--srcdir",   NoDep SrcTree "root" "/.", 
-            Str "--builddir", NoDep BuildTree "root" "/.", 
+            Str "--srcdir",   NoDep SrcTree "root" "/.",
+            Str "--builddir", NoDep BuildTree "root" "/.",
             Str "--arch armv8-a",
             Str "--menu",     In SrcTree "tools" "/hake/menu.lst.armv8_gem5",
             Str "--baseaddr", Str "0x100000",
@@ -510,7 +513,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
     Rules [ copyFile SrcTree "root" ("/hake/menu.lst." ++ p)
                      "root" ("/platforms/x86/menu.lst." ++ p)
             | p <- [ "x86_32", "x86_64", "k1om" ] ],
-    
+
     -- Convenient functions for running GEM5
     boot "gem5_armv8" [ "armv8" ] [
       Str Config.gem5,
@@ -555,7 +558,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
       Str "--menu", In BuildTree "root" "/platforms/x86/menu.lst.x86_64",
       Str "--arch", Str "x86_64" ]
     "Boot QEMU in 64-bit x86 mode emulating a PC",
-    
+
     boot "qemu_x86_32" [ "x86_32" ] [
       In SrcTree "tools" "/tools/qemu-wrapper.sh",
       Str "--menu", In BuildTree "root" "/platforms/x86/menu.lst.x86_32",
@@ -568,7 +571,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
       Str "--arch", Str "x86_64",
       Str "--debug", In SrcTree "tools" "/tools/debug.gdb" ]
     "Boot QEMU under GDB in 64-bit x86 mode emulating a PC",
-    
+
     boot "qemu_x86_32_debug" [ "x86_32" ] [
       In SrcTree "tools" "/tools/qemu-wrapper.sh",
       Str "--menu", In BuildTree "root" "/platforms/x86/menu.lst.x86_32",