Switch to the split prebuilt firmware image for the SCP and the AP
secure world. This allows Overdrive and Cello to share the latter
image, which we will update shortly.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 7 +++++--
 Platform/LeMaker/CelloBoard/CelloBoard.fdf     | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
index b43e080adc1e..54f209571f0e 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
@@ -49,8 +49,11 @@ [FD.STYX_ROM]
 #
 ################################################################################
 
-0x00000000|0x00200000
-FILE = Platform/AMD/OverdriveBoard/PreUefiFirmware.bin
+0x00000000|0x0004bb00
+FILE = Platform/AMD/OverdriveBoard/ScpFirmware.bin
+
+0x0004bb00|0x00020000
+FILE = Silicon/AMD/Styx/ArmTrustedFirmware.bin
 
 0x00200000|0x00260000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
index c4e6748b6a73..e3a0915f5de5 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf
@@ -49,8 +49,11 @@ [FD.STYX_ROM]
 #
 ################################################################################
 
-0x00000000|0x00200000
-FILE = Platform/LeMaker/CelloBoard/PreUefiFirmware.bin
+0x00000000|0x0004b300
+FILE = Platform/LeMaker/CelloBoard/ScpFirmware.bin
+
+0x0004b300|0x00020000
+FILE = Silicon/AMD/Styx/ArmTrustedFirmware.bin
 
 0x00200000|0x00260000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel