ArmPkg: Renamed library 'PL390GicLib' into 'ArmGicLib'

[mirror_edk2.git] / ArmPlatformPkg / ArmRealViewEbPkg / ArmRealViewEb-RTSM-UniCore.fdf

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
index c59d8b49f5f9f0a274206c7d71b120a7d557830a..12a6847aa25ca7f8723fc8009319aababb99f721 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
@@ -27,8 +27,8 @@
 \r
 \r
 [FD.ArmRealViewEb_EFI]\r
-BaseAddress   = 0x40000000  # The base address of the FLASH Device.\r
-Size          = 0x00200000  # The size in bytes of the FLASH Device\r
+BaseAddress   = 0x40000000|gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
+Size          = 0x00200000|gArmTokenSpaceGuid.PcdNormalFdSize\r
 ErasePolarity = 1\r
 BlockSize     = 0x00010000\r
 NumBlocks     = 0x20\r
@@ -50,11 +50,11 @@ NumBlocks     = 0x20
 ################################################################################\r
 \r
 0x00000000|0x00050000\r
-gEmbeddedTokenSpaceGuid.PcdFlashFvSecBase|gEmbeddedTokenSpaceGuid.PcdFlashFvSecSize\r
+gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvBaseSize\r
 FV = FVMAIN_SEC\r
 \r
 0x00050000|0x00100000\r
-gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase|gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize\r
+gArmTokenSpaceGuid.PcdNormalFvBaseAddress|gArmTokenSpaceGuid.PcdNormalFvSize\r
 FV = FVMAIN_COMPACT\r
 \r
 ################################################################################\r
@@ -126,9 +126,17 @@ READ_LOCK_STATUS   = TRUE
   INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
   INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf\r
 \r
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
   INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf\r
-   \r
-  INF EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf\r
+\r
+  #\r
+  # Multiple Console IO support\r
+  #\r
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
+  INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
+  INF EmbeddedPkg/SerialDxe/SerialDxe.inf\r
   \r
   INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf\r
   INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf\r
@@ -179,22 +187,25 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
+!if $(EDK2_SKIP_PEICORE) == 1\r
+  INF ArmPlatformPkg/PrePi/PeiUniCore.inf\r
+!else\r
   INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf\r
   INF MdeModulePkg/Core/Pei/PeiMain.inf\r
-  INF ArmPlatformPkg/PlatformPei/PlatformPei.inf\r
-  INF ArmPlatformPkg/MemoryInitPei/MemoryInitPei.inf\r
+  INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf\r
+  INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf\r
   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
   INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
   INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
-  \r
+!endif\r
+\r
   FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {\r
     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {\r
       SECTION FV_IMAGE = FVMAIN\r
     }\r
   }\r
 \r
-\r
 ################################################################################\r
 #\r
 # Rules are use with the [FV] section's module INF type to define\r
@@ -211,10 +222,10 @@ READ_LOCK_STATUS   = TRUE
 #\r
 #[Rule.Common.DXE_DRIVER]\r
 #  FILE DRIVER = $(NAMED_GUID) {\r
-#    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+#    DXE_DEPEX    DXE_DEPEX               Optional $(INF_OUTPUT)/$(MODULE_NAME).depex\r
 #    COMPRESS PI_STD {\r
 #      GUIDED {\r
-#        PE32     PE32                    |.efi\r
+#        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
 #        UI       STRING="$(MODULE_NAME)" Optional\r
 #        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
 #      }\r
@@ -225,60 +236,60 @@ READ_LOCK_STATUS   = TRUE
 \r
 [Rule.Common.SEC]\r
   FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {\r
-    TE  TE    Align = 32      |.efi\r
+    TE  TE    Align = 32                  $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    TE     TE           |.efi\r
+    TE     TE                             $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI     STRING ="$(MODULE_NAME)" Optional         \r
   }\r
 \r
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
-     PEI_DEPEX PEI_DEPEX Optional        |.depex\r
-     TE       TE                         |.efi\r
+     PEI_DEPEX PEI_DEPEX Optional         $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+     TE       TE                          $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional         \r
   }\r
 \r
 [Rule.Common.PEIM.TIANOCOMPRESSED]\r
   FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {\r
-    PEI_DEPEX PEI_DEPEX Optional         |.depex\r
+    PEI_DEPEX PEI_DEPEX Optional          $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {\r
-      PE32      PE32                     |.efi\r
+      PE32      PE32                      $(INF_OUTPUT)/$(MODULE_NAME).efi\r
       UI        STRING="$(MODULE_NAME)" Optional\r
     }\r
   }\r
 \r
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
-    PE32     PE32           |.efi\r
+    PE32     PE32                        $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
   }\r
 \r
 [Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
-    PE32         PE32                    |.efi\r
+    DXE_DEPEX    DXE_DEPEX               Optional $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32         PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI           STRING="$(MODULE_NAME)" Optional\r
   }\r
 \r
 [Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
-    PE32         PE32                    |.efi\r
+    DXE_DEPEX    DXE_DEPEX               Optional $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32         PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI           STRING="$(MODULE_NAME)" Optional\r
   }\r
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
-    PE32         PE32                    |.efi\r
+    DXE_DEPEX    DXE_DEPEX               Optional $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32         PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI           STRING="$(MODULE_NAME)" Optional\r
   }\r
 \r
 [Rule.Common.UEFI_APPLICATION]\r
   FILE APPLICATION = $(NAMED_GUID) {\r
     UI     STRING ="$(MODULE_NAME)" Optional         \r
-    PE32   PE32                    |.efi\r
+    PE32   PE32                          $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r