* [edk2-devel] [PATCH edk2-platforms 1/1] Platform/RPI4: Grow FV size to accommodate DEBUG build
@ 2024-03-12 10:29 Ard Biesheuvel via groups.io
2024-03-12 10:43 ` Ard Biesheuvel
0 siblings, 1 reply; 3+ messages in thread
From: Ard Biesheuvel via groups.io @ 2024-03-12 10:29 UTC (permalink / raw)
To: devel; +Cc: jeremy.linton, quic_llindhol, Ard Biesheuvel
From: Ard Biesheuvel <ardb@kernel.org>
The DEBUG build no longer fits when all build options used by the
release script on github.com/pftf are used, presumably due to the
OpenSSL upgrade.
So bump the size for all builds.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
Platform/RaspberryPi/RPi4/RPi4.fdf | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Platform/RaspberryPi/RPi4/RPi4.fdf b/Platform/RaspberryPi/RPi4/RPi4.fdf
index 816927761513..951488260ed4 100644
--- a/Platform/RaspberryPi/RPi4/RPi4.fdf
+++ b/Platform/RaspberryPi/RPi4/RPi4.fdf
@@ -25,11 +25,11 @@
[FD.RPI_EFI]
BaseAddress = 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress
-Size = 0x001f0000|gArmTokenSpaceGuid.PcdFdSize
+Size = 0x00210000|gArmTokenSpaceGuid.PcdFdSize
ErasePolarity = 1
BlockSize = 0x00001000|gRaspberryPiTokenSpaceGuid.PcdFirmwareBlockSize
-NumBlocks = 0x1f0
+NumBlocks = 0x210
################################################################################
#
@@ -56,7 +56,7 @@ [FD.RPI_EFI]
#
# UEFI image
#
-0x00020000|0x001b0000
+0x00020000|0x001d0000
gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
FV = FVMAIN_COMPACT
@@ -70,7 +70,7 @@ [FD.RPI_EFI]
#
# NV_VARIABLE_STORE
-0x001d0000|0x0000e000
+0x001f0000|0x0000e000
gRaspberryPiTokenSpaceGuid.PcdNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
DATA = {
@@ -113,11 +113,11 @@ [FD.RPI_EFI]
}
# NV_EVENT_LOG
-0x001de000|0x00001000
+0x001fe000|0x00001000
gRaspberryPiTokenSpaceGuid.PcdNvStorageEventLogBase|gRaspberryPiTokenSpaceGuid.PcdNvStorageEventLogSize
# NV_FTW_WORKING header
-0x001df000|0x00001000
+0x001ff000|0x00001000
gRaspberryPiTokenSpaceGuid.PcdNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
DATA = {
@@ -132,7 +132,7 @@ [FD.RPI_EFI]
}
# NV_FTW_WORKING data
-0x001e0000|0x00010000
+0x00200000|0x00010000
gRaspberryPiTokenSpaceGuid.PcdNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
#
--
2.44.0.278.ge034bb2e1d-goog
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116687): https://edk2.groups.io/g/devel/message/116687
Mute This Topic: https://groups.io/mt/104882052/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [PATCH edk2-platforms 1/1] Platform/RPI4: Grow FV size to accommodate DEBUG build
2024-03-12 10:29 [edk2-devel] [PATCH edk2-platforms 1/1] Platform/RPI4: Grow FV size to accommodate DEBUG build Ard Biesheuvel via groups.io
@ 2024-03-12 10:43 ` Ard Biesheuvel
2024-03-13 2:01 ` Jeremy Linton
0 siblings, 1 reply; 3+ messages in thread
From: Ard Biesheuvel @ 2024-03-12 10:43 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: devel, jeremy.linton, quic_llindhol
On Tue, 12 Mar 2024 at 11:29, Ard Biesheuvel <ardb+git@google.com> wrote:
>
> From: Ard Biesheuvel <ardb@kernel.org>
>
> The DEBUG build no longer fits when all build options used by the
> release script on github.com/pftf are used, presumably due to the
> OpenSSL upgrade.
>
> So bump the size for all builds.
>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
> Platform/RaspberryPi/RPi4/RPi4.fdf | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/Platform/RaspberryPi/RPi4/RPi4.fdf b/Platform/RaspberryPi/RPi4/RPi4.fdf
> index 816927761513..951488260ed4 100644
> --- a/Platform/RaspberryPi/RPi4/RPi4.fdf
> +++ b/Platform/RaspberryPi/RPi4/RPi4.fdf
> @@ -25,11 +25,11 @@
>
> [FD.RPI_EFI]
> BaseAddress = 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress
> -Size = 0x001f0000|gArmTokenSpaceGuid.PcdFdSize
> +Size = 0x00210000|gArmTokenSpaceGuid.PcdFdSize
> ErasePolarity = 1
>
Ugh just realized that this breaks DT loading from TFA, which places
the DT at a fixed offset of 0x1f0000
> BlockSize = 0x00001000|gRaspberryPiTokenSpaceGuid.PcdFirmwareBlockSize
> -NumBlocks = 0x1f0
> +NumBlocks = 0x210
>
> ################################################################################
> #
> @@ -56,7 +56,7 @@ [FD.RPI_EFI]
> #
> # UEFI image
> #
> -0x00020000|0x001b0000
> +0x00020000|0x001d0000
> gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
> FV = FVMAIN_COMPACT
>
> @@ -70,7 +70,7 @@ [FD.RPI_EFI]
> #
>
> # NV_VARIABLE_STORE
> -0x001d0000|0x0000e000
> +0x001f0000|0x0000e000
> gRaspberryPiTokenSpaceGuid.PcdNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
>
> DATA = {
> @@ -113,11 +113,11 @@ [FD.RPI_EFI]
> }
>
> # NV_EVENT_LOG
> -0x001de000|0x00001000
> +0x001fe000|0x00001000
> gRaspberryPiTokenSpaceGuid.PcdNvStorageEventLogBase|gRaspberryPiTokenSpaceGuid.PcdNvStorageEventLogSize
>
> # NV_FTW_WORKING header
> -0x001df000|0x00001000
> +0x001ff000|0x00001000
> gRaspberryPiTokenSpaceGuid.PcdNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
>
> DATA = {
> @@ -132,7 +132,7 @@ [FD.RPI_EFI]
> }
>
> # NV_FTW_WORKING data
> -0x001e0000|0x00010000
> +0x00200000|0x00010000
> gRaspberryPiTokenSpaceGuid.PcdNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
>
> #
> --
> 2.44.0.278.ge034bb2e1d-goog
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116676): https://edk2.groups.io/g/devel/message/116676
Mute This Topic: https://groups.io/mt/104882052/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [PATCH edk2-platforms 1/1] Platform/RPI4: Grow FV size to accommodate DEBUG build
2024-03-12 10:43 ` Ard Biesheuvel
@ 2024-03-13 2:01 ` Jeremy Linton
0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Linton @ 2024-03-13 2:01 UTC (permalink / raw)
To: Ard Biesheuvel, Ard Biesheuvel; +Cc: devel, quic_llindhol
Hi,
On 3/12/24 05:43, Ard Biesheuvel wrote:
> On Tue, 12 Mar 2024 at 11:29, Ard Biesheuvel <ardb+git@google.com> wrote:
>>
>> From: Ard Biesheuvel <ardb@kernel.org>
>>
>> The DEBUG build no longer fits when all build options used by the
>> release script on github.com/pftf are used, presumably due to the
>> OpenSSL upgrade.
>>
>> So bump the size for all builds.
>>
>> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
>> ---
>> Platform/RaspberryPi/RPi4/RPi4.fdf | 14 +++++++-------
>> 1 file changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/Platform/RaspberryPi/RPi4/RPi4.fdf b/Platform/RaspberryPi/RPi4/RPi4.fdf
>> index 816927761513..951488260ed4 100644
>> --- a/Platform/RaspberryPi/RPi4/RPi4.fdf
>> +++ b/Platform/RaspberryPi/RPi4/RPi4.fdf
>> @@ -25,11 +25,11 @@
>>
>> [FD.RPI_EFI]
>> BaseAddress = 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress
>> -Size = 0x001f0000|gArmTokenSpaceGuid.PcdFdSize
>> +Size = 0x00210000|gArmTokenSpaceGuid.PcdFdSize
>> ErasePolarity = 1
>>
>
> Ugh just realized that this breaks DT loading from TFA, which places
> the DT at a fixed offset of 0x1f0000
Right, which can be changed within the config.txt file but its probably
better not to. I hit this a few months back and have a version on my
github which moves it too, along with the TFA fixes, but really we
should be able to move one of the other regions around the DT, which
IIRC may be pushed to one of my branches on github along with the CPPC
patches for TFA/etc too.
That was set 4 or 5 that i've not posted because all the stuff in front
of it is still up in the air.
I can probably pick off just this bit and post it next week if its still
a problem, since i'm away from the rpi's at the moment.
>
>
>> BlockSize = 0x00001000|gRaspberryPiTokenSpaceGuid.PcdFirmwareBlockSize
>> -NumBlocks = 0x1f0
>> +NumBlocks = 0x210
>>
>> ################################################################################
>> #
>> @@ -56,7 +56,7 @@ [FD.RPI_EFI]
>> #
>> # UEFI image
>> #
>> -0x00020000|0x001b0000
>> +0x00020000|0x001d0000
>> gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
>> FV = FVMAIN_COMPACT
>>
>> @@ -70,7 +70,7 @@ [FD.RPI_EFI]
>> #
>>
>> # NV_VARIABLE_STORE
>> -0x001d0000|0x0000e000
>> +0x001f0000|0x0000e000
>> gRaspberryPiTokenSpaceGuid.PcdNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
>>
>> DATA = {
>> @@ -113,11 +113,11 @@ [FD.RPI_EFI]
>> }
>>
>> # NV_EVENT_LOG
>> -0x001de000|0x00001000
>> +0x001fe000|0x00001000
>> gRaspberryPiTokenSpaceGuid.PcdNvStorageEventLogBase|gRaspberryPiTokenSpaceGuid.PcdNvStorageEventLogSize
>>
>> # NV_FTW_WORKING header
>> -0x001df000|0x00001000
>> +0x001ff000|0x00001000
>> gRaspberryPiTokenSpaceGuid.PcdNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
>>
>> DATA = {
>> @@ -132,7 +132,7 @@ [FD.RPI_EFI]
>> }
>>
>> # NV_FTW_WORKING data
>> -0x001e0000|0x00010000
>> +0x00200000|0x00010000
>> gRaspberryPiTokenSpaceGuid.PcdNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
>>
>> #
>> --
>> 2.44.0.278.ge034bb2e1d-goog
>>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116701): https://edk2.groups.io/g/devel/message/116701
Mute This Topic: https://groups.io/mt/104882052/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-13 2:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-12 10:29 [edk2-devel] [PATCH edk2-platforms 1/1] Platform/RPI4: Grow FV size to accommodate DEBUG build Ard Biesheuvel via groups.io
2024-03-12 10:43 ` Ard Biesheuvel
2024-03-13 2:01 ` Jeremy Linton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox