Ver código fonte

Platforms/RPi3: Restructure platform in preparation for Pi 4

In preparation for adding Raspberry Pi 4 support, the Pi 3 platform
is restructured by factorizing all the drivers and libraries that are
going to be commonly used by the two platforms.

Because much of the Pi 4 SoC is an extension of the Pi 3 one this
means that almost everything, except the ACPI tables, is moved up
into a new common RaspberryPi/ subdirectory that will serve both
platforms. The .dec is also moved to this directory, under a new
RaspberryPi.dec name, and existing references to it are updated.

This commit requires the edk2-non-osi in use to contain commit 243e55f622ea
in order to build.

Signed-off-by: Pete Batard <pete@akeo.ie>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Pete Batard 4 anos atrás
pai
commit
03f36b8fcf
69 arquivos alterados com 45 adições e 45 exclusões
  1. 0 0
      Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
  2. 0 0
      Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
  3. 1 1
      Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
  4. 0 0
      Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c
  5. 1 1
      Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf
  6. 0 0
      Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
  7. 0 0
      Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni
  8. 0 0
      Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr
  9. 0 0
      Platform/RaspberryPi/Drivers/DisplayDxe/ComponentName.c
  10. 0 0
      Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.c
  11. 0 0
      Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.h
  12. 1 1
      Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf
  13. 0 0
      Platform/RaspberryPi/Drivers/DisplayDxe/Screenshot.c
  14. 0 0
      Platform/RaspberryPi/Drivers/DwUsbHostDxe/ComponentName.c
  15. 0 0
      Platform/RaspberryPi/Drivers/DwUsbHostDxe/DriverBinding.c
  16. 0 0
      Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
  17. 0 0
      Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
  18. 1 1
      Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
  19. 0 0
      Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h
  20. 0 0
      Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.c
  21. 1 1
      Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf
  22. 0 0
      Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/ComponentName.c
  23. 0 0
      Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
  24. 0 0
      Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
  25. 1 1
      Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
  26. 0 0
      Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
  27. 0 0
      Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
  28. 0 0
      Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/NewFont.c
  29. 0 0
      Platform/RaspberryPi/Drivers/MmcDxe/ComponentName.c
  30. 0 0
      Platform/RaspberryPi/Drivers/MmcDxe/Diagnostics.c
  31. 0 0
      Platform/RaspberryPi/Drivers/MmcDxe/Mmc.c
  32. 0 0
      Platform/RaspberryPi/Drivers/MmcDxe/Mmc.h
  33. 0 0
      Platform/RaspberryPi/Drivers/MmcDxe/MmcBlockIo.c
  34. 0 0
      Platform/RaspberryPi/Drivers/MmcDxe/MmcDebug.c
  35. 1 1
      Platform/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf
  36. 0 0
      Platform/RaspberryPi/Drivers/MmcDxe/MmcIdentification.c
  37. 0 0
      Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
  38. 1 1
      Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
  39. 0 0
      Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
  40. 1 1
      Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
  41. 0 0
      Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.c
  42. 1 1
      Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf
  43. 0 0
      Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FileIo.c
  44. 0 0
      Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FvbInfo.c
  45. 0 0
      Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService.c
  46. 0 0
      Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService.h
  47. 0 0
      Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
  48. 1 1
      Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
  49. 0 0
      Platform/RaspberryPi/Include/IndustryStandard/RpiMbox.h
  50. 0 0
      Platform/RaspberryPi/Include/Protocol/DwUsb.h
  51. 0 0
      Platform/RaspberryPi/Include/Protocol/ExtendedTextOut.h
  52. 0 0
      Platform/RaspberryPi/Include/Protocol/RpiFirmware.h
  53. 0 0
      Platform/RaspberryPi/Include/Protocol/RpiMmcHost.h
  54. 0 0
      Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
  55. 0 0
      Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
  56. 0 0
      Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c
  57. 0 0
      Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.h
  58. 1 1
      Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
  59. 0 0
      Platform/RaspberryPi/Library/PlatformLib/AArch64/RaspberryPiHelper.S
  60. 1 1
      Platform/RaspberryPi/Library/PlatformLib/PlatformLib.inf
  61. 0 0
      Platform/RaspberryPi/Library/PlatformLib/RaspberryPi.c
  62. 0 0
      Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
  63. 0 0
      Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.c
  64. 1 1
      Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.inf
  65. 0 0
      Platform/RaspberryPi/Library/ResetLib/ResetLib.c
  66. 1 1
      Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
  67. 17 17
      Platform/RaspberryPi/RPi3/RPi3.dsc
  68. 12 12
      Platform/RaspberryPi/RPi3/RPi3.fdf
  69. 1 1
      Platform/RaspberryPi/RaspberryPi.dec

+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c → Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h → Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h


+ 1 - 1
Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf → Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf

@@ -23,7 +23,7 @@
   MdePkg/MdePkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   Silicon/Broadcom/Bcm283x/Bcm283x.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   PcdLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c → Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c


