armv8: fixing menu.lst files and adding bootdriver to the platforms

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

diff --git a/hake/menu.lst.armv8_a57v b/hake/menu.lst.armv8_a57v
index dc3a6d6..bf403fe 100644 (file)
--- a/hake/menu.lst.armv8_a57v
+++ b/hake/menu.lst.armv8_a57v
@@ -2,12 +2,12 @@
 # This script is used to describe the commands to start at
 # boot-time and the arguments they should receive.
 #
-
-kernel /armv8/sbin/cpu_a57v loglevel=3 serial=0x9000000 gicdist=0x8000000 gic=0x8010000
+bootdriver  /armv8/sbin/boot_armv8_generic
+cpudriver /armv8/sbin/cpu_a57v loglevel=3 serial=0x9000000 gicdist=0x8000000 gic=0x8010000
 stack 131072
 module /armv8/sbin/init
 
-# Domains spawned by init75
+# Domains spawned by init
 module /armv8/sbin/mem_serv
 module /armv8/sbin/monitor
 

diff --git a/hake/menu.lst.armv8_a57v_1 b/hake/menu.lst.armv8_a57v_1
index 87914be..a134dae 100644 (file)
--- a/hake/menu.lst.armv8_a57v_1
+++ b/hake/menu.lst.armv8_a57v_1
@@ -2,8 +2,8 @@
 # This script is used to describe the commands to start at
 # boot-time and the arguments they should receive.
 #
-
-kernel /armv8/sbin/cpu_a57v loglevel=3 serial=0x1c090000 gicdist=0x8000000 gic=0x8010000 timeslice=80
+bootdriver  /armv8/sbin/boot_armv8_generic
+cpudriver /armv8/sbin/cpu_a57v loglevel=3 serial=0x1c090000 gicdist=0x8000000 gic=0x8010000 timeslice=80
 stack 131072
 module /armv8/sbin/init
 

diff --git a/hake/menu.lst.armv8_apm88xxxx b/hake/menu.lst.armv8_apm88xxxx
index fe73833..054f358 100644 (file)
--- a/hake/menu.lst.armv8_apm88xxxx
+++ b/hake/menu.lst.armv8_apm88xxxx
@@ -3,7 +3,7 @@
 # boot-time and the arguments they should receive.
 #
 
-bootdrive /armv8/sbin/boot_armv8_generic
+bootdriver /armv8/sbin/boot_armv8_generic
 cpudriver /armv8/sbin/cpu_apm88xxxx loglevel=3
 
 module /armv8/sbin/init

diff --git a/hake/menu.lst.armv8_cn88xx b/hake/menu.lst.armv8_cn88xx
index 3bc0062..276532c 100644 (file)
--- a/hake/menu.lst.armv8_cn88xx
+++ b/hake/menu.lst.armv8_cn88xx
@@ -3,7 +3,7 @@
 # boot-time and the arguments they should receive.
 #
 
-bootdrive /armv8/sbin/boot_armv8_generic
+bootdriver /armv8/sbin/boot_armv8_generic
 cpudriver /armv8/sbin/cpu_cn88xx loglevel=3
 
 module /armv8/sbin/init

diff --git a/platforms/Hakefile b/platforms/Hakefile
index e9a9b2f..c51dc9e 100644 (file)
--- a/platforms/Hakefile
+++ b/platforms/Hakefile
@@ -413,7 +413,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
       "Xeon Phi build with benchmarks and test suites",
 
     platform "QEMU" [ "armv8" ]
-      ([ ("armv8", "/sbin/cpu_a57v") ]
+      ([ ("armv8", "/sbin/cpu_a57v"), ("armv8", "/sbin/boot_armv8_generic")  ]
        ++
        [ ("armv8", f) | f <- armv8_modules ]
        ++
@@ -621,6 +621,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
       Str "--hagfish", Str Config.hagfish_location ]
       ++ [(Dep BuildTree "armv8" f) | f <- armv8_modules ]
       ++ [(Dep BuildTree "armv8" "/sbin/cpu_a57v")]
+      ++ [(Dep BuildTree "armv8" "/sbin/boot_armv8_generic")]
       ++ [(Dep BuildTree "" f) | f <- modules_generic ])
     "Boot QEMU in 64-bit ARM mode emulating a ARM Virtual Machine",
 
@@ -632,6 +633,7 @@ let bin_rcce_lu = [ "/sbin/" ++ f | f <- [
       Str "--debug", In SrcTree "tools" "/tools/debug.armv8.gdb" ]
       ++ [(Dep BuildTree "armv8" f) | f <- armv8_modules ]
       ++ [(Dep BuildTree "armv8" "/sbin/cpu_a57v")]
+      ++ [(Dep BuildTree "armv8" "/sbin/boot_armv8_generic")]
       ++ [(Dep BuildTree "" f) | f <- modules_generic ])
     "Boot QEMU in 64-bit ARM mode emulating a ARM Virtual Machine",
 

diff --git a/tools/qemu-wrapper.sh b/tools/qemu-wrapper.sh
index 5ddcd50..a0c17be 100755 (executable)
--- a/tools/qemu-wrapper.sh
+++ b/tools/qemu-wrapper.sh
@@ -180,7 +180,7 @@ case "$ARCH" in
        mkdir -p qemu-efi/armv8/sbin
        # create the startup script
        echo "\\Hagfish.efi Hagfish.cfg" > qemu-efi/startup.nsh
-       chmod +x startup.nsh
+       chmod +x qemu-efi/startup.nsh
        # setup hagfish location
        cp $HAGFISH_LOCATION qemu-efi/Hagfish.efi
        cp platforms/arm/menu.lst.armv8_a57v qemu-efi/Hagfish.cfg