From 2db4fc827255c00f27a1e20f3282861e1d0eeaaf Mon Sep 17 00:00:00 2001 From: Ryan Roberts Date: Mon, 15 Jan 2024 17:44:27 +0000 Subject: docs: re-autogenerate config store rst files Signed-off-by: Ryan Roberts --- documentation/userguide/configstore/cca-3world.rst | 2 +- documentation/userguide/configstore/cca-4world.rst | 30 +++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/documentation/userguide/configstore/cca-3world.rst b/documentation/userguide/configstore/cca-3world.rst index 3c947b9..0049cef 100644 --- a/documentation/userguide/configstore/cca-3world.rst +++ b/documentation/userguide/configstore/cca-3world.rst @@ -57,7 +57,7 @@ Or if taking the shared directory approach, simply boot the host with the SHARE .. code-block:: shell $ cd ~/.shrinkwrap/package/cca-3world - $ shrinkwrap run cca-3world.yaml --rtvar ROOTFS=rootfs.ext2 SHARE=. + $ shrinkwrap run cca-3world.yaml --rtvar ROOTFS=rootfs.ext2 --rtvar SHARE=. Finally, once the host has booted, log in as "root" (no password), and launch a realm using kvmtool. Note the mount command is only required if sharing a directory: diff --git a/documentation/userguide/configstore/cca-4world.rst b/documentation/userguide/configstore/cca-4world.rst index 81e9247..70d4be8 100644 --- a/documentation/userguide/configstore/cca-4world.rst +++ b/documentation/userguide/configstore/cca-4world.rst @@ -10,7 +10,35 @@ cca-4world.yaml Description ########### -Builds on cca-3world.yaml, but adds support for running Hafnium along with some secure partitions in Secure World. +Builds on cca-3world.yaml, and adds support for running Hafnium along with some secure partitions in Secure World. Build with: + +.. code-block:: shell + + $ shrinkwrap --image shrinkwraptool/base-full build cca-4world.yaml --overlay buildroot.yaml --btvar GUEST_ROOTFS='${artifact:BUILDROOT}' + + +Then run the model with: + +.. code-block:: shell + + $ cd ~/.shrinkwrap/package/cca-4world + $ shrinkwrap run cca-4world.yaml --rtvar ROOTFS=rootfs.ext2 --rtvar SHARE=. + + +Once the host has booted, log in as "root" (no password). + +Secure partitions can be enumerated by: + +.. code-block:: shell + + # cat /sys/devices/arm-ffa-*/uuid + b4b5671e-4a90-4fe1-b81f-fb13dae1dacb + d1582309-f023-47b9-827c-4464f5578fc8 + 79b55c73-1d8c-44b9-8593-61e1770ad8d2 + eaba83d8-baaf-4eaf-8144-f7fdcbe544a7 + + +See cca-3worlds.yaml config :ref:`userguide/configstore/cca-3world:description` if willing to launch a realm using kvmtool. Concrete ######## -- cgit v1.2.3