[edk2-platforms PATCH 0/4] Some BeagleBoardPkg fixes

[edk2-platforms PATCH 0/4] Some BeagleBoardPkg fixes

[Rebecca Cran]

Since we still have quite a lot of 32-bit ARM code in the tree, it
would be nice to have a physical platform to verify that it still works
correctly. I recently got one of the original BeagleBoard boards and
have been working to get EDK2 booting on it again. These patches let it
get further, though there are still problems to fix.

I plan to add documentation explaining what the tools are, why we can't
load EDK2 using the ROM loader etc. since it doesn't appear obvious at
first. I don't understand how it ever worked, though, because the
current flash file appears configured to not use the MLO loader but at
720KB it's too large for the ROM loader. I suspect I have gaps in my
understanding of the board, which might make these patches unnecessary.

Patch 3/4 isn't required, I just got irritated with the messages
complaining about misaligned sections and decided to fix it.


Rebecca Cran (4):
  BeagleBoardPkg: Remove the configuration and image headers from flash
  BeagleBoardPkg: Remove PerformanceLib from build
  BeagleBoardPkg: Align PE sections to 4K
  Omap35xxPkg: InterruptDxe: add gEfiCpuArchProtocolGuid runtime
    dependency

 Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc             |  7 ++++---
 Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf             | 13 ++-----------
 Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

-- 
2.31.1

[edk2-platforms PATCH 1/4] BeagleBoardPkg: Remove the configuration and image headers from flash

[Rebecca Cran]

Remove the configuration and image headers from the flash image.
This was likely intended for the UEFI firmware to be loaded by the ROM
code, but the BeagleBoard only has 64KB SRAM and so EDK2 needs to be
executed as a second stage loader.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
index a2cfeb3bc27b..dbae015ff382 100644
--- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -23,7 +23,7 @@
 
 
 [FD.BeagleBoard_EFI]
-BaseAddress   = 0x80007DF8|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
+BaseAddress   = 0x80008000|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
 Size          = 0x000B0000|gArmTokenSpaceGuid.PcdFdSize         #The size in bytes of the FLASH Device
 ErasePolarity = 1
 BlockSize     = 0x1
@@ -44,16 +44,7 @@ NumBlocks     = 0xB0000
 # RegionType <FV, DATA, or FILE>
 #
 ################################################################################
-0x00000000|0x00000200
-FILE = Platform/BeagleBoard/BeagleBoardPkg/ConfigurationHeader.bin
-
-0x00000200|0x00000008
-DATA = {
-  0xF8, 0xFD, 0x0A, 0x00,   # image size:   0xB0000 - 0x208 == 0xAFDF8
-  0x00, 0x80, 0x00, 0x80    # entry point:  0x80008000
-}
-
-0x00000208|0x000AFDF8
+0x00000000|0x000B0000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
-- 
2.31.1

Re: [edk2-platforms PATCH 1/4] BeagleBoardPkg: Remove the configuration and image headers from flash

[Leif Lindholm]

Ard, I think you were the one who converted the old crazy header stuff
to what we have now. Do you remember how this all fits together?

For the *other* 3 patches, but not this one:
Reviewed-by: Leif Lindholm <leif@nuviainc.com>


On Fri, Sep 10, 2021 at 20:57:11 -0600, Rebecca Cran wrote:
> Remove the configuration and image headers from the flash image.
> This was likely intended for the UEFI firmware to be loaded by the ROM
> code, but the BeagleBoard only has 64KB SRAM and so EDK2 needs to be
> executed as a second stage loader.
> 
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf | 13 ++-----------
>  1 file changed, 2 insertions(+), 11 deletions(-)
> 
> diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
> index a2cfeb3bc27b..dbae015ff382 100644
> --- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
> +++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
> @@ -23,7 +23,7 @@
>  
>  
>  [FD.BeagleBoard_EFI]
> -BaseAddress   = 0x80007DF8|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
> +BaseAddress   = 0x80008000|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
>  Size          = 0x000B0000|gArmTokenSpaceGuid.PcdFdSize         #The size in bytes of the FLASH Device
>  ErasePolarity = 1
>  BlockSize     = 0x1
> @@ -44,16 +44,7 @@ NumBlocks     = 0xB0000
>  # RegionType <FV, DATA, or FILE>
>  #
>  ################################################################################
> -0x00000000|0x00000200
> -FILE = Platform/BeagleBoard/BeagleBoardPkg/ConfigurationHeader.bin
> -
> -0x00000200|0x00000008
> -DATA = {
> -  0xF8, 0xFD, 0x0A, 0x00,   # image size:   0xB0000 - 0x208 == 0xAFDF8
> -  0x00, 0x80, 0x00, 0x80    # entry point:  0x80008000
> -}
> -
> -0x00000208|0x000AFDF8
> +0x00000000|0x000B0000
>  gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
>  FV = FVMAIN_COMPACT
>  
> -- 
> 2.31.1
> 
> 

Re: [edk2-platforms PATCH 1/4] BeagleBoardPkg: Remove the configuration and image headers from flash

[Rebecca Cran]

