diff options
| -rw-r--r-- | config/cca-3world.yaml (renamed from config/cca.yaml) | 35 | ||||
| -rw-r--r-- | config/cca-4world.yaml | 54 | ||||
| -rwxr-xr-x | test/test.py | 4 |
3 files changed, 58 insertions, 35 deletions
diff --git a/config/cca.yaml b/config/cca-3world.yaml index 3b1b3c8..079558c 100644 --- a/config/cca.yaml +++ b/config/cca-3world.yaml @@ -5,9 +5,8 @@ --- description: >- Brings together a software stack to demonstrate Arm CCA running on FVP in a - four-world configuration. Includes TF-A in root world, Hafnium and some demo - secure partitions in secure world, RMM in realm world, and Linux in Normal - world. + three-world configuration. Includes TF-A in root world, RMM in realm world, + and Linux in Normal world. In order to launch realm VMs, the user must bring their own rootfs that contains a realm-aware kvmtool and an RSI-aware guest kernel image. @@ -17,7 +16,6 @@ concrete: true layers: - tfa-base.yaml - rmm-base.yaml - - hafnium-base.yaml - linux-base.yaml - kvmtool-base.yaml - FVP_Base_RevC-2xAEMvA-base.yaml @@ -29,10 +27,6 @@ build: ENABLE_RME: 1 RMM: ${artifact:RMM} CTX_INCLUDE_EL2_REGS: 1 - SPD: spmd - SPMD_SPM_AT_SEL2: 1 - SP_LAYOUT_FILE: ${artifact:SP_LAYOUT} - BL32: ${artifact:HAFNIUM} ARM_LINUX_KERNEL_AS_BL33: 1 PRELOADED_BL33_BASE: 0x84000000 @@ -57,28 +51,6 @@ build: - ./scripts/config --file ${param:builddir}/.config --disable CONFIG_ACPI - ./scripts/config --file ${param:builddir}/.config --disable CONFIG_CPU_IDLE - # Provides secure partitions that run under Hafnium for demonstration. - tfa-tests: - repo: - remote: https://git.trustedfirmware.org/TF-A/tf-a-tests.git - revision: v2.8 - - toolchain: aarch64-none-elf- - - params: - PLAT: fvp - DEBUG: 1 - - build: - # TODO: tfa-tests has makefile dependency bug that prevents parallel make (-j > 1). - - make BUILD_BASE=${param:builddir} ${param:join_equal} all pack_realm - - clean: - - make BUILD_BASE=${param:builddir} realclean - - artifacts: - SP_LAYOUT: ${param:builddir}/fvp/debug/sp_layout.json - kvmtool: repo: dtc: @@ -148,8 +120,5 @@ run: bp.terminal_1: friendly: tfa-rt - bp.terminal_2: - friendly: hafnium - bp.terminal_3: friendly: rmm diff --git a/config/cca-4world.yaml b/config/cca-4world.yaml new file mode 100644 index 0000000..c879d42 --- /dev/null +++ b/config/cca-4world.yaml @@ -0,0 +1,54 @@ +# Copyright (c) 2022, Arm Limited. +# SPDX-License-Identifier: MIT + +%YAML 1.2 +--- +description: >- + Brings together a software stack to demonstrate Arm CCA running on FVP in a + four-world configuration. Includes TF-A in root world, Hafnium and some demo + secure partitions in secure world, RMM in realm world, and Linux in Normal + world. + + In order to launch realm VMs, the user must bring their own rootfs that + contains a realm-aware kvmtool and an RSI-aware guest kernel image. + +concrete: true + +layers: + - cca-3world.yaml + - hafnium-base.yaml + +build: + tfa: + params: + SPD: spmd + SPMD_SPM_AT_SEL2: 1 + SP_LAYOUT_FILE: ${artifact:SP_LAYOUT} + BL32: ${artifact:HAFNIUM} + + # Provides secure partitions that run under Hafnium for demonstration. + tfa-tests: + repo: + remote: https://git.trustedfirmware.org/TF-A/tf-a-tests.git + revision: v2.8 + + toolchain: aarch64-none-elf- + + params: + PLAT: fvp + DEBUG: 1 + + build: + # TODO: tfa-tests has makefile dependency bug that prevents parallel make (-j > 1). + - make BUILD_BASE=${param:builddir} ${param:join_equal} all pack_realm + + clean: + - make BUILD_BASE=${param:builddir} realclean + + artifacts: + SP_LAYOUT: ${param:builddir}/fvp/debug/sp_layout.json + +run: + terminals: + bp.terminal_2: + friendly: hafnium diff --git a/test/test.py b/test/test.py index 1938aad..d82294e 100755 --- a/test/test.py +++ b/test/test.py @@ -171,8 +171,8 @@ def do_main(smoke_test): build_configs(['bootwrapper.yaml'], arch) run_config_bootwrap('bootwrapper.yaml', BOOTWRAPPER, ROOTFS, arch) - build_configs(['cca.yaml']) - run_config_kern('cca.yaml', KERNEL, ROOTFS) + build_configs(['cca-3world.yaml']) + run_config_kern('cca-3world.yaml', KERNEL, ROOTFS) print_results() |