nitrogen: add proper APRIORI & DXE.inc, remove non-existing ACPI

Linux-On-Sdm6Series · Jul 8, 2024 · 004e461 · 004e461
1 parent 608649a
commit 004e461
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 29 deletions.
diff --git a/Platforms/Xiaomi/nitrogenPkg/Include/ACPI.inc b/Platforms/Xiaomi/nitrogenPkg/Include/ACPI.inc
@@ -1,11 +1,11 @@
 FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
   SECTION RAW = SDM660/APIC.aml
-  SECTION RAW = SDM660/CSRT.aml
+# SECTION RAW = SDM660/CSRT.aml
   SECTION RAW = SDM660/DBG2.aml
   SECTION RAW = nitrogen/DSDT.aml
   SECTION RAW = SDM660/FACP.aml
   SECTION RAW = SDM660/GTDT.aml
-  SECTION RAW = SDM660/MCFG.aml
+# SECTION RAW = SDM660/MCFG.aml
 #  SECTION RAW = SDM660/APIC.UniCore.aml
 #  SECTION RAW = SDM660/BERT.aml
 #  SECTION RAW = SDM660/BGRT.aml

diff --git a/Platforms/Xiaomi/nitrogenPkg/Include/APRIORI.inc b/Platforms/Xiaomi/nitrogenPkg/Include/APRIORI.inc
@@ -15,8 +15,9 @@ APRIORI DXE {
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
 
   # Core Drivers
-  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+  INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
 
   INF Binaries/nitrogen/QcomPkg/Drivers/SmemDxe/SmemDxe.inf
 
@@ -26,6 +27,9 @@ APRIORI DXE {
   INF Binaries/nitrogen/QcomPkg/Drivers/HWIODxe/HWIODxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/ChipInfoDxe/ChipInfoDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/PlatformInfoDxe/PlatformInfoDxe.inf
+
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+
   INF Binaries/nitrogen/QcomPkg/Drivers/GLinkDxe/GLinkDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/ULogDxe/ULogDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/NpaDxe/NpaDxe.inf
@@ -35,33 +39,19 @@ APRIORI DXE {
 
   INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
-  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 
   INF Binaries/nitrogen/QcomPkg/Drivers/SdccDxe/SdccDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/UFSDxe/UFSDxe.inf
 
   INF FatPkg/EnhancedFatDxe/Fat.inf
-
-  #INF Binaries/nitrogen/QcomPkg/Drivers/TzDxe/TzDxeLA.inf
+
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+
+  INF Binaries/nitrogen/QcomPkg/Drivers/QdssDxe/QdssDxe.inf
 
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
-
-  INF Binaries/nitrogen/QcomPkg/Drivers/TLMMDxe/TLMMDxe.inf
-  INF Binaries/nitrogen/QcomPkg/Drivers/SPMIDxe/SPMIDxe.inf
-
-  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
-
-  INF Binaries/nitrogen/QcomPkg/Drivers/PmicDxe/PmicDxeLa.inf
-
-!if $(USE_CUSTOM_DISPLAY_DRIVER) == 1
-  INF Binaries/nitrogen/QcomPkg/Drivers/DisplayDxe/DisplayDxe.inf
-!else
-  INF SiliciumPkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
-!endif
-
-  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
-  INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
   INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
+  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
   INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
   INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
@@ -71,25 +61,49 @@ APRIORI DXE {
   INF Binaries/nitrogen/QcomPkg/Drivers/FontDxe/FontDxe.inf
 
   INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
-
+
+  INF Binaries/nitrogen/QcomPkg/Drivers/TLMMDxe/TLMMDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/I2CDxe/I2CDxe.inf
+  INF Binaries/nitrogen/QcomPkg/Drivers/SPMIDxe/SPMIDxe.inf
+  INF Binaries/nitrogen/QcomPkg/Drivers/SPIDxe/SPIDxe.inf
+  INF Binaries/nitrogen/QcomPkg/Drivers/PmicDxe/PmicDxeLa.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/AdcDxe/AdcDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/QcomChargerDxe/QcomChargerDxeLA.inf
-  #INF Binaries/nitrogen/QcomPkg/Drivers/ChargerExDxe/ChargerExDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/UsbfnDwc3Dxe/UsbfnDwc3Dxe.inf
 
+  INF Binaries/generic/QcomPkg/Drivers/XhciPciEmulationDxe/XhciPciEmulationDxe.inf
+  INF Binaries/generic/QcomPkg/Drivers/XhciDxe/XhciDxe.inf
+
   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 
   INF Binaries/nitrogen/QcomPkg/Drivers/UsbConfigDxe/UsbConfigDxe.inf
+
+  INF EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+
   INF Binaries/nitrogen/QcomPkg/Drivers/ButtonsDxe/ButtonsDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/TsensDxe/TsensDxe.inf
+
+!if $(USE_CUSTOM_DISPLAY_DRIVER) == 1
+  INF Binaries/nitrogen/QcomPkg/Drivers/DisplayDxe/DisplayDxe.inf
+!else
+  INF SiliciumPkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
+!endif
+
+  #INF Binaries/nitrogen/QcomPkg/Drivers/TzDxe/TzDxeLA.inf
+  INF Binaries/nitrogen/QcomPkg/Drivers/LimitsDxe/LimitsDxe.inf
+  INF Binaries/nitrogen/QcomPkg/Drivers/MdtpDxe/MdtpDxe.inf
+
+  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+  INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
+  INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
+
   INF Binaries/nitrogen/QcomPkg/Drivers/HashDxe/HashDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/RNGDxe/RngDxe.inf
+  INF Binaries/nitrogen/QcomPkg/Drivers/MpPowerDxe/MpPowerDxe.inf
 
-  INF EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
-  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
-  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
 }
diff --git a/Platforms/Xiaomi/nitrogenPkg/Include/DXE.inc b/Platforms/Xiaomi/nitrogenPkg/Include/DXE.inc
@@ -5,6 +5,7 @@
   INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
 
   #INF Binaries/nitrogen/QcomPkg/Drivers/TzDxe/TzDxeLA.inf
+  INF Binaries/nitrogen/QcomPkg/Drivers/MdtpDxe/MdtpDxe.inf
 
   INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
@@ -50,6 +51,7 @@
 
   INF Binaries/nitrogen/QcomPkg/Drivers/HWIODxe/HWIODxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/I2CDxe/I2CDxe.inf
+  INF Binaries/nitrogen/QcomPkg/Drivers/SPIDxe/SPIDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/SPMIDxe/SPMIDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/SdccDxe/SdccDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/UFSDxe/UFSDxe.inf
@@ -68,8 +70,13 @@
   INF Binaries/nitrogen/QcomPkg/Drivers/QcomChargerDxe/QcomChargerDxeLA.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/AdcDxe/AdcDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/TsensDxe/TsensDxe.inf
+  INF Binaries/nitrogen/QcomPkg/Drivers/LimitsDxe/LimitsDxe.inf
+  INF Binaries/nitrogen/QcomPkg/Drivers/MpPowerDxe/MpPowerDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/UsbfnDwc3Dxe/UsbfnDwc3Dxe.inf
 
+  INF Binaries/generic/QcomPkg/Drivers/XhciPciEmulationDxe/XhciPciEmulationDxe.inf
+  INF Binaries/generic/QcomPkg/Drivers/XhciDxe/XhciDxe.inf
+
   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
@@ -81,4 +88,6 @@
   INF Binaries/nitrogen/QcomPkg/Drivers/HashDxe/HashDxe.inf
   INF Binaries/nitrogen/QcomPkg/Drivers/RNGDxe/RngDxe.inf
 
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+
+  INF Binaries/nitrogen/QcomPkg/Drivers/QdssDxe/QdssDxe.inf