+ 1 - 1
Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf → Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf

@@ -33,7 +33,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   Silicon/Broadcom/Bcm283x/Bcm283x.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   BaseLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h → Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni → Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr → Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c → Platform/RaspberryPi/Drivers/DisplayDxe/ComponentName.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c → Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h → Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.h


+ 1 - 1
Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf → Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf

@@ -35,7 +35,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   ArmPkg/ArmPkg.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   BaseLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c → Platform/RaspberryPi/Drivers/DisplayDxe/Screenshot.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c → Platform/RaspberryPi/Drivers/DwUsbHostDxe/ComponentName.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c → Platform/RaspberryPi/Drivers/DwUsbHostDxe/DriverBinding.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c → Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h → Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.h


+ 1 - 1
Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf → Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf

@@ -28,7 +28,7 @@
   EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   Silicon/Broadcom/Bcm283x/Bcm283x.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   MemoryAllocationLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h → Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c → Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.c


+ 1 - 1
Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf → Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf

@@ -22,7 +22,7 @@
   EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   BaseLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c → Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/ComponentName.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c → Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h → Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsole.h


+ 1 - 1
Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf → Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

@@ -36,7 +36,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   Silicon/Broadcom/Bcm283x/Bcm283x.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   UefiBootServicesTableLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni → Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni → Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c → Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/NewFont.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c → Platform/RaspberryPi/Drivers/MmcDxe/ComponentName.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c → Platform/RaspberryPi/Drivers/MmcDxe/Diagnostics.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c → Platform/RaspberryPi/Drivers/MmcDxe/Mmc.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h → Platform/RaspberryPi/Drivers/MmcDxe/Mmc.h


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c → Platform/RaspberryPi/Drivers/MmcDxe/MmcBlockIo.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c → Platform/RaspberryPi/Drivers/MmcDxe/MmcDebug.c


+ 1 - 1
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf → Platform/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf

@@ -26,7 +26,7 @@
   Diagnostics.c
 
 [Packages]
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
   MdePkg/MdePkg.dec
 
 [LibraryClasses]

+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c → Platform/RaspberryPi/Drivers/MmcDxe/MmcIdentification.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c → Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c


+ 1 - 1
Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf → Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf

@@ -26,7 +26,7 @@
   MdeModulePkg/MdeModulePkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   ArmPkg/ArmPkg.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   UefiBootServicesTableLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c → Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c


+ 1 - 1
Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf → Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf

@@ -23,7 +23,7 @@
   MdePkg/MdePkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   Silicon/Broadcom/Bcm283x/Bcm283x.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   ArmLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c → Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.c


+ 1 - 1
Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf → Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf

@@ -25,7 +25,7 @@
   MdePkg/MdePkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   Silicon/Broadcom/Bcm283x/Bcm283x.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   PcdLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c → Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FileIo.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c → Platform/RaspberryPi/Drivers/VarBlockServiceDxe/FvbInfo.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c → Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h → Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService.h


+ 0 - 0
Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c → Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c


+ 1 - 1
Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf → Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf

@@ -36,7 +36,7 @@
   ArmPkg/ArmPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   BaseLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Include/IndustryStandard/RpiMbox.h → Platform/RaspberryPi/Include/IndustryStandard/RpiMbox.h


+ 0 - 0
Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h → Platform/RaspberryPi/Include/Protocol/DwUsb.h


+ 0 - 0
Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h → Platform/RaspberryPi/Include/Protocol/ExtendedTextOut.h


+ 0 - 0
Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h → Platform/RaspberryPi/Include/Protocol/RpiFirmware.h


+ 0 - 0
Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h → Platform/RaspberryPi/Include/Protocol/RpiMmcHost.h


+ 0 - 0
Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c → Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf → Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf


+ 0 - 0
Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c → Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h → Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.h


+ 1 - 1
Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf → Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

@@ -32,7 +32,7 @@
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   ShellPkg/ShellPkg.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   BaseLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S → Platform/RaspberryPi/Library/PlatformLib/AArch64/RaspberryPiHelper.S


+ 1 - 1
Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf → Platform/RaspberryPi/Library/PlatformLib/PlatformLib.inf

@@ -23,7 +23,7 @@
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   Silicon/Broadcom/Bcm283x/Bcm283x.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   ArmLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c → Platform/RaspberryPi/Library/PlatformLib/RaspberryPi.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c → Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c


+ 0 - 0
Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c → Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.c


+ 1 - 1
Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.inf → Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.inf

@@ -22,7 +22,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   UefiLib

+ 0 - 0
Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c → Platform/RaspberryPi/Library/ResetLib/ResetLib.c


+ 1 - 1
Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf → Platform/RaspberryPi/Library/ResetLib/ResetLib.inf

@@ -27,7 +27,7 @@
   ArmPkg/ArmPkg.dec
   MdePkg/MdePkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
