Update Muen port

- Drop unnecessary patch
- Improved build speed/parallelization
- Increased log channel size
- Fix path in base-hw/Muen documentation
This commit is contained in:
Adrian-Ken Rueegsegger 2019-05-06 15:02:17 +02:00 committed by Christian Helmuth
parent 37ff9e1e23
commit d131e537e9
5 changed files with 10 additions and 15 deletions

View File

@ -147,7 +147,7 @@ within your build Genode directory like so:
After this change you can build the Genode 'base-hw' image and export it to the
Muen working directory using the following command:
! objcopy -O binary var/run/log/image.elf <muen_workdir>/policy/obj/base_hw
! objcopy -O binary var/run/log/boot/image.elf <muen_workdir>/policy/obj/base_hw
Change back to the Muen working directory to package the system image and
restart emulation:

View File

@ -1 +1 @@
e51f0c9bfe99c284b3cf3bcf5fb81f7e9052f8a6
6ee7754cd5edecc78df38a1d42dc2855ea3fcc0f

View File

@ -1,10 +0,0 @@
+++ src/kernel/muen/policy/xml/vcpu_subject_base_hw.xml
@@ -9,7 +9,7 @@
</vmx>
<registers>
<gpr>
- <rip>16#0020_0028#</rip>
+ <rip>16#0020_0078#</rip>
<rsp>16#0000#</rsp>
</gpr>
</registers>

View File

@ -3,11 +3,9 @@ VERSION := git
DOWNLOADS := muen.git
URL(muen) := https://git.codelabs.ch/git/muen.git
REV(muen) := 807cb0381e12329d84cb7e6b2f778b1e1559a2e8
REV(muen) := 76b75b5f859f14397d146c16e5411142a6af11d0
DIR(muen) := src/kernel/muen
PATCHES := ports/muen.patch
$(call check_tool,git)
$(call check_tool,iasl)
$(call check_tool,tidy)

View File

@ -16,6 +16,13 @@ SPARK_PATH = $(shell sed -n "/^SPARK_PATH/s/^.*=\\s*//p" ${MUEN_CONF_FILE})
BUILD_ENV = PATH=$(GNAT_PATH)/bin:$(SPARK_PATH)/bin:$$PATH
BUILD_OPTS = SYSTEM=$(MUEN_SYSTEM) HARDWARE=$(MUEN_HARDWARE) PLATFORM=$(MUEN_PLATFORM) NO_PROOF=true
ifeq ($(VERBOSE),)
BUILD_OPTS += BUILD_OUTPUT_VERBOSE=true
else
BUILD_OPTS += BUILD_OUTPUT_NOCOLOR=true
endif
ifneq ($(filter muen, $(SPECS)),)
$(TARGET): $(MUEN_DST_DIR)
$(MSG_BUILD)Muen policy