elf relocpatch_pcd_reloc_noserial

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

2 files changed, 4 insertions, 16 deletions

diff --git a/Platform/QemuVirt/PlatformStandaloneMm.dsc b/Platform/QemuVirt/PlatformStandaloneMm.dsc
index 47b61f76..ad855b70 100644
--- a/Platform/QemuVirt/PlatformStandaloneMm.dsc
+++ b/Platform/QemuVirt/PlatformStandaloneMm.dsc
@@ -34,7 +34,7 @@
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

   ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf

   FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf

@@ -42,6 +42,7 @@
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

   MemLib|StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf

   MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMmCoreMemoryAllocationLib.inf

+  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf

   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

   PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf

   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

@@ -59,11 +60,6 @@
   CacheMaintenanceLib|MdePkg/Library/CacheMaintenanceLibNull/CacheMaintenanceLibNull.inf

   PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf

 

-  # ARM PL011 UART Driver

-  PL011UartClockLib|ArmPlatformPkg/Library/PL011UartClockLib/PL011UartClockLib.inf

-  PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf

-  SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf

-

   #

   # It is not possible to prevent the ARM compiler for generic intrinsic functions.

   # This library provides the intrinsic functions generate by a given compiler.

@@ -91,12 +87,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xff

   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0f

 

-  # PL011 - Serial Terminal

-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x40418000

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

-  gArmPlatformTokenSpaceGuid.PL011UartClkInHz|0xA6E49C0

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0

-

   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2

   # Secure Storage

   gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|TRUE

diff --git a/Platform/QemuVirt/PlatformStandaloneMm.fdf b/Platform/QemuVirt/PlatformStandaloneMm.fdf
index 7cc0e023..cfdb8c8d 100644
--- a/Platform/QemuVirt/PlatformStandaloneMm.fdf
+++ b/Platform/QemuVirt/PlatformStandaloneMm.fdf
@@ -19,9 +19,8 @@
 ################################################################################

 

 [FD.BL32_AP_MM]

-#BaseAddress   = 0x40004000|gArmTokenSpaceGuid.PcdFdBaseAddress  # UEFI in DRAM + 128MB.

-BaseAddress   = 0x0|gArmTokenSpaceGuid.PcdFdBaseAddress  # UEFI in DRAM + 128MB.

-Size          = 0x00300000|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the device (64MiB).

+BaseAddress   = 0x10

+Size          = 0x00300000

 ErasePolarity = 1

 

 BlockSize     = 0x00001000

@@ -44,7 +43,6 @@ NumBlocks     = 0x0300
 ################################################################################

 

 0x00000000|0x00280000

-gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize

 FV = FVMAIN_COMPACT

 

 [FV.FVMAIN_COMPACT]