-  Platform/RaspberryPi/RPi3/RPi3.dec
+  Platform/RaspberryPi/RaspberryPi.dec
 
 [LibraryClasses]
   DebugLib

+ 17 - 17
Platform/RaspberryPi/RPi3/RPi3.dsc

@@ -162,7 +162,7 @@
 [LibraryClasses.common.SEC]
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
-  MemoryInitPeiLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
+  MemoryInitPeiLib|Platform/RaspberryPi/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
   PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
   ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
   LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
@@ -202,7 +202,7 @@
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
-  EfiResetSystemLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/ResetLib/ResetLib.inf
+  EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
 
 !if $(SECURE_BOOT_ENABLE) == TRUE
@@ -332,12 +332,12 @@
 [LibraryClasses.common]
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
-  ArmPlatformLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/PlatformLib/PlatformLib.inf
+  ArmPlatformLib|Platform/RaspberryPi/Library/PlatformLib/PlatformLib.inf
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
-  PlatformBootManagerLib|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+  PlatformBootManagerLib|Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
 
@@ -479,7 +479,7 @@
   #
   ArmPkg/Drivers/CpuDxe/CpuDxe.inf
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
+  Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
     <LibraryClasses>
@@ -506,18 +506,18 @@
 
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+  Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
   MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DisplayDxe/DisplayDxe.inf
+  Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf
 
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 
   UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
   Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/FdtDxe/FdtDxe.inf
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ConfigDxe/ConfigDxe.inf
+  Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
+  Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf
+  Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf
   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@@ -541,7 +541,7 @@
   #
   # SMBIOS Support
   #
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
+  Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
   MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 
   #
@@ -557,12 +557,12 @@
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
   MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/LogoDxe/LogoDxe.inf
+  Platform/RaspberryPi/Drivers/LogoDxe/LogoDxe.inf
   MdeModulePkg/Application/UiApp/UiApp.inf {
     <LibraryClasses>
       NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
       NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
-      NULL|Platform/RaspberryPi/$(PLATFORM_NAME)/Library/PlatformUiAppLib/PlatformUiAppLib.inf
+      NULL|Platform/RaspberryPi/Library/PlatformUiAppLib/PlatformUiAppLib.inf
       NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
   }
 
@@ -575,7 +575,7 @@
   #
   # USB Support
   #
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
+  Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
@@ -584,9 +584,9 @@
   #
   # SD/MMC support
   #
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/SdHostDxe/SdHostDxe.inf
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
-  Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/MmcDxe/MmcDxe.inf
+  Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf
+  Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
+  Platform/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf
 
   #
   # Networking stack

+ 12 - 12
Platform/RaspberryPi/RPi3/RPi3.fdf

@@ -189,7 +189,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
   INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
+  INF Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
   INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 !if $(SECURE_BOOT_ENABLE) == TRUE
@@ -206,16 +206,16 @@ READ_LOCK_STATUS   = TRUE
   #
   INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
   INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+  INF Platform/RaspberryPi/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
   INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DisplayDxe/DisplayDxe.inf
+  INF Platform/RaspberryPi/Drivers/DisplayDxe/DisplayDxe.inf
 
   INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
   INF Silicon/Broadcom/Bcm283x/Drivers/InterruptDxe/InterruptDxe.inf
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/FdtDxe/FdtDxe.inf
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ConfigDxe/ConfigDxe.inf
+  INF Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
+  INF Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf
+  INF Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
   INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@@ -247,7 +247,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # SMBIOS Support
   #
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
+  INF Platform/RaspberryPi/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
   INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 
   #
@@ -284,7 +284,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # USB Support
   #
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
+  INF Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
@@ -293,14 +293,14 @@ READ_LOCK_STATUS   = TRUE
   #
   # SD/MMC support
   #
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/SdHostDxe/SdHostDxe.inf
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/MmcDxe/MmcDxe.inf
+  INF Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.inf
+  INF Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
+  INF Platform/RaspberryPi/Drivers/MmcDxe/MmcDxe.inf
 
   #
   # Pi logo (splash screen)
   #
-  INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/LogoDxe/LogoDxe.inf
+  INF Platform/RaspberryPi/Drivers/LogoDxe/LogoDxe.inf
 
   #
   # Device Tree support (used by FdtDxe)

+ 1 - 1
Platform/RaspberryPi/RPi3/RPi3.dec → Platform/RaspberryPi/RaspberryPi.dec

@@ -9,7 +9,7 @@
 
 [Defines]
   DEC_SPECIFICATION              = 0x0001001A
-  PACKAGE_NAME                   = RPi3Pkg
+  PACKAGE_NAME                   = RaspberryPi
   PACKAGE_GUID                   = DFA0CA8B-F3AC-4607-96AC-46FA04B84DCC
   PACKAGE_VERSION                = 1.0