Since it's been a week - "ping".


-- 
Rebecca Cran


On 9/14/21 8:39 AM, Leif Lindholm wrote:
> Ard, I think you were the one who converted the old crazy header stuff
> to what we have now. Do you remember how this all fits together?
>
> For the *other* 3 patches, but not this one:
> Reviewed-by: Leif Lindholm <leif@nuviainc.com>
>
>
> On Fri, Sep 10, 2021 at 20:57:11 -0600, Rebecca Cran wrote:
>> Remove the configuration and image headers from the flash image.
>> This was likely intended for the UEFI firmware to be loaded by the ROM
>> code, but the BeagleBoard only has 64KB SRAM and so EDK2 needs to be
>> executed as a second stage loader.
>>
>> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
>> ---
>>   Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf | 13 ++-----------
>>   1 file changed, 2 insertions(+), 11 deletions(-)
>>
>> diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
>> index a2cfeb3bc27b..dbae015ff382 100644
>> --- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
>> +++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
>> @@ -23,7 +23,7 @@
>>   
>>   
>>   [FD.BeagleBoard_EFI]
>> -BaseAddress   = 0x80007DF8|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
>> +BaseAddress   = 0x80008000|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
>>   Size          = 0x000B0000|gArmTokenSpaceGuid.PcdFdSize         #The size in bytes of the FLASH Device
>>   ErasePolarity = 1
>>   BlockSize     = 0x1
>> @@ -44,16 +44,7 @@ NumBlocks     = 0xB0000
>>   # RegionType <FV, DATA, or FILE>
>>   #
>>   ################################################################################
>> -0x00000000|0x00000200
>> -FILE = Platform/BeagleBoard/BeagleBoardPkg/ConfigurationHeader.bin
>> -
>> -0x00000200|0x00000008
>> -DATA = {
>> -  0xF8, 0xFD, 0x0A, 0x00,   # image size:   0xB0000 - 0x208 == 0xAFDF8
>> -  0x00, 0x80, 0x00, 0x80    # entry point:  0x80008000
>> -}
>> -
>> -0x00000208|0x000AFDF8
>> +0x00000000|0x000B0000
>>   gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
>>   FV = FVMAIN_COMPACT
>>   
>> -- 
>> 2.31.1
>>
>>

Re: [edk2-platforms PATCH 1/4] BeagleBoardPkg: Remove the configuration and image headers from flash

[Ard Biesheuvel]

On Tue, 14 Sept 2021 at 16:39, Leif Lindholm <leif@nuviainc.com> wrote:
>
> Ard, I think you were the one who converted the old crazy header stuff
> to what we have now. Do you remember how this all fits together?
>

I had to page it in (edk2:a1123292a80608a69df89b6dd264c4656b618aec)
but given that I never used a BeagleBoard in my life, I'm sure this
was a theoretical exercise mostly, and I just compared the resulting
images before and after.

So this looks fine to me - if don't have a use for the configuration
header we should just remove it.

> For the *other* 3 patches, but not this one:
> Reviewed-by: Leif Lindholm <leif@nuviainc.com>
>
>
> On Fri, Sep 10, 2021 at 20:57:11 -0600, Rebecca Cran wrote:
> > Remove the configuration and image headers from the flash image.
> > This was likely intended for the UEFI firmware to be loaded by the ROM
> > code, but the BeagleBoard only has 64KB SRAM and so EDK2 needs to be
> > executed as a second stage loader.
> >
> > Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> > ---
> >  Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf | 13 ++-----------
> >  1 file changed, 2 insertions(+), 11 deletions(-)
> >
> > diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
> > index a2cfeb3bc27b..dbae015ff382 100644
> > --- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
> > +++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
> > @@ -23,7 +23,7 @@
> >
> >
> >  [FD.BeagleBoard_EFI]
> > -BaseAddress   = 0x80007DF8|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
> > +BaseAddress   = 0x80008000|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
> >  Size          = 0x000B0000|gArmTokenSpaceGuid.PcdFdSize         #The size in bytes of the FLASH Device
> >  ErasePolarity = 1
> >  BlockSize     = 0x1
> > @@ -44,16 +44,7 @@ NumBlocks     = 0xB0000
> >  # RegionType <FV, DATA, or FILE>
> >  #
> >  ################################################################################
> > -0x00000000|0x00000200
> > -FILE = Platform/BeagleBoard/BeagleBoardPkg/ConfigurationHeader.bin
> > -
> > -0x00000200|0x00000008
> > -DATA = {
> > -  0xF8, 0xFD, 0x0A, 0x00,   # image size:   0xB0000 - 0x208 == 0xAFDF8
> > -  0x00, 0x80, 0x00, 0x80    # entry point:  0x80008000
> > -}
> > -
> > -0x00000208|0x000AFDF8
> > +0x00000000|0x000B0000
> >  gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
> >  FV = FVMAIN_COMPACT
> >
> > --
> > 2.31.1
> >
> >

Re: [edk2-platforms PATCH 1/4] BeagleBoardPkg: Remove the configuration and image headers from flash

[Ard Biesheuvel]

