Platforms/ARM: Juno ACPI - synchronize with edk2

Synchronize with svn: r18576

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

5 files changed, 44 insertions, 26 deletions

diff --git a/Platforms/ARM/Juno/AcpiTables/AcpiSsdtRootPci.asl b/Platforms/ARM/Juno/AcpiTables/AcpiSsdtRootPci.asl
index c6d5a9a..7d50a5f 100644
--- a/Platforms/ARM/Juno/AcpiTables/AcpiSsdtRootPci.asl
+++ b/Platforms/ARM/Juno/AcpiTables/AcpiSsdtRootPci.asl
@@ -57,13 +57,13 @@ DefinitionBlock("SsdtPci.aml", "SSDT", 1, "ARMLTD", "ARM-JUNO", EFI_ACPI_ARM_OEM
             Name(_ADR, 0xF0000000)    // Dev 0, Func 0
         }
 
-        // PCI Routing Table
-  		Name(_PRT, Package() {
-        	ROOT_PRT_ENTRY(0, 136),   // INTA
-        	ROOT_PRT_ENTRY(1, 137),   // INTB
-        	ROOT_PRT_ENTRY(2, 138),   // INTC
-        	ROOT_PRT_ENTRY(3, 139),   // INTD
-      	})
+		// PCI Routing Table
+		Name(_PRT, Package() {
+			ROOT_PRT_ENTRY(0, 168),   // INTA
+			ROOT_PRT_ENTRY(1, 169),   // INTB
+			ROOT_PRT_ENTRY(2, 170),   // INTC
+			ROOT_PRT_ENTRY(3, 171),   // INTD
+		})
         // Root complex resources
 		Method (_CRS, 0, Serialized) {
   			Name (RBUF, ResourceTemplate () {
@@ -98,6 +98,19 @@ DefinitionBlock("SsdtPci.aml", "SSDT", 1, "ARMLTD", "ARM-JUNO", EFI_ACPI_ARM_OEM
 					0x00000000, 							// Translate
 					0x100000000								// Length
 				)
+
+				DWordIo ( // IO window
+					ResourceProducer,
+					MinFixed,
+					MaxFixed,
+					PosDecode,
+					EntireRange,
+					0x00000000, 							// Granularity
+					0x5f800000, 							// Min Base Address
+					0x5fffffff, 							// Max Base Address
+					0x5f800000, 							// Translate
+					0x00800000  							// Length
+				)
 			}) // Name(RBUF)
 			
 			Return (RBUF)
diff --git a/Platforms/ARM/Juno/AcpiTables/Madt.aslc b/Platforms/ARM/Juno/AcpiTables/Madt.aslc
index 406bd94..d63a19b 100644
--- a/Platforms/ARM/Juno/AcpiTables/Madt.aslc
+++ b/Platforms/ARM/Juno/AcpiTables/Madt.aslc
@@ -26,19 +26,19 @@
   #pragma pack (1)

 

   typedef struct {

-    EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;

+    EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;

     EFI_ACPI_5_0_GIC_STRUCTURE                            GicInterfaces[FixedPcdGet32 (PcdCoreCount)];

     EFI_ACPI_5_0_GIC_DISTRIBUTOR_STRUCTURE                GicDistributor;

-  } EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;

+  } EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE;

 

   #pragma pack ()

 

-  EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {

+  EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {

     {

       ARM_ACPI_HEADER (

-        EFI_ACPI_1_0_APIC_SIGNATURE,

-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE,

-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION

+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,

+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE,

+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION

       ),

       //

       // MADT specific fields

@@ -68,20 +68,20 @@
   #pragma pack (1)

 

   typedef struct {

-    EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;

+    EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;

     EFI_ACPI_5_1_GIC_STRUCTURE                            GicInterfaces[FixedPcdGet32 (PcdCoreCount)];

     EFI_ACPI_5_0_GIC_DISTRIBUTOR_STRUCTURE                GicDistributor;

     EFI_ACPI_6_0_GIC_MSI_FRAME_STRUCTURE                  MsiFrame;

-  } EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;

+  } EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE;

 

   #pragma pack ()

 

-  EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {

+  EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {

     {

       ARM_ACPI_HEADER (

-        EFI_ACPI_1_0_APIC_SIGNATURE,

-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE,

-        EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION

+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,

+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE,

+        EFI_ACPI_5_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION

       ),

       //

       // MADT specific fields

diff --git a/Platforms/ARM/Juno/ArmJuno.dsc b/Platforms/ARM/Juno/ArmJuno.dsc
index d96c861..fbf09c2 100644
--- a/Platforms/ARM/Juno/ArmJuno.dsc
+++ b/Platforms/ARM/Juno/ArmJuno.dsc
@@ -230,7 +230,10 @@
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   EmbeddedPkg/SerialDxe/SerialDxe.inf

 

-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {

+    <LibraryClasses>

+      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf

+  }

   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

 

   #

diff --git a/Platforms/ARM/Juno/ArmJuno.fdf b/Platforms/ARM/Juno/ArmJuno.fdf
index a0cc913..0ba01e7 100644
--- a/Platforms/ARM/Juno/ArmJuno.fdf
+++ b/Platforms/ARM/Juno/ArmJuno.fdf
@@ -277,8 +277,8 @@ READ_LOCK_STATUS   = TRUE
   }

 

 [Rule.AARCH64.SEC]

-  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {

-    TE  TE    Align = 4K                $(INF_OUTPUT)/$(MODULE_NAME).efi

+  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED FIXED {

+    TE  TE    Align = Auto              $(INF_OUTPUT)/$(MODULE_NAME).efi

   }

 

 # A shim specific rule is required to ensure the alignment is 4K.

@@ -289,13 +289,13 @@ READ_LOCK_STATUS   = TRUE
   }

 

 [Rule.Common.PEI_CORE]

-  FILE PEI_CORE = $(NAMED_GUID) {

+  FILE PEI_CORE = $(NAMED_GUID) FIXED {

     TE     TE                           $(INF_OUTPUT)/$(MODULE_NAME).efi

     UI     STRING ="$(MODULE_NAME)" Optional

   }

 

 [Rule.Common.PEIM]

-  FILE PEIM = $(NAMED_GUID) {

+  FILE PEIM = $(NAMED_GUID) FIXED {

      PEI_DEPEX PEI_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex

      TE       TE                        $(INF_OUTPUT)/$(MODULE_NAME).efi

      UI       STRING="$(MODULE_NAME)" Optional

diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
index 144f9f6..8dfd66e 100644
--- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
+++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
@@ -12,10 +12,11 @@
 #

 

 [Defines]

-  USE_ARM_BDS         = TRUE

+  USE_ARM_BDS         = FALSE

   SECURE_BOOT_ENABLE  = FALSE

 

-[BuildOptions.AARCH64.EDKII.DXE_RUNTIME_DRIVER]

+[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]

+  GCC:*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000

   GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000

 

 [LibraryClasses.common]

@@ -147,6 +148,7 @@
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

 !endif

+  VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

 

 !if $(USE_ARM_BDS) == FALSE

   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf