new Branch

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "edk2"]
+[submodule "edk2"]
 	path = edk2
 	url = https://github.com/tianocore/edk2.git
-[submodule "edk2-platforms"]
+[submodule "edk2-platforms"]
 	path = edk2-platforms
 	url = https://github.com/tianocore/edk2-platforms.git

MSM8998Pkg/CommonDsc.dsc.inc

@@ -13,6 +13,8 @@
 #
 #
 
+!include MdePkg/MdeLibs.dsc.inc
+
 [LibraryClasses.common]
 !if $(TARGET) == RELEASE
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
@@ -30,6 +32,8 @@
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
   PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
+  OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
 
@@ -62,7 +66,7 @@
   ArmGicArchLib|ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf
   ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
-  ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
+  ArmMmuLib|MSM8998Pkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
 
   ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
 
@@ -163,7 +167,7 @@
   ## Fixed compile error after upgrade to 14.10
   PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
   PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf
+  ArmMmuLib|MSM8998Pkg/Library/ArmMmuLib/ArmMmuPeiLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
 
 [LibraryClasses.common.DXE_CORE]
@@ -215,6 +219,9 @@
 !if $(TARGET) != RELEASE
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
+  #
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
+  #
 
 [LibraryClasses.AARCH64]
   ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
@@ -295,7 +302,8 @@
   #  DEBUG_EVENT     0x00080000  // Event messages
   #  DEBUG_ERROR     0x80000000  // Error
 
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000488
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x800B458F
+  # gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8FFFFFFF
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06
 
   #

MSM8998Pkg/Devices/MSM8998Pkg.fdf

@@ -360,8 +360,8 @@ APRIORI DXE {
     #
     INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf
 
-    INF MSM8998Pkg/MSM8998Dxe/MSM8998Dxe.inf
-    INF MSM8998Pkg/SimpleFbDxe/SimpleFbDxe.inf
+    INF MSM8998Pkg/Drivers/MSM8998Dxe/MSM8998Dxe.inf
+    INF MSM8998Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
 
     #
     # USB Host Support

MSM8998Pkg/Devices/nash.dsc

@@ -17,3 +17,6 @@
 
   gMSM8998PkgTokenSpaceGuid.PcdMipiFrameBufferWidth|1440
   gMSM8998PkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2560
+
+  # RTC information
+  gMSM8998PkgTokenSpaceGuid.PcdBootShimInfo1|0xaf000000|UINT64|0x00000a601

MSM8998Pkg/Devices/nash.fdf

@@ -141,79 +141,7 @@ APRIORI DXE {
     INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
     INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
 
-    FILE DRIVER = f541d663-4a48-40aa-aabf-ff158ccae34c {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/SmemDxe/SmemDxe.depex
-    SECTION PE32 = MSM8998Pkg/Binary/SmemDxe/SmemDxe.efi
-    SECTION UI = "SmemDxe"
-    }
-
-    FILE DRIVER = 8e9bd160-b184-11df-94e2-0800200c9a66 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/DALSys/DALSys.depex
-    SECTION PE32 = MSM8998Pkg/Binary/DALSys/DALSys.efi
-    SECTION UI = "DALSys"
-    }
-
-    FILE DRIVER = af9763a2-033b-4109-8e17-56a98d380c92 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/HWIODxeDriver/HWIODxeDriver.depex
-    SECTION PE32 = MSM8998Pkg/Binary/HWIODxeDriver/HWIODxeDriver.efi
-    SECTION UI = "HWIODxeDriver"
-    }
-
-    FILE DRIVER = 10e193df-9966-44e7-b17c-59dd831e20fc {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/ChipInfo/ChipInfo.depex
-    SECTION PE32 = MSM8998Pkg/Binary/ChipInfo/ChipInfo.efi
-    SECTION UI = "ChipInfo"
-    }
-
-    FILE DRIVER = b105211b-bbbd-4add-a3b0-d1cf4a52154c {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/PlatformInfoDxeDriver/PlatformInfoDxeDriver.depex
-    SECTION PE32 = MSM8998Pkg/Binary/PlatformInfoDxeDriver/PlatformInfoDxeDriver.efi
-    SECTION UI = "PlatformInfoDxeDriver"
-    }
-
-    FILE DRIVER = 7942a7eb-b7d5-4e2e-b908-831e4de55b58 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/GlinkDxe/GlinkDxe.depex
-    SECTION PE32 = MSM8998Pkg/Binary/GlinkDxe/GlinkDxe.efi
-    SECTION UI = "GlinkDxe"
-    }
-
-    FILE DRIVER = e43128a8-8692-42b6-8afa-676158578d18 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/ULogDxe/ULogDxe.depex
-    SECTION PE32 = MSM8998Pkg/Binary/ULogDxe/ULogDxe.efi
-    SECTION UI = "ULogDxe"
-    }
-
-
-#    FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
-#    SECTION DXE_DEPEX = MSM8998Pkg/Binary/SPMI/SPMI.depex
-#    SECTION PE32 = MSM8998Pkg/Binary/SPMI/SPMI.efi
-#    SECTION UI = "SPMI"
-#    }
-
-    FILE DRIVER = 7a32bd23-f735-4f57-aa1a-447d2fe3be0d {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/SPI/SPI.depex
-    SECTION PE32 = MSM8998Pkg/Binary/SPI/SPI.efi
-    SECTION UI = "SPI"
-    }
-
-    FILE DRIVER = 04de8591-d2b3-4077-bbbe-b12070094eb6 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/I2C/I2C.depex
-    SECTION PE32 = MSM8998Pkg/Binary/I2C/I2C.efi
-    SECTION UI = "I2C"
-    }
-
-    # other driver
-#    FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
-#    SECTION DXE_DEPEX = MSM8998Pkg/Binary/PmicDxe/PmicDxe.depex
-#    SECTION PE32 = MSM8998Pkg/Binary/PmicDxe/PmicDxe.efi
-#    SECTION UI = "PmicDxe"
-#    }
-
-#    FILE DRIVER = 9A5163E7-5C29-453F-825C-837A46A81E15 {
-#    SECTION DXE_DEPEX = MSM8998Pkg/Binary/SerialDxe/SerialDxe.depex
-#    SECTION PE32 = MSM8998Pkg/Binary/SerialDxe/SerialDxe.efi
-#    SECTION UI = "SerialDxe"
-#    } 
+    !include MSM8998Pkg/Devices_Binary/cheeseburger/dxe.inc
 
     INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
 
@@ -248,120 +176,15 @@ APRIORI DXE {
 
     INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
 
-    #
-    # Binary DXE drivers
-    # WP driver : SmemDxe
-    #
-
-    FILE DRIVER = f541d663-4a48-40aa-aabf-ff158ccae34c {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/SmemDxe/SmemDxe.depex
-    SECTION PE32 = MSM8998Pkg/Binary/SmemDxe/SmemDxe.efi
-    SECTION UI = "SmemDxe"
-    }
-
-    FILE DRIVER = 8e9bd160-b184-11df-94e2-0800200c9a66 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/DALSys/DALSys.depex
-    SECTION PE32 = MSM8998Pkg/Binary/DALSys/DALSys.efi
-    SECTION UI = "DALSys"
-    }
-
-    FILE DRIVER = af9763a2-033b-4109-8e17-56a98d380c92 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/HWIODxeDriver/HWIODxeDriver.depex
-    SECTION PE32 = MSM8998Pkg/Binary/HWIODxeDriver/HWIODxeDriver.efi
-    SECTION UI = "HWIODxeDriver"
-    }
-
-    FILE DRIVER = 10e193df-9966-44e7-b17c-59dd831e20fc {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/ChipInfo/ChipInfo.depex
-    SECTION PE32 = MSM8998Pkg/Binary/ChipInfo/ChipInfo.efi
-    SECTION UI = "ChipInfo"
-    }
-
-    FILE DRIVER = b105211b-bbbd-4add-a3b0-d1cf4a52154c {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/PlatformInfoDxeDriver/PlatformInfoDxeDriver.depex
-    SECTION PE32 = MSM8998Pkg/Binary/PlatformInfoDxeDriver/PlatformInfoDxeDriver.efi
-    SECTION UI = "PlatformInfoDxeDriver"
-    }
-
-    FILE DRIVER = 7942a7eb-b7d5-4e2e-b908-831e4de55b58 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/GlinkDxe/GlinkDxe.depex
-    SECTION PE32 = MSM8998Pkg/Binary/GlinkDxe/GlinkDxe.efi
-    SECTION UI = "GlinkDxe"
-    }
-
-    FILE DRIVER = e43128a8-8692-42b6-8afa-676158578d18 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/ULogDxe/ULogDxe.depex
-    SECTION PE32 = MSM8998Pkg/Binary/ULogDxe/ULogDxe.efi
-    SECTION UI = "ULogDxe"
-    }
-
-#    FILE DRIVER = cb29f4d1-7f37-4692-a416-93e82e219711 {
-#    SECTION DXE_DEPEX = MSM8998Pkg/Binary/NpaDxe/NpaDxe.depex
-#    SECTION PE32 = MSM8998Pkg/Binary/NpaDxe/NpaDxe.efi
-#    SECTION UI = "NpaDxe"
-#    }
-
-#    FILE DRIVER = 4db5dea6-5302-4d1a-8a82-677a683b0d29 {
-#    SECTION DXE_DEPEX = MSM8998Pkg/Binary/ClockDxe/ClockDxe.depex
-#    SECTION PE32 = MSM8998Pkg/Binary/ClockDxe/ClockDxe.efi
-#    SECTION UI = "ClockDxe"
-#    }
-
-    FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/UFSDxe/UFSDxe.depex
-    SECTION PE32 = MSM8998Pkg/Binary/UFSDxe/UFSDxe.efi
-    SECTION UI = "UFSDxe"
-    }
-
-    FILE DRIVER = 8681cc5a-0df6-441e-b4b8-e915c538f067 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/DALTLMM/DALTLMM.depex
-    SECTION PE32 = MSM8998Pkg/Binary/DALTLMM/DALTLMM.efi
-    SECTION UI = "DALTLMM"
-    }
-
-    FILE DRIVER = 04de8591-d2b3-4077-bbbe-b12070094eb6 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/I2C/I2C.depex
-    SECTION PE32 = MSM8998Pkg/Binary/I2C/I2C.efi
-    SECTION UI = "I2C"
-    }
-
-#    FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
-#    SECTION DXE_DEPEX = MSM8998Pkg/Binary/SPMI/SPMI.depex
-#    SECTION PE32 = MSM8998Pkg/Binary/SPMI/SPMI.efi
-#    SECTION UI = "SPMI"
-#    }
-
-    FILE DRIVER = 7a32bd23-f735-4f57-aa1a-447d2fe3be0d {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/SPI/SPI.depex
-    SECTION PE32 = MSM8998Pkg/Binary/SPI/SPI.efi
-    SECTION UI = "SPI"
-    }
-
-#    FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
-#    SECTION DXE_DEPEX = MSM8998Pkg/Binary/PmicDxe/PmicDxe.depex
-#    SECTION PE32 = MSM8998Pkg/Binary/PmicDxe/PmicDxe.efi
-#    SECTION UI = "PmicDxe"
-#    }
-
-    FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = MSM8998Pkg/Binary/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = MSM8998Pkg/Binary/ButtonsDxe/ButtonsDxe.efi
-    SECTION UI = "ButtonsDxe"
-    }
-
-#    FILE DRIVER = 9A5163E7-5C29-453F-825C-837A46A81E15 {
-#    SECTION DXE_DEPEX = MSM8998Pkg/Binary/SerialDxe/SerialDxe.depex
-#    SECTION PE32 = MSM8998Pkg/Binary/SerialDxe/SerialDxe.efi
-#    SECTION UI = "SerialDxe"
-#    } 
+    !include MSM8998Pkg/Devices_Binary/cheeseburger/dxe.inc
 
     #
     # Virtual Keyboard
     #
     INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf
 
