l4: Makefile: Add the entry for build the ferret demo.

diff --git a/build/l4/Makefile b/build/l4/Makefile
index 0b609fd61c5d505bb7261829c1cbaa98917e5d7b..2a5ef571c77905a321bebf43d4dee39cc627c2fc 100644 (file)
--- a/build/l4/Makefile
+++ b/build/l4/Makefile
@@ -8,6 +8,7 @@ help:
        @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"
 
 .NOTPARALLEL:
 
@@ -46,7 +47,7 @@ l4re-core/libstdc++-v3-minimal l4re-core/libsupc++                    \
 l4re-core/libsupc++-minimal l4re-core/lua l4re-core/moe l4re-core/ned  \
 l4re-core/sigma0 l4re-core/uclibc l4re-core/uclibc-headers             \
 l4re-core/uclibc-minimal libedid libirq libvcpu loader log lxfuxlibc   \
-rtc shmc x86emu
+rtc shmcKE) -C l4re MODULE_SEARCH_PATH=$(CURDIR)/fiasco E=hello elfimage x86emu
 
 .PHONY: l4re
 l4re: l4re/.kconfig
@@ -72,3 +73,8 @@ l4re/.stamp-jh:
 .PHONY: hello
 hello:
        $(MAKE) -C l4re MODULE_SEARCH_PATH=$(CURDIR)/fiasco E=hello 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

diff --git a/build/l4/ferret-modules.list b/build/l4/ferret-modules.list
index f1db0ef95e677b10b6407c0c2accf1e98f831204..53ae50574eec637907d9f567d010e2472d4e0acf 100644 (file)
--- a/build/l4/ferret-modules.list
+++ b/build/l4/ferret-modules.list
@@ -16,12 +16,12 @@ module ned
 module fer_scalar_demo
 module ferret_sensor_dir
 
-entry ferret-merge-mon
+entry ferret-bench
 kernel fiasco -serial_esc
 roottask moe rom/ferret-mm.cfg
 module ferret-mm.cfg
 module l4re
 module ned
 module fer_scalar_demo
-module fer_merge_mon
+module fer_simple_mon
 module ferret_sensor_dir