On Mon, Sep 18, 2023 at 13:03:12 +0200, Marcin Juszkiewicz wrote: > There are some changes in progress which make BL1 bigger than 0x8000 > which EDK2 uses. > > TF-A defines BL1 size to be 0x12000 one. So let follow it. > > Signed-off-by: Marcin Juszkiewicz <marcin.juszkiew...@linaro.org>
This fixes a TF-A bug that you uncovered this morning, and I think that's worth pointing out in the commit message. However, Reviewed-by: Leif Lindholm <quic_llind...@quicinc.com> *But* this is a breaking change SoI want to hold off on merging this until the TF-A bugfix has been merged, so we can update the edk2-non-osi binaries at the same time, and minimise the amount of pain. Note for the interested: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/23417 TL;DR: the fip base and bl1 size don't line up. The bl1 size was already set to sufficient size, but after RME support in TF-A, bl1 size grows beyond start of fip. / Leif > --- > Platform/Qemu/SbsaQemu/SbsaQemu.fdf | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > index bc432cac6fc8..6bc55d701120 100644 > --- a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > @@ -43,11 +43,11 @@ [FD.SBSA_FLASH0] > > ################################################################################ > ## Place for Trusted Firmware > # flash0 is secure so we put here the BL1 > -0x00000000|0x00008000 > +0x00000000|0x00012000 > FILE = Platform/Qemu/Sbsa/bl1.bin > > # and FIP (BL2 + BL31) > -0x00008000|0x00020000 > +0x00012000|0x00020000 > FILE = Platform/Qemu/Sbsa/fip.bin > > > ################################################################################ > -- > 2.41.0 > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108772): https://edk2.groups.io/g/devel/message/108772 Mute This Topic: https://groups.io/mt/101430708/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
