fixup! Platforms/RaspberryPi: add barebones support for Raspberry Pi 3rpi3-wip

3 files changed, 6 insertions, 37 deletions

diff --git a/Platforms/RaspberryPi/Drivers/RaspberryPiPlatformDxe/RaspberryPiPlatformDxe.c b/Platforms/RaspberryPi/Drivers/RaspberryPiPlatformDxe/RaspberryPiPlatformDxe.c
index 91b9dfa..bf768ef 100644
--- a/Platforms/RaspberryPi/Drivers/RaspberryPiPlatformDxe/RaspberryPiPlatformDxe.c
+++ b/Platforms/RaspberryPi/Drivers/RaspberryPiPlatformDxe/RaspberryPiPlatformDxe.c
@@ -22,7 +22,7 @@
 #include <Guid/Fdt.h>

 #include <Guid/FdtHob.h>

 

-STATIC CONST EFI_PHYSICAL_ADDRESS SdhciBaseAddress = 0x3f202000;

+//STATIC CONST EFI_PHYSICAL_ADDRESS SdhciBaseAddress = 0x3f202000;

 

 /**

   @param  ImageHandle   of the loaded driver

@@ -40,31 +40,5 @@ RaspberryPiPlatformDxeInitialize (
   IN EFI_SYSTEM_TABLE   *SystemTable

   )

 {

-  VOID              *Hob;

-  VOID              *DeviceTreeBase;

-  EFI_STATUS        Status;

-

-  Hob = GetFirstGuidHob (&gFdtHobGuid);

-  if (Hob == NULL || GET_GUID_HOB_DATA_SIZE (Hob) != sizeof (UINT64)) {

-    return EFI_NOT_FOUND;

-  }

-  DeviceTreeBase = (VOID *)(UINTN)*(UINT64 *)GET_GUID_HOB_DATA (Hob);

-

-  if (fdt_check_header (DeviceTreeBase) != 0) {

-    DEBUG ((EFI_D_ERROR, "%a: No DTB found @ 0x%p\n", __FUNCTION__,

-      DeviceTreeBase));

-    return EFI_NOT_FOUND;

-  }

-

-  DEBUG ((EFI_D_INFO, "%a: DTB @ 0x%p\n", __FUNCTION__, DeviceTreeBase));

-

-  Status = gBS->InstallConfigurationTable (&gFdtTableGuid, DeviceTreeBase);

-  ASSERT_EFI_ERROR (Status);

-

-  return RegisterNonDiscoverableDevice (

-           SdhciBaseAddress,

-           NonDiscoverableDeviceTypeSdhci,

-           NonDiscoverableDeviceDmaTypeNonCoherent,

-           NULL,

-           NULL);

+  return EFI_SUCCESS;

 }

diff --git a/Platforms/RaspberryPi/RaspberryPi.dsc b/Platforms/RaspberryPi/RaspberryPi.dsc
index e4210cd..2820e1d 100644
--- a/Platforms/RaspberryPi/RaspberryPi.dsc
+++ b/Platforms/RaspberryPi/RaspberryPi.dsc
@@ -44,11 +44,10 @@
 [LibraryClasses.common]

 !if $(TARGET) == RELEASE

   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

-  UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf

 !else

   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

-  UncachedMemoryAllocationLib|ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf

 !endif

+  UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf

   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

 

   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

@@ -307,10 +306,7 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20

   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0

 

-  #

-  # ARM Pcds

-  #

-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000

+  gArmTokenSpaceGuid.PcdArmDmaDeviceOffset|0x3f000000

 

 !if $(SECURE_BOOT_ENABLE) == TRUE

   # override the default values from SecurityPkg to ensure images from all sources are verified in secure boot

@@ -541,7 +537,7 @@
   #

   # USB Support

   #

-  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf

+  OpenPlatformPkg/Drivers/Usb/DwUsbHostDxe/DwUsbHostDxe.inf

   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf

   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

 

diff --git a/Platforms/RaspberryPi/RaspberryPi.fdf b/Platforms/RaspberryPi/RaspberryPi.fdf
index 74bafa2..c997ace 100644
--- a/Platforms/RaspberryPi/RaspberryPi.fdf
+++ b/Platforms/RaspberryPi/RaspberryPi.fdf
@@ -190,7 +190,7 @@ READ_LOCK_STATUS   = TRUE
   #

   # USB Support

   #

-  INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf

+  INF OpenPlatformPkg/Drivers/Usb/DwUsbHostDxe/DwUsbHostDxe.inf

   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf

   INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

 

@@ -226,7 +226,6 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE

 READ_LOCK_STATUS   = TRUE

 

-  #INF ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf

   INF ArmPlatformPkg/PrePi/PeiUniCore.inf

   FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {

     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {