From 0245bb43f486dd424a9eeeb4ebc0503cec99f8d0 Mon Sep 17 00:00:00 2001 From: Maxim Baryshnikov Date: Sun, 15 May 2016 12:31:18 +0200 Subject: [PATCH] build: l4: Add new target "make bench-bare" for launching fiasco without hypervisor. Change other targets according to modifications in l4/l4 Makefile. --- build/boot-l4 | 2 +- build/l4/Makefile | 16 +++++++++++----- build/l4/ferret-modules.list | 6 ++++++ l4 | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/build/boot-l4 b/build/boot-l4 index 643bec8..5746be9 100755 --- a/build/boot-l4 +++ b/build/boot-l4 @@ -1,5 +1,5 @@ #!/usr/bin/env novaboot -load benchmarks-stuff/bootstrap_bench.elf -maxmem=51M +load l4/l4re/bin/x86_pentium/bootstrap_bench-bare.elf -maxmem=51M diff --git a/build/l4/Makefile b/build/l4/Makefile index 318eaf1..ca3244e 100644 --- a/build/l4/Makefile +++ b/build/l4/Makefile @@ -7,8 +7,10 @@ help: @echo " fiasco-config - Reconfigure Fiasco kernel" @echo " l4re - Build L4 runtime environment" @echo " l4re-config - Reconfigure L4 runtime environment" - @echo " hello - Build image with hello entry" - @echo " benchmarks - (Re)Build ferret directory & prepare image with benchmarks" + @echo " hello - Build image with hello entry for jailhouse" + @echo " benchmarks - (Re)Build ferret directory & prepare image with ferret scalar demo" + @echo " bench - (Re)Build benchmark directory & prepare image with benchmark for jailhouse" + @echo " bench-bare - (Re)Build benchmark directory & prepare image with benchmark for bare hardware launch" .NOTPARALLEL: @@ -72,15 +74,19 @@ l4re/.stamp-jh: .PHONY: hello hello: - $(MAKE) -C l4re MODULE_SEARCH_PATH=$(CURDIR)/fiasco E=hello elfimage + $(MAKE) -C l4re MODULE_SEARCH_PATH=$(CURDIR)/fiasco E=hello BOOTSTRAP_PKG=bootstrap_custom elfimage .PHONY: benchmarks benchmarks: $(MAKE) -C l4re MODULE_SEARCH_PATH=$(CURDIR)/fiasco S=pkg/ferret:pkg/ferret/examples/monitors/simple_mon_re - $(MAKE) -C l4re MODULES_LIST=$(CURDIR)/ferret-modules.list MODULE_SEARCH_PATH=$(CURDIR)/fiasco:$(CURDIR)/ned-confs/ E=ferret-bench elfimage + $(MAKE) -C l4re MODULES_LIST=$(CURDIR)/ferret-modules.list MODULE_SEARCH_PATH=$(CURDIR)/fiasco:$(CURDIR)/ned-confs/ E=ferret-bench BOOTSTRAP_PKG=bootstrap_custom elfimage .PHONY: bench bench: $(MAKE) -C l4re MODULE_SEARCH_PATH=$(CURDIR)/fiasco S=pkg/benchmark - $(MAKE) -C l4re MODULES_LIST=$(CURDIR)/ferret-modules.list MODULE_SEARCH_PATH=$(CURDIR)/fiasco:$(CURDIR)/ned-confs/ E=bench elfimage + $(MAKE) -C l4re MODULES_LIST=$(CURDIR)/ferret-modules.list MODULE_SEARCH_PATH=$(CURDIR)/fiasco:$(CURDIR)/ned-confs/ E=bench BOOTSTRAP_PKG=bootstrap_custom elfimage +.PHONY: bench-bare +bench-bare: + $(MAKE) -C l4re MODULE_SEARCH_PATH=$(CURDIR)/fiasco S=pkg/benchmark + $(MAKE) -C l4re MODULES_LIST=$(CURDIR)/ferret-modules.list MODULE_SEARCH_PATH=$(CURDIR)/fiasco:$(CURDIR)/ned-confs/ E=bench-bare BOOTSTRAP_PKG=bootstrap elfimage diff --git a/build/l4/ferret-modules.list b/build/l4/ferret-modules.list index b11db20..64e11b4 100644 --- a/build/l4/ferret-modules.list +++ b/build/l4/ferret-modules.list @@ -31,3 +31,9 @@ kernel fiasco -serial_esc roottask moe --init=rom/benchmark module l4re module benchmark + +entry bench-bare +kernel fiasco -serial_esc +roottask moe --init=rom/benchmark +module l4re +module benchmark diff --git a/l4 b/l4 index 90396b8..fb3ab8c 160000 --- a/l4 +++ b/l4 @@ -1 +1 @@ -Subproject commit 90396b8a810cec43686e3355b43bf290248beb4c +Subproject commit fb3ab8c986aa897e3f3d1e5e5f191af3978a921c -- 2.39.2