Change boot configuration for novabox. More memory for hypervisor, no autoboot tasks...

diff --git a/build/boot-linux b/build/boot-linux
index a925e289ae436f4b20594d0ea61a2b687683542b..0b4b573e8a3e3741208690a36af0772a18e443ba 100755 (executable)
--- a/build/boot-linux
+++ b/build/boot-linux
@@ -1,6 +1,6 @@
 #!/usr/bin/env novaboot
 
 # 
-load buildroot/images/bzImage memmap=0x4200000$0x3b000000 nohpet
+load buildroot/images/bzImage console=ttyS2,115200  memmap=0x7C00000$0x37600000 nohpet intel_iommu=off
 load buildroot/images/rootfs.cpio.gz
 

diff --git a/buildroot-overlay/etc/inittab b/buildroot-overlay/etc/inittab
index dced2e5be90950122a391918a8ac76f70582e437..266eb00e0c7bd4f547376701039e39f4fb0d2726 100644 (file)
--- a/buildroot-overlay/etc/inittab
+++ b/buildroot-overlay/etc/inittab
@@ -24,8 +24,8 @@ null::sysinit:/bin/hostname -F /etc/hostname
 ::sysinit:/etc/init.d/rcS
 
 # Put a getty on the serial port
-#console::respawn:/sbin/getty -L  console 0 vt100 # GENERIC_SERIAL
-console::respawn:/bin/login root ttyS0 </dev/ttyS0 >/dev/tty0 2>&1
+console::respawn:/sbin/getty -L console 115200 vt100 # GENERIC_SERIAL
+#console::respawn:/bin/login root ttyS2 </dev/ttyS2 >/dev/tty2 2>&1
 #Stuff to do for the 3-finger salute
 ::ctrlaltdel:/sbin/reboot
 

diff --git a/buildroot-overlay/etc/profile.d/S22starttask.sh b/buildroot-overlay/etc/profile.d/S22starttask.sh
index e1ea75e52ed8217ae9547d890074e8e3c8a4117c..e87ad3aba9429270d0bcb13ea19ceaed966a8f30 100755 (executable)
--- a/buildroot-overlay/etc/profile.d/S22starttask.sh
+++ b/buildroot-overlay/etc/profile.d/S22starttask.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-set -e;
 #/root/jailhouse-init-novabox.sh
-/root/jailhouse-init-qemu.sh
+#/root/jailhouse-init-qemu.sh
 #exec /root/fiasco-ferret-bench.sh
-exec /root/fiasco-bench.sh
+#exec /root/fiasco-bench.sh
 #exec /root/hpet-demo-test.sh

diff --git a/qemu-launch-scripts/S22starttask.sh.lk b/qemu-launch-scripts/S22starttask.sh.lk
new file mode 100755 (executable)
index 0000000..e87ad3a
--- /dev/null
+++ b/qemu-launch-scripts/S22starttask.sh.lk
@@ -0,0 +1,6 @@
+#!/bin/bash
+#/root/jailhouse-init-novabox.sh
+#/root/jailhouse-init-qemu.sh
+#exec /root/fiasco-ferret-bench.sh
+#exec /root/fiasco-bench.sh
+#exec /root/hpet-demo-test.sh