armv8: renaming menu.lst using the a57v suffix

Signed-off-by: Reto Achermann <reto.achermann@inf.ethz.ch>

diff --git a/hake/menu.lst.armv8_qemu b/hake/menu.lst.armv8_a57v
similarity index 72%
rename from hake/menu.lst.armv8_qemu
rename to hake/menu.lst.armv8_a57v
index 795f9b9..40a6699 100644 (file)
--- a/hake/menu.lst.armv8_qemu
+++ b/hake/menu.lst.armv8_a57v
@@ -3,11 +3,11 @@
 # boot-time and the arguments they should receive.
 #
 
-kernel /armv8/sbin/cpu_tmas loglevel=4 earlycon=9000000 gicv2=8000000,8010000
+kernel /armv8/sbin/cpu_a57v loglevel=4 earlycon=9000000 gicv2=8000000,8010000
 stack 131072
 module /armv8/sbin/init
 
-# Domains spawned by init
+# Domains spawned by init75
 module /armv8/sbin/mem_serv
 module /armv8/sbin/monitor
 
@@ -24,13 +24,13 @@ modulenounzip /eclipseclp_ramfs.cpio.gz nospawn
 modulenounzip /skb_ramfs.cpio.gz nospawn
 
 # Drivers
-module /armv8/sbin/corectrl auto
+# module /armv8/sbin/corectrl auto
 module /armv8/sbin/pci auto
 
 
 # General user domains
-module /armv8/sbin/serial_tmas auto portbase=2
-module /armv8/sbin/fish nospawn
-module /armv8/sbin/angler serial0.terminal xterm
+#module /armv8/sbin/serial_tmas auto portbase=2
+#module /armv8/sbin/fish nospawn
+#module /armv8/sbin/angler serial0.terminal xterm
 
 # End of file, this needs to have a certain length...

diff --git a/platforms/Hakefile b/platforms/Hakefile
index eb193d2..ad30cf0 100644 (file)
--- a/platforms/Hakefile
+++ b/platforms/Hakefile
@@ -369,15 +369,14 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
                        ] ]
 
     -- ARMv8 modules for running under QEMU
-    armv8_qemuModules = [ "/sbin/" ++ f | f <- [
-                       "cpu_tmas",
+    armv8_modules= [ "/sbin/" ++ f | f <- [
                        "init",
                        "mem_serv",
                        "monitor",
                        "ramfsd",
                        "spawnd",
                        "startd",
-                       "corectrl",
+                    -- "corectrl",  removing core control for now, as this is not suppported
                        "skb",
                        "pci",
                        "memtest",
@@ -474,10 +473,11 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
       "Xeon Phi build with benchmarks and test suites",
 
     platform "ARMv8-QEMU" [ "armv8" ]
-    ([ ("armv8", f) | f <- armv8_qemuModules ]
-        ++
-     [ ("",       f) | f <- modules_generic]
-    )
+      ([ ("armv8", "/sbin/cpu_a57v") ] 
+       ++
+       [ ("armv8", f) | f <- armv8_modules ]
+       ++
+       [ ("",       f) | f <- modules_generic])
     "ARM Virtual Machine Board with ARM Cortex A57 processors in Qemu.",
 
     platform "ARMv8-GEM5" [ "armv8" ]
@@ -586,8 +586,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
     -- Copy menu.list files across
     Rules [ copyFile SrcTree "root" ("/hake/menu.lst." ++ p)
                      "root" ("/platforms/arm/menu.lst." ++ p)
-            | p <- [ "armv8_gem5",
-                     "armv8_qemu",
+            | p <- [ "armv8_a57v",
                      "armv7_a9ve_1",
                      "armv7_a9ve_4",
                      "armv7_a15ve_1",
@@ -708,14 +707,14 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
 
     boot "qemu_a57v" [ "armv8" ] [
       In SrcTree "tools" "/tools/qemu-wrapper.sh",
-      Str "--menu", In BuildTree "root" "/platforms/arm/menu.lst.armv8_qemu",
+      Str "--menu", In BuildTree "root" "/platforms/arm/menu.lst.armv8_a57v",
       Str "--arch", Str "armv8",
       Str "--hagfish", Str Config.hagfish_location ]
     "Boot QEMU in 64-bit ARM mode emulating a ARM Virtual Machine",
 
     boot "qemu_a57v_debug" [ "armv8" ] [
       In SrcTree "tools" "/tools/qemu-wrapper.sh",
-      Str "--menu", In BuildTree "root" "/platforms/arm/menu.lst.armv8_qemu",
+      Str "--menu", In BuildTree "root" "/platforms/arm/menu.lst.armv8_a57v",
       Str "--arch", Str "armv8",
       Str "--hagfish", Str Config.hagfish_location,
       Str "--debug", In SrcTree "tools" "/tools/debug.armv8.gdb" ]