-    INF MSM8998Pkg/MSM8998Dxe/MSM8998Dxe.inf
-    INF MSM8998Pkg/SimpleFbDxe/SimpleFbDxe.inf
+  INF MSM8998Pkg/Drivers/msm8998Dxe/msm8998Dxe.inf
+  INF MSM8998Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
 
     #
     # USB Host Support
@@ -403,19 +226,39 @@ APRIORI DXE {
     INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 
     # Use custom ACPI
-    INF RuleOverride = ACPITABLE MSM8998Pkg/AcpiTables/AcpiTables.inf
-
-#    FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
-#        SECTION RAW = MSM8998Pkg/AcpiTables/8998/DBG2.aml
-#        SECTION RAW = MSM8998Pkg/AcpiTables/8998/DSDT.aml
-#        SECTION RAW = MSM8998Pkg/AcpiTables/8998/FACS.aml
-#        SECTION RAW = MSM8998Pkg/AcpiTables/8998/FADT.aml
-#        SECTION RAW = MSM8998Pkg/AcpiTables/8998/GTDT.aml
-#        SECTION RAW = MSM8998Pkg/AcpiTables/8998/MADT.aml
-#        SECTION RAW = MSM8998Pkg/AcpiTables/8998/MCFG.aml
-#        SECTION RAW = MSM8998Pkg/AcpiTables/8998/CSRT.aml
-#        SECTION UI = "AcpiTables"
-#    }
+    # INF RuleOverride = ACPITABLE MSM8998Pkg/AcpiTables/AcpiTables.inf
+
+    FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
+        // SECTION RAW = MSM8998Pkg/AcpiTables/8998/DBG2.aml
+        SECTION RAW = MSM8998Pkg/AcpiTables/8998/DSDT.aml
+        // SECTION RAW = MSM8998Pkg/AcpiTables/8998/FACS.aml
+        // SECTION RAW = MSM8998Pkg/AcpiTables/8998/FADT.aml
+        // SECTION RAW = MSM8998Pkg/AcpiTables/8998/GTDT.aml
+        // SECTION RAW = MSM8998Pkg/AcpiTables/8998/MADT.aml
+        // SECTION RAW = MSM8998Pkg/AcpiTables/8998/MCFG.aml
+        // SECTION RAW = MSM8998Pkg/AcpiTables/8998/CSRT.aml
+        // SECTION RAW = MSM8998Pkg/AcpiTables/asus/facp.aml
+        SECTION RAW = MSM8998Pkg/AcpiTables/asus/bgrt.acp
+        SECTION RAW = MSM8998Pkg/AcpiTables/asus/Csrt.acp
+        SECTION RAW = MSM8998Pkg/AcpiTables/asus/dbg2.acp
+        SECTION RAW = MSM8998Pkg/AcpiTables/asus/Facp.acp
+        SECTION RAW = MSM8998Pkg/AcpiTables/asus/Facs.acp
+        SECTION RAW = MSM8998Pkg/AcpiTables/asus/Gtdt.acp
+        SECTION RAW = MSM8998Pkg/AcpiTables/asus/IORT.acp
+        SECTION RAW = MSM8998Pkg/AcpiTables/asus/Madt.acp
+        SECTION RAW = MSM8998Pkg/AcpiTables/asus/Mcfg.acp
+        // SECTION RAW = MSM8998Pkg/AcpiTables/asus/TPM2.acp
+        SECTION UI = "AcpiTables"
+    }
+
+  #
+  # FDT support
+  #
+  INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
+
+  FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 {
+    SECTION RAW = MSM8998Pkg/FdtBlob/msm8998-mtp.dtb
+  }
 
     #
     # SMBIOS Support