Platforms: drop ARMv8 GEM5 targets
authorReto Achermann <reto.achermann@inf.ethz.ch>
Sat, 25 Feb 2017 09:18:16 +0000 (10:18 +0100)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Thu, 16 Mar 2017 07:14:52 +0000 (08:14 +0100)
Signed-off-by: Reto Achermann <reto.achermann@inf.ethz.ch>

platforms/Hakefile

index 160a427..92f7fa5 100644 (file)
@@ -324,22 +324,6 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                      "memtest"
                      ] ]
 
-    -- ARMv8 modules for running under GEM5
-    armv8_gem5Modules = [ "/sbin/" ++ f | f <- [
-                       "cpu_gem5",
-                       "init",
-                       "mem_serv",
-                       "monitor",
-                       "ramfsd",
-                       "spawnd",
-                       "startd",
-                       -- "corectrl",
-                       "skb",
-                       "memtest",
-                       "serial_pl011",
-                       "fish",
-                       "angler"
-                       ] ]
 
     -- ARMv8 modules for running under QEMU
     armv8_modules= [ "/sbin/" ++ f | f <- [
@@ -531,19 +515,6 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
     -- Build the Zynq7000 image
     armv7Image "armv7_zynq7" "zynq7" "zynq7" "0x00000000" zynq7Modules,
 
-    -- Build the ARMv8 GEM5 simulation image
-    Rule ([ In SrcTree "tools" "/tools/arm_molly/build_molly_image.sh",
-            Str "--srcdir",   NoDep SrcTree "root" "/.",
-            Str "--builddir", NoDep BuildTree "root" "/.",
-            Str "--arch armv8-a",
-            Str "--menu",     In BuildTree "root" "/platforms/arm/menu.lst.armv8_gem5",
-            Str "--baseaddr", Str "0x100000",
-            Str "--image",    Out "root" "/armv8_gem5_image",
-            Str "--gcc",      Str Config.aarch64_cc,
-            Str "--objcopy",  Str Config.aarch64_objcopy,
-            Dep BuildTree "tools" "/bin/arm_molly"
-          ] ++ [ (Dep BuildTree "armv8" m) | m <- armv8_gem5Modules ]),
-
     --
     -- Booting: various targets for booting Barrelfish under different circumstances
     --
@@ -566,26 +537,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                      "root" ("/platforms/x86/menu.lst." ++ p)
             | p <- [ "x86_64", "k1om" ] ],
 
-    -- Convenient functions for running GEM5
-    boot "gem5_armv8" [ "armv8" ] [
-      Str Config.gem5,
-      In SrcTree "tools" "/tools/aarch64_gem5/gem5script.py",
-      Str "--caches",
-      Str "--l2cache",
-      Str "--n=1",
-      NStr "--kernel=", In BuildTree "root" "/armv8_gem5_image" ]
-    "Boot an ARMv8 single core image in GEM5",
-
-    boot "gem5_armv8_detailed" [ "armv8" ] [
-      Str Config.gem5,
-      In SrcTree "tools" "/tools/aarch64_gem5/gem5script.py",
-      Str "--caches",
-      Str "--l2cache",
-      Str "--n=1",
-      Str "--cpu-type=arm_detailed",
-      NStr "--kernel=", In BuildTree "root" "/armv8_gem5_image" ]
-    "Boot an ARMv8 single core image in GEM5 using a detailed CPU model",
-
+   
     boot "gem5_armv7_vexpressemm" [ "armv7" ] [
       In SrcTree "tools" "/tools/arm_gem5/boot_gem5.sh",
       Str "VExpress_EMM",