ARMv7: FVP A15 starts in secure mode, so use the right timer IRQ.

Signed-off-by: David Cock <david.cock@inf.ethz.ch>

diff --git a/hake/menu.lst.armv7_a15ve_fvp_1 b/hake/menu.lst.armv7_a15ve_fvp_1
index 8321f57..c61f11c 100644 (file)
--- a/hake/menu.lst.armv7_a15ve_fvp_1
+++ b/hake/menu.lst.armv7_a15ve_fvp_1
@@ -9,7 +9,7 @@ timeout 0
 
 title  Barrelfish
 #root  (nd)
-kernel /armv7/sbin/cpu_a15ve loglevel=4 periphbase=0x2c000000 cntfrq=100000000 consolePort=0
+kernel /armv7/sbin/cpu_a15ve loglevel=4 periphbase=0x2c000000 cntfrq=100000000 consolePort=0 timerirq=29
 module /armv7/sbin/cpu_a15ve
 module /armv7/sbin/init
 

diff --git a/hake/menu.lst.armv7_a15ve_fvp_4 b/hake/menu.lst.armv7_a15ve_fvp_4
index a6ffb37..c3ae307 100644 (file)
--- a/hake/menu.lst.armv7_a15ve_fvp_4
+++ b/hake/menu.lst.armv7_a15ve_fvp_4
@@ -9,7 +9,7 @@ timeout 0
 
 title  Barrelfish
 #root  (nd)
-kernel /armv7/sbin/cpu_a15ve loglevel=4 periphbase=0x2c000000 cntfrq=100000000 consolePort=0
+kernel /armv7/sbin/cpu_a15ve loglevel=4 periphbase=0x2c000000 cntfrq=100000000 consolePort=0 timerirq=29
 module /armv7/sbin/cpu_a15ve
 module /armv7/sbin/init