From: Jan Kiszka <[email protected]>

We now have "jailhouse cell linux" support for all architectures, thus
the original ARM64 description is no longer needed. Remove it and
generalize the x86 documentation to cover all architectures.

Signed-off-by: Jan Kiszka <[email protected]>
---
 Documentation/non-root-linux-arm64.txt | 51 ----------------------------------
 Documentation/non-root-linux.txt       | 17 +++++++++---
 2 files changed, 13 insertions(+), 55 deletions(-)
 delete mode 100644 Documentation/non-root-linux-arm64.txt

diff --git a/Documentation/non-root-linux-arm64.txt 
b/Documentation/non-root-linux-arm64.txt
deleted file mode 100644
index 1712c87..0000000
--- a/Documentation/non-root-linux-arm64.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Booting Linux in non-root cells on ARM64
-========================================
-
-Booting a Linux kernel on an ARM target is significantly simpler than on x86,
-so in this case we do not need a specially modified Linux kernel for the
-non-root cell.
-
-What we will need is:
-
-(a) A non-root cell for the Linxu inmate.
-
-Under configs/ there are -linux-demo.c example cell configurations
-for this purpose. This will produce a cell configuration file
-(e.g. amd-seattle-linux-demo.cell).
-
-(b) An ARM64 Linux kernel.
-
-A good idea is to append a RAMdisk to the end of the kernel, to use as the
-root filesystem for the Linux inmate. Special patches are not needed.
-
-(c) A device tree blob.
-
-Sample dts files can be found under samples/, just compile to a dtb using
-the Linxu kernel dtc tool.
-
-(d) linux-loader inmate for Jailhouse ARM64 (provided).
-
-After building, copy the binary from inmates/tools/arm64/linux-loader.bin
-
-Starting the Linux inmate
--------------------------
-
-Loading a Linux inmate can be as simple as:
-
-       $ LOAD_ADDR=0x82e0080000        # example values for the amd seattle
-       $ DTB_ADDR=0xfe00000
-       $
-       $ jailhouse cell create linux-demo.cell
-       $ jailhouse cell load --name linux-inmate-demo \
-                             linux-loader.bin -a 0x0 \
-                             Image -a $LOAD_ADDR \
-                             kernel-inmate.dtb -a $DTB_ADDR \
-                             -s "kernel=$LOAD_ADDR dtb=$DTB_ADDR" -a 0x1000
-
-Make sure LOAD_ADDR and DTB_ADDR are set to the (cell virtual) addresses,
-where you want to load the kernel and device tree. This needs to be available
-memory ranges in the non root cell configuration that is being used.
-
-Finally you can start the cell:
-
-       $ jailhouse cell start linux-inmate-demo
diff --git a/Documentation/non-root-linux.txt b/Documentation/non-root-linux.txt
index cecda6b..c2a2d16 100644
--- a/Documentation/non-root-linux.txt
+++ b/Documentation/non-root-linux.txt
@@ -20,9 +20,13 @@ recent kernel version or to cleanup and adjust the patches. 
The plan is to
 push those patches upstream once their usefulness and correctness have been
 confirmed.
 
+Booting a Linux kernel on an ARM/ARM64 target is significantly simpler than on
+x86, so in this case we do not need a specially modified Linux kernel for the
+non-root cell.
 
-Kernel configuration
---------------------
+
+x86 Kernel configuration
+------------------------
 
 After checking out the above kernel branch, create a configuration that
 contains at least the following adjustments:
@@ -54,10 +58,15 @@ Non-root Linux start
 
 The easiest way to start a non-root Linux inmate is via the jailhouse tool:
 
-    jailhouse cell linux CELLCONFIG KERNEL [-i | --initrd FILE]
+    jailhouse cell linux CELLCONFIG KERNEL [-d | --dtb DTB] [-i | --initrd 
FILE]
                          [-c | --cmdline "STRING"] [-w | --write-params FILE]
 
-To create, load and start a Linxu cell and use the first UART as console, issue
+A device tree (DTB) is only required on ARM and ARM64 systems. You can find
+templates for the supported targets under configs/dts/inmate-<target>.dts.
+Those device tree source files are compiled to their binary representations
+(*.dtb) during the build.
+
+To create, load and start a Linux cell and use the first UART as console, issue
 
     jailhouse cell linux /path/to/linux.cell /path/to/bzImage \
         -i /path/to/initrd -c "console=ttyS0,1152000"

-- 
You received this message because you are subscribed to the Google Groups 
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to