diff --git a/repos/base-hw/doc/x86_64_muen.txt b/repos/base-hw/doc/x86_64_muen.txt index 2ba99f61f..8bd12feab 100644 --- a/repos/base-hw/doc/x86_64_muen.txt +++ b/repos/base-hw/doc/x86_64_muen.txt @@ -52,12 +52,16 @@ To get a list of all currently supported platforms issue the following command: ! ls contrib/muen-*/src/kernel/muen/policy/platform/ | cut -f 1 -d '.' -Set the --image-muen-hardware parameter to your intended hardware platform and -change the other parameters to match your environment. +Set the '--image-muen-hardware' parameter to point to the hardware +configuration file of your intended hardware platform. Note that the specified +paths for both '--image-muen-hardware' and '--image-muen-system' must be either +relative to the Muen policy directory (e.g. 'platform/lenovo-t430s.xml' or +'xml/genode-base_hw_simple.xml') or absolute paths. Also change the +other parameters to match your environment. -If no platform configuration for your specific hardware is available, refer to -the README of the 'mugenplcfg' tool -[http://git.codelabs.ch/?p=muen/mugenplcfg.git] for instructions on how to +If no hardware configuration for your specific hardware is available, refer to +the README of the 'mugenhwcfg' tool +[http://git.codelabs.ch/?p=muen/mugenhwcfg.git] for instructions on how to generate a new configuration. You can now change to the created build directory and compile a Genode system: @@ -120,7 +124,7 @@ As a first step acquire the Muen sources by execute the following commands: ! git clone http://git.codelabs.ch/git/muen.git ! cd muen -! make SYSTEM=genode-base_hw_simple COMPONENTS="dbgserver sm tau0" emulate +! make SYSTEM=xml/genode-base_hw_simple.xml COMPONENTS="dbgserver sm tau0" emulate This will build a Muen SK system and start it using the Bochs emulator. You should get the following error: @@ -138,16 +142,16 @@ your build Genode directory like so: ! RUN_OPT += --image-muen-external-build 1 -After this change you can build the Genode 'base-hw' image and copy the -resulting raw binary file to the Muen working directory: +After this change you can build the Genode 'base-hw' image and export it to the +Muen working directory using the following command: -! cp var/run/printf/printf.bin /policy/obj/base_hw +! objcopy -O binary var/run/printf/image.elf /policy/obj/base_hw Change back to the Muen working directory to package the system image and restart emulation: ! cd -! make SYSTEM=genode-base_hw_simple COMPONENTS="dbgserver sm tau0" emulate +! make SYSTEM=xml/genode-base_hw_simple.xml COMPONENTS="dbgserver sm tau0" emulate The serial output of the system is written to the '/emulate/serial.out' file. You should see the following line: