fix(fvp): change binaries for fvp-spm.edk2
Since non-secure shared buffer address is changed by
related patch [0], fvp-spm.edk2 test get failed since
the older binares use the old address.
As StandaloneMm binary updated:
- the TF-A should deliver HOB list to boot it properly [1]
- uart2 log which expected by CI is too oldish
sanity check is enough to see uart0 whether UEFI shell is booted
since UEFI shell fails to boot when it fails to init StandaloneMm.
- UefiInfo.efi doesn't exist the latest edk2 repository.
To test the EFI application loading, replace it with
HelloWorld.efi application
- "Uefi firmware" string is printed in uart1.
Therefore, as update binaries,
- add TRANSFER_LIST & HOB_LIST build option
- remove uart2 check in fvp-spm-mm
- replace UefiInfo.efi to HelloWorld.efi
- move "Uefi firmware" string check into uart1.
Link: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/40337 [0]
Link: https://github.com/tianocore/edk2/pull/6116 [1]
Change-Id: I136064acc405b75f3919031573a5759b41b4d129
Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
diff --git a/expect-lava/spm-edk2-uart0.exp b/expect-lava/spm-edk2-uart0.exp
index c914cc6..c53f30e 100644
--- a/expect-lava/spm-edk2-uart0.exp
+++ b/expect-lava/spm-edk2-uart0.exp
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -12,8 +12,6 @@
source $ci_root/expect-lava/trusted-firmware.inc
# EDK2 section
-expect_string+=('i;UEFI firmware')
-
expect_string+=('i;UEFI Interactive Shell')
expect_string+=('i;any other key to continue.')
@@ -22,4 +20,4 @@
expect_string+=('i;FS0:;;;fs0:\r')
-expect_string+=('i;FS0:;Loading driver at .* UefiInfo.efi;;UefiInfo.efi\r')
+expect_string+=('i;FS0:;UEFI Hello World!;;HelloWorld.efi\r')
diff --git a/expect-lava/spm-edk2-uart1.exp b/expect-lava/spm-edk2-uart1.exp
new file mode 100644
index 0000000..17896f8
--- /dev/null
+++ b/expect-lava/spm-edk2-uart1.exp
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2025 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Expect script for EDK2 UART1
+#
+
+# EDK2 section
+expect_string+=('i;UEFI firmware')
diff --git a/expect-lava/spm-edk2-uart2.exp b/expect-lava/spm-edk2-uart2.exp
deleted file mode 100644
index b84b825..0000000
--- a/expect-lava/spm-edk2-uart2.exp
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Expect script for Standalone MM partition UART2
-#
-
-# Handled by ../expect-post/spm-edk2-uart2.exp
diff --git a/expect/spm-edk2-uart0.exp b/expect/spm-edk2-uart0.exp
index 843372e..90676e1 100644
--- a/expect/spm-edk2-uart0.exp
+++ b/expect/spm-edk2-uart0.exp
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -13,18 +13,7 @@
# Trusted Firmware boot section
source [file join [file dirname [info script]] trusted-firmware.inc]
-# EDK2 section
-expect {
- "UEFI firmware" {
- message "EDK2 starting"
- }
-}
-
-expect {
- "UEFI Interactive Shell" {
- message "EDK2 shell starting"
- }
-}
+expect_string "UEFI Interactive Shell" "EDK2 shell starting"
expect {
"any other key to continue." {
@@ -40,18 +29,12 @@
expect {
"FS0:" {
- send "UefiInfo.efi\r"
+ send "HelloWorld.efi\r"
message "Loading UEFI application"
}
}
expect {
- -re "Loading driver at .* UefiInfo.efi" {
- message "UEFI application is being loaded"
- }
-}
-
-expect {
"FS0:" {
message "UEFI application loaded"
}
diff --git a/expect/spm-edk2-uart1.exp b/expect/spm-edk2-uart1.exp
new file mode 100644
index 0000000..8994133
--- /dev/null
+++ b/expect/spm-edk2-uart1.exp
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2025 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Expect script for EDK2 UART1
+#
+# Refer to handle-arguments.inc for the list of parameters.
+#
+
+source [file join [file dirname [info script]] handle-arguments.inc]
+
+# EDK2 section
+expect_string "UEFI firmware" "EDK2 starting"
+
+source [file join [file dirname [info script]] uart-hold.inc]
diff --git a/expect/spm-edk2-uart2.exp b/expect/spm-edk2-uart2.exp
deleted file mode 100644
index e91efb4..0000000
--- a/expect/spm-edk2-uart2.exp
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Expect script for Standalone MM partition UART2
-#
-# Refer to handle-arguments.inc for the list of parameters.
-#
-
-source [file join [file dirname [info script]] handle-arguments.inc]
-
-expect {
- "SPM Version" {
- message "Secure Partition booting"
- }
-}
-
-expect {
- "MmMain Done!" {
- message "Secure Partition booted"
- }
-}
-
-expect {
- "Received event - 0xC4000041 on cpu" {
- message "Received event"
- }
-}
-
-expect {
- "MmEntryPoint Done" {
- message "Secure Partition done"
- }
-}
-
-exit_uart 0
diff --git a/run_config/fvp-spm.edk2 b/run_config/fvp-spm.edk2
index 503e21d..7811fbd 100644
--- a/run_config/fvp-spm.edk2
+++ b/run_config/fvp-spm.edk2
@@ -1,24 +1,24 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
post_tf_build() {
# Fetch EDK2 and pre-built partition files
- url="$tfa_downloads/spm/FVP_AARCH64_EFI.fd" fetch_file
- url="$tfa_downloads/spm/STANDALONESMM.fd" fetch_file
+ url="$tfa_downloads/spm/fw-handoff/FVP_AARCH64_EFI.fd" fetch_file
+ url="$tfa_downloads/spm/fw-handoff/BL32_AP_MM.fd" fetch_file
archive_file "FVP_AARCH64_EFI.fd"
- archive_file "STANDALONESMM.fd"
+ archive_file "BL32_AP_MM.fd"
- build_fip BL33="$archive/FVP_AARCH64_EFI.fd" BL32="$archive/STANDALONESMM.fd"
+ build_fip BL33="$archive/FVP_AARCH64_EFI.fd" BL32="$archive/BL32_AP_MM.fd"
}
generate_lava_job_template() {
uart="0" file="spm-edk2-uart0.exp" track_expect
- uart="2" file="spm-edk2-uart2.exp" track_expect
+ uart="1" file="spm-edk2-uart1.exp" track_expect
payload_type="tftf" gen_yaml_template
}
diff --git a/tf_config/fvp-spm-mm b/tf_config/fvp-spm-mm
index 47df74e..5e11cbd 100644
--- a/tf_config/fvp-spm-mm
+++ b/tf_config/fvp-spm-mm
@@ -4,4 +4,6 @@
EL3_EXCEPTION_HANDLING=1
ENABLE_SVE_FOR_NS=0
SPM_MM=1
+HOB_LIST=1
+TRANSFER_LIST=1
PLAT=fvp