From 7bd0d65a6db57f1d0cedae6145ba01bfedf38ef3 Mon Sep 17 00:00:00 2001 From: Jiaqing Zhao Date: Tue, 10 Oct 2023 01:33:20 +0000 Subject: [PATCH] Build separate boot containers for SBL Create boot container separately for boot from multiple containers in SBL. This is controlled by "acrn" option. Tracked-On: OAM-112552 Signed-off-by: Jiaqing Zhao --- core/definitions.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/definitions.mk b/core/definitions.mk index 82b5b84..a0230dd 100755 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -181,6 +181,12 @@ if [ $(findstring kf4sbl,$(PRIVATE_MODULE) ) ]; then \ python3 $(INTEL_PATH_BUILD)/containertool/GenContainer.py create -t MULTIBOOT \ -cl CMD1:$(SBL_DIR)/cmdline-acrn ELF1:$(SBL_DIR)/acrn.32.out CMD2:$(SBL_DIR)/cmdline-kf ELF2:$@ \ -k $(INTEL_PATH_BUILD)/testkeys/OS1_TestKey_Priv_RSA3072.pem -o $(PRODUCT_OUT)/sbl_acrn; \ + python3 $(INTEL_PATH_BUILD)/containertool/GenContainer.py create -t MULTIBOOT \ + -cl CMD1:$(SBL_DIR)/cmdline-acrn ELF1:$(SBL_DIR)/acrn.32.out \ + -k $(INTEL_PATH_BUILD)/testkeys/OS1_TestKey_Priv_RSA3072.pem -o $(PRODUCT_OUT)/sbl_mod_acrn; \ + python3 $(INTEL_PATH_BUILD)/containertool/GenContainer.py create -t MULTIBOOT_MODULE \ + -cl CMD2:$(SBL_DIR)/cmdline-kf ELF2:$@ \ + -k $(INTEL_PATH_BUILD)/testkeys/OS1_TestKey_Priv_RSA3072.pem -o $(PRODUCT_OUT)/sbl_mod_kf; \ fi \ fi