l4: Improve benchmark.

update-all-script: Comment unused code.

diff --git a/build/boot-l4 b/build/boot-l4
index c98e87588d7ea299e8e5b87b0c1e3fdd6c9382db..643bec8dae5b76545c65d9da02759f41e26839c1 100755 (executable)
--- a/build/boot-l4
+++ b/build/boot-l4
@@ -1,4 +1,5 @@
 #!/usr/bin/env novaboot
 
-load l4/l4re/images/bootstrap.elf
+load benchmarks-stuff/bootstrap_bench.elf -maxmem=51M
+
 

diff --git a/build/l4/ferret-modules.list b/build/l4/ferret-modules.list
index e8f835d4ab0d99c69545e468da85fd967c82dbaa..b11db2052ea9c43d1f584a79c2b93cfc7c4ec553 100644 (file)
--- a/build/l4/ferret-modules.list
+++ b/build/l4/ferret-modules.list
@@ -28,8 +28,6 @@ module ferret_sensor_dir
 
 entry bench
 kernel fiasco -serial_esc
-roottask moe rom/bench.cfg
+roottask moe --init=rom/benchmark
 module l4re
-module ned
-module bench.cfg
 module benchmark

diff --git a/qemu-launch-scripts/update-inmates-and-overlay.sh b/qemu-launch-scripts/update-inmates-and-overlay.sh
index 6f5a65b330247a6fabb0601c82bc0d955b8fab1a..8c87b72088b84201edb189cc5a77b216760c1460 100755 (executable)
--- a/qemu-launch-scripts/update-inmates-and-overlay.sh
+++ b/qemu-launch-scripts/update-inmates-and-overlay.sh
@@ -20,12 +20,12 @@ cp ./configs/*.cell ../buildroot-overlay/jailhouse/configs/
 echo "remake bootstrap and objcopy it to overlay.."
 cd ../build/l4
 make hello
-make benchmarks
+#make benchmarks
 make bench
 cd l4re/pkg/bootstrap_custom
 objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap-jh.bin
 objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap_hello.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap_hello-jh.bin
-objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap_ferret-bench.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap_ferret-bench-jh.bin
+#objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap_ferret-bench.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap_ferret-bench-jh.bin
 objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap_bench.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap_bench-jh.bin
 
 echo "Update rootfs..."