On Wed, 22 Sept 2021 at 13:20, Ard Biesheuvel <ardb@kernel.org> wrote:
>
> On Tue, 14 Sept 2021 at 16:39, Leif Lindholm <leif@nuviainc.com> wrote:
> >
> > Ard, I think you were the one who converted the old crazy header stuff
> > to what we have now. Do you remember how this all fits together?
> >
>
> I had to page it in (edk2:a1123292a80608a69df89b6dd264c4656b618aec)
> but given that I never used a BeagleBoard in my life, I'm sure this
> was a theoretical exercise mostly, and I just compared the resulting
> images before and after.
>
> So this looks fine to me - if don't have a use for the configuration
> header we should just remove it.
>

... which you can take as a

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

for the series.

> > For the *other* 3 patches, but not this one:
> > Reviewed-by: Leif Lindholm <leif@nuviainc.com>
> >
> >
> > On Fri, Sep 10, 2021 at 20:57:11 -0600, Rebecca Cran wrote:
> > > Remove the configuration and image headers from the flash image.
> > > This was likely intended for the UEFI firmware to be loaded by the ROM
> > > code, but the BeagleBoard only has 64KB SRAM and so EDK2 needs to be
> > > executed as a second stage loader.
> > >
> > > Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> > > ---
> > >  Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf | 13 ++-----------
> > >  1 file changed, 2 insertions(+), 11 deletions(-)
> > >
> > > diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
> > > index a2cfeb3bc27b..dbae015ff382 100644
> > > --- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
> > > +++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.fdf
> > > @@ -23,7 +23,7 @@
> > >
> > >
> > >  [FD.BeagleBoard_EFI]
> > > -BaseAddress   = 0x80007DF8|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
> > > +BaseAddress   = 0x80008000|gArmTokenSpaceGuid.PcdFdBaseAddress  #The base address of the FLASH Device.
> > >  Size          = 0x000B0000|gArmTokenSpaceGuid.PcdFdSize         #The size in bytes of the FLASH Device
> > >  ErasePolarity = 1
> > >  BlockSize     = 0x1
> > > @@ -44,16 +44,7 @@ NumBlocks     = 0xB0000
> > >  # RegionType <FV, DATA, or FILE>
> > >  #
> > >  ################################################################################
> > > -0x00000000|0x00000200
> > > -FILE = Platform/BeagleBoard/BeagleBoardPkg/ConfigurationHeader.bin
> > > -
> > > -0x00000200|0x00000008
> > > -DATA = {
> > > -  0xF8, 0xFD, 0x0A, 0x00,   # image size:   0xB0000 - 0x208 == 0xAFDF8
> > > -  0x00, 0x80, 0x00, 0x80    # entry point:  0x80008000
> > > -}
> > > -
> > > -0x00000208|0x000AFDF8
> > > +0x00000000|0x000B0000
> > >  gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
> > >  FV = FVMAIN_COMPACT
> > >
> > > --
> > > 2.31.1
> > >
> > >

[edk2-platforms PATCH 2/4] BeagleBoardPkg: Remove PerformanceLib from build

[Rebecca Cran]

PerformanceLib is related to building the ACPI Firmware Performance
Data Table (FPDT). Since BeagleBoardPkg targets 32-bit ARM systems
where ACPI isn't relevant, remove it.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
index 8a4b0ad8851e..596f1e09de05 100644
--- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -169,9 +169,6 @@
 #  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
   PeCoffLib|Platform/BeagleBoard/BeagleBoardPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
 
-  PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
-
-
 [LibraryClasses.common.DXE_DRIVER]
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
-- 
2.31.1

[edk2-platforms PATCH 3/4] BeagleBoardPkg: Align PE sections to 4K

[Rebecca Cran]

Add build options to BeagleBoardPkg.dsc to align PE sections to 4K.
This avoids warnings during boot when loading drivers.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
index 596f1e09de05..7df306045d12 100644
--- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -212,6 +212,10 @@
 
   *_*_*_CC_FLAGS = -DDISABLE_NEW_DEPRECATED_INTERFACES
 
+[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
+  GCC:  *_*_*_DLINK_FLAGS = -z common-page-size=0x1000
+  MSFT: *_*_*_DLINK_FLAGS = /ALIGN:4096
+
 ################################################################################
 #
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform
-- 
2.31.1

[edk2-platforms PATCH 4/4] Omap35xxPkg: InterruptDxe: add gEfiCpuArchProtocolGuid runtime dependency

[Rebecca Cran]

InterruptDxe requires gEfiCpuArchProtocolGuid: change the Depex line for
TexasInstruments/Omap35xxPkg/InterruptDxe so the driver that provides
gEfiCpuArchProtocolGuid is loaded before it.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf b/Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf
index abc5b84c9375..3453ef1784d9 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf
+++ b/Silicon/TexasInstruments/Omap35xxPkg/InterruptDxe/InterruptDxe.inf
@@ -45,4 +45,4 @@
   gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress
 
 [Depex]
-  TRUE
+  gEfiCpuArchProtocolGuid
-- 
2.31.1