From e06da67740a45dfe81d062026b97c874e94d16f3 Mon Sep 17 00:00:00 2001 From: Olivier Deprez Date: Wed, 26 Mar 2025 11:30:07 +0000 Subject: [PATCH] config: move image field to hafnium-base Follow up to: a502ce3 feature: add an optional 'image' field to config files. 0ca0537 config: ffa-hafnium-optee: Use the optional 'image' field Move the "image:" field to hafnium-base config and remove it from cca-4world and ffa-hafnium-optee configs. This will benefit configurations consuming hafnium-base config including above ones and ffa-tftf, or future configuration consuming this config. Signed-off-by: Olivier Deprez --- config/cca-4world.yaml | 2 -- config/ffa-hafnium-optee.yaml | 2 -- config/hafnium-base.yaml | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/cca-4world.yaml b/config/cca-4world.yaml index 82851d8..185fa68 100644 --- a/config/cca-4world.yaml +++ b/config/cca-4world.yaml @@ -31,8 +31,6 @@ description: >- See cca-3worlds.yaml config :ref:`userguide/configstore/cca-3world:description` if willing to launch a realm using kvmtool. -image: shrinkwraptool/base-full - concrete: true layers: diff --git a/config/ffa-hafnium-optee.yaml b/config/ffa-hafnium-optee.yaml index af0ac85..33b9db1 100644 --- a/config/ffa-hafnium-optee.yaml +++ b/config/ffa-hafnium-optee.yaml @@ -10,8 +10,6 @@ description: >- (Secure Partition Manager Core) and OPTEE as a secure partition/VM in secure EL1 and Linux in Normal world. -image: shrinkwraptool/base-full - concrete: true layers: diff --git a/config/hafnium-base.yaml b/config/hafnium-base.yaml index fca2c2e..612b44f 100644 --- a/config/hafnium-base.yaml +++ b/config/hafnium-base.yaml @@ -6,6 +6,8 @@ description: >- Hafnium is the Secure Partition Manager that runs at SEL2. +image: shrinkwraptool/base-full + build: hafnium: repo: -- GitLab