add Synaptic touchscreen support for enchilada

diff --git a/sdm845Pkg/Devices/enchilada.fdf b/sdm845Pkg/Devices/enchilada.fdf
index 8f36fb6096c41eba247d2a5e8794b1e9079788f3..ccffdb77cd9afdb430209ec252574ccb8f99cefa 100644 (file)
--- a/sdm845Pkg/Devices/enchilada.fdf
+++ b/sdm845Pkg/Devices/enchilada.fdf
@@ -105,40 +105,213 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 
   APRIORI DXE {
-    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
-  }
-
-  INF MdeModulePkg/Core/Dxe/DxeMain.inf
-
+  
+  
   #
   # PI DXE Drivers producing Architectural Protocols (EFI Services)
   #
-  INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf
+  INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+  INF MdeModulePkg/Core/Dxe/DxeMain.inf
+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
+  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
   INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
+  INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf
+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
-  INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+  
+  #
+  # FAT filesystem + GPT/MBR partitioning
+  #
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
+  INF FatPkg/EnhancedFatDxe/Fat.inf
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+  
   INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
   INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
   INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
-  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+  INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+  INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 
-  FILE DRIVER = af9763a2-033b-4109-8e17-56a98d380c92 {
+  
+  
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+  
+  
+  
+    FILE DRIVER = 9A5163E7-5C29-453F-825C-837A46A81E15 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/SerialDxe/SerialDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/SerialDxe/SerialDxe.efi
+    SECTION UI = "SerialDxe"
+  } 
+
+    FILE DRIVER = f541d663-4a48-40aa-aabf-ff158ccae34c {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/SmemDxe/SmemDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/SmemDxe/SmemDxe.efi
+    SECTION UI = "SmemDxe"
+  }  
+  
+    FILE DRIVER = 8E9BD160-B184-11DF-94E2-0800200C9A66 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/DALSys/DALSys.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/DALSys/DALSys.efi
+    SECTION UI = "DALSys"
+  }
+  
+    FILE DRIVER = 8681CC5A-0DF6-441E-B4B8-E915C538F067 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/HWIODxeDriver/HWIODxeDriver.depex
     SECTION PE32 = sdm845Pkg/Binary/enchilada/HWIODxeDriver/HWIODxeDriver.efi
     SECTION UI = "HWIODxeDriver"
   }
 
-  FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
+    FILE DRIVER = 10e193df-9966-44e7-b17c-59dd831e20fc {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/ChipInfo/ChipInfo.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/ChipInfo/ChipInfo.efi
+    SECTION UI = "ChipInfo"
+  }
+
+    FILE DRIVER = B105211B-BBBD-4ADD-A3B0-D1CF4A52154C {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/PlatformInfoDxeDriver/PlatformInfoDxeDriver.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/PlatformInfoDxeDriver/PlatformInfoDxeDriver.efi
+    SECTION UI = "PlatformInfoDxeDriver"
+  }
+
+    FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/HALIOMMU/HALIOMMU.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/HALIOMMU/HALIOMMU.efi
+    SECTION UI = "HALIOMMU"
+  }
+
+    FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/ULogDxe/ULogDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/ULogDxe/ULogDxe.efi
+    SECTION UI = "ULogDxe"
+  }
+
+    FILE DRIVER = ABA01FF8-2CCB-4E12-8B2E-CD3F4A742993 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/CmdDbDxe/CmdDbDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/CmdDbDxe/CmdDbDxe.efi
+    SECTION UI = "CmdDbDxe"
+  }
+
+    FILE DRIVER = CB29F4D1-7F37-4692-A416-93E82E219711 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/NpaDxe/NpaDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/NpaDxe/NpaDxe.efi
+    SECTION UI = "NpaDxe"
+  }
+  
+    FILE DRIVER = CB29F4D1-7F37-4692-A416-93E82E219766 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/RpmhDxe/RpmhDxe.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/RpmhDxe/RpmhDxe.efi
+       SECTION UI = "RpmhDxe"
+  }
+
+    FILE DRIVER = B43C22DB-6333-490C-872D-0A73439059FD {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/PdcDxe/PdcDxe.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/PdcDxe/PdcDxe.efi
+       SECTION UI = "PdcDxe"
+  }
+
+    FILE DRIVER = 4DB5DEA6-5302-4D1A-8A82-677A683B0D29 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/ClockDxe/ClockDxe.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/ClockDxe/ClockDxe.efi
+       SECTION UI = "ClockDxe"
+  }
+
+    FILE DRIVER = 1B52138D-3FA3-4E50-B958-20887353F809 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/CPRDxe/CPRDxe.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/CPRDxe/CPRDxe.efi
+       SECTION UI = "CPRDxe"
+  }
+
+    FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/DALTLMM/DALTLMM.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/DALTLMM/DALTLMM.efi
+       SECTION UI = "DALTLMM"
+  }
+
+    FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/I2C/I2C.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/I2C/I2C.efi
+       SECTION UI = "I2C"
+  }
+
+    FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/SPMI/SPMI.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/SPMI/SPMI.efi
+    SECTION UI = "SPMI"
+  }
+
+    FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/PmicDxe/PmicDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/enchilada/PmicDxe/PmicDxe.efi
     SECTION UI = "PmicDxe"
   }
 
-  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
+    FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
+    SECTION UI = "UsbPwrCtrlDxe"
+  }
+
+    FILE DRIVER = 94f8a6a7-dc34-4101-88c1-99179cceae83 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbfnDwc3Dxe/UsbfnDwc3Dxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
+    SECTION UI = "UsbfnDwc3Dxe"
+  }
+
+    FILE DRIVER = cd823a4d-7dec-4531-ae5d-4134fa4127b8 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbConfigDxe/UsbConfigDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbConfigDxe/UsbConfigDxe.efi
+    SECTION UI = "UsbConfigDxe"
+  }
+
+    FILE DRIVER = 0A134F0E-075E-40B3-9C63-3B3906804663 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbInitDxe/UsbInitDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbInitDxe/UsbInitDxe.efi
+    SECTION UI = "UsbInitDxe"
+  }
+
+    FILE DRIVER = 3299a266-15f0-4346-8318-716336736d3e {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbDeviceDxe/UsbDeviceDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbDeviceDxe/UsbDeviceDxe.efi
+    SECTION UI = "UsbDeviceDxe"
+  }
+
+    FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/ButtonsDxe/ButtonsDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/enchilada/ButtonsDxe/ButtonsDxe.efi
     SECTION UI = "ButtonsDxe"
   }
+  
+    
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
+  
+}
+  
+  INF MdeModulePkg/Core/Dxe/DxeMain.inf
+
+
+  #
+  # PI DXE Drivers producing Architectural Protocols (EFI Services)
+  #
+  INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+  INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf
+  INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
+  INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
+  INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+  INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
+  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
+  INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+
+ 
 
   #
   # Multiple Console IO support
@@ -147,45 +320,182 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
   INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-  INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
+
 
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
 
   INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
 
-  INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+  FILE DRIVER = 9A5163E7-5C29-453F-825C-837A46A81E15 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/SerialDxe/SerialDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/SerialDxe/SerialDxe.efi
+    SECTION UI = "SerialDxe"
+  } 
 
-  FILE DRIVER = 3299a266-15f0-4346-8318-716336736d3e {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbDeviceDxe/UsbDeviceDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbDeviceDxe/UsbDeviceDxe.efi
-    SECTION UI = "UsbDeviceDxe"
+    FILE DRIVER = f541d663-4a48-40aa-aabf-ff158ccae34c {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/SmemDxe/SmemDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/SmemDxe/SmemDxe.efi
+    SECTION UI = "SmemDxe"
+  }  
+  
+    FILE DRIVER = 8E9BD160-B184-11DF-94E2-0800200C9A66 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/DALSys/DALSys.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/DALSys/DALSys.efi
+    SECTION UI = "DALSys"
+  }
+  
+    FILE DRIVER = 8681CC5A-0DF6-441E-B4B8-E915C538F067 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/HWIODxeDriver/HWIODxeDriver.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/HWIODxeDriver/HWIODxeDriver.efi
+    SECTION UI = "HWIODxeDriver"
+  }
+
+    FILE DRIVER = 10e193df-9966-44e7-b17c-59dd831e20fc {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/ChipInfo/ChipInfo.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/ChipInfo/ChipInfo.efi
+    SECTION UI = "ChipInfo"
+  }
+
+    FILE DRIVER = B105211B-BBBD-4ADD-A3B0-D1CF4A52154C {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/PlatformInfoDxeDriver/PlatformInfoDxeDriver.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/PlatformInfoDxeDriver/PlatformInfoDxeDriver.efi
+    SECTION UI = "PlatformInfoDxeDriver"
+  }
+
+    FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/HALIOMMU/HALIOMMU.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/HALIOMMU/HALIOMMU.efi
+    SECTION UI = "HALIOMMU"
+  }
+
+    FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/ULogDxe/ULogDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/ULogDxe/ULogDxe.efi
+    SECTION UI = "ULogDxe"
+  }
+
+    FILE DRIVER = ABA01FF8-2CCB-4E12-8B2E-CD3F4A742993 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/CmdDbDxe/CmdDbDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/CmdDbDxe/CmdDbDxe.efi
+    SECTION UI = "CmdDbDxe"
+  }
+
+    FILE DRIVER = CB29F4D1-7F37-4692-A416-93E82E219711 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/NpaDxe/NpaDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/NpaDxe/NpaDxe.efi
+    SECTION UI = "NpaDxe"
+  }
+  
+    FILE DRIVER = CB29F4D1-7F37-4692-A416-93E82E219766 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/RpmhDxe/RpmhDxe.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/RpmhDxe/RpmhDxe.efi
+       SECTION UI = "RpmhDxe"
+  }
+
+    FILE DRIVER = B43C22DB-6333-490C-872D-0A73439059FD {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/PdcDxe/PdcDxe.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/PdcDxe/PdcDxe.efi
+       SECTION UI = "PdcDxe"
   }
 
-  FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
+    FILE DRIVER = 4DB5DEA6-5302-4D1A-8A82-677A683B0D29 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/ClockDxe/ClockDxe.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/ClockDxe/ClockDxe.efi
+       SECTION UI = "ClockDxe"
+  }
+
+    FILE DRIVER = 1B52138D-3FA3-4E50-B958-20887353F809 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/CPRDxe/CPRDxe.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/CPRDxe/CPRDxe.efi
+       SECTION UI = "CPRDxe"
+  }
+
+    FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/DALTLMM/DALTLMM.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/DALTLMM/DALTLMM.efi
+       SECTION UI = "DALTLMM"
+  }
+
+    FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/I2C/I2C.depex
+       SECTION PE32 = sdm845Pkg/Binary/enchilada/I2C/I2C.efi
+       SECTION UI = "I2C"
+  }
+
+    FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/SPMI/SPMI.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/SPMI/SPMI.efi
+    SECTION UI = "SPMI"
+  }
+
+    FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/PmicDxe/PmicDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/PmicDxe/PmicDxe.efi
+    SECTION UI = "PmicDxe"
+  }
+
+    FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
     SECTION UI = "UsbPwrCtrlDxe"
   }
 
-  FILE DRIVER = 5af77f10-90df-4e7e-8325-a17ec09d5443 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbMsdDxe/UsbMsdDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbMsdDxe/UsbMsdDxe.efi
-    SECTION UI = "UsbMsdDxe"
-  }
-
-  FILE DRIVER = 94f8a6a7-dc34-4101-88c1-99179cceae83 {
+    FILE DRIVER = 94f8a6a7-dc34-4101-88c1-99179cceae83 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbfnDwc3Dxe/UsbfnDwc3Dxe.depex
     SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
     SECTION UI = "UsbfnDwc3Dxe"
   }
 
-  FILE DRIVER = cd823a4d-7dec-4531-ae5d-4134fa4127b8 {
+    FILE DRIVER = cd823a4d-7dec-4531-ae5d-4134fa4127b8 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbConfigDxe/UsbConfigDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbConfigDxe/UsbConfigDxe.efi
     SECTION UI = "UsbConfigDxe"
   }
 
+    FILE DRIVER = 0A134F0E-075E-40B3-9C63-3B3906804663 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbInitDxe/UsbInitDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbInitDxe/UsbInitDxe.efi
+    SECTION UI = "UsbInitDxe"
+  }
+
+    FILE DRIVER = 3299a266-15f0-4346-8318-716336736d3e {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbDeviceDxe/UsbDeviceDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbDeviceDxe/UsbDeviceDxe.efi
+    SECTION UI = "UsbDeviceDxe"
+  }
+
+    FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+  }
+
+  FILE DRIVER = 5af77f10-90df-4e7e-8325-a17ec09d5443 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UsbMsdDxe/UsbMsdDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/UsbMsdDxe/UsbMsdDxe.efi
+    SECTION UI = "UsbMsdDxe"
+  }
+
+    FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UFSDxe/UFSDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/UFSDxe/UFSDxe.efi
+    SECTION UI = "UFSDxe"
+  }
+   
+    FILE DRIVER = F0D87C5E-4D5D-4FB5-939F-A6768AE8A309 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/Synaptics/SynapticsTouchDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/Synaptics/SynapticsTouchDxe.efi
+    SECTION UI = "SynapticsTouchDxe"
+  }
+
+    FILE DRIVER = F0D87C5E-4D5D-4FB5-939F-A6768AE8A310 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/Synaptics/SynapticsTouchDeviceDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/enchilada/Synaptics/SynapticsTouchDeviceDxe.efi
+    SECTION UI = "SynapticsTouchDeviceDxe"
+  }
+  
+
   #
   # GPIO
   #
@@ -195,37 +505,11 @@ READ_LOCK_STATUS   = TRUE
   #
   INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf
 
-  INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf
-  INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
+  INF sdm845Pkg/sdm845Dxe/sdm845Dxe.inf
+  INF sdm845Pkg/SimpleFbDxe/SimpleFbDxe.inf
 
-  FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/UFSDxe/UFSDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/enchilada/UFSDxe/UFSDxe.efi
-    SECTION UI = "UFSDxe"
-  }
-  FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/SPMI/SPMI.depex
-    SECTION PE32 = sdm845Pkg/Binary/enchilada/SPMI/SPMI.efi
-    SECTION UI = "SPMI"
-  }
 
-  FILE DRIVER = f541d663-4a48-40aa-aabf-ff158ccae34c {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/SmemDxe/SmemDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/enchilada/SmemDxe/SmemDxe.efi
-    SECTION UI = "SmemDxe"
-  }
-    
-  FILE DRIVER = 10e193df-9966-44e7-b17c-59dd831e20fc {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/ChipInfo/ChipInfo.depex
-    SECTION PE32 = sdm845Pkg/Binary/enchilada/ChipInfo/ChipInfo.efi
-    SECTION UI = "ChipInfo"
-  }
 
- #FILE DRIVER = 7a32bd23-f735-4f57-aa1a-447d2fe3be0d {
- #  SECTION DXE_DEPEX = sdm845Pkg/Binary/enchilada/SPI/SPI.depex
- #  SECTION PE32 = sdm845Pkg/Binary/enchilada/SPI/SPI.efi
- #  SECTION UI = "SPI"
- #}
 
 
   #
@@ -241,7 +525,7 @@ READ_LOCK_STATUS   = TRUE
   #
   # USB Peripheral Support
   #
-  INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
+  #INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
 
   #
   # Fastboot
@@ -269,39 +553,49 @@ READ_LOCK_STATUS   = TRUE
   # INF RuleOverride = ACPITABLE sdm845Pkg/AcpiTables/AcpiTables.inf
 
   FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
-    # SECTION RAW = sdm845Pkg/AcpiTables/minimal/DBG2.aml
-    # SECTION RAW = sdm845Pkg/AcpiTables/minimal/DSDT.aml
-    # SECTION RAW = sdm845Pkg/AcpiTables/minimal/FACP.aml
-    # SECTION RAW = sdm845Pkg/AcpiTables/minimal/GTDT.aml
-    # SECTION RAW = sdm845Pkg/AcpiTables/minimal/APIC.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/DBG2.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/DSDT.aml
+
+   
+   SECTION RAW = sdm845Pkg/AcpiTables/testing/DBG2.aml
+       SECTION RAW = sdm845Pkg/AcpiTables/845/DSDT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/CSRT.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/FADT.aml
+       SECTION RAW = sdm845Pkg/AcpiTables/testing/FADT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/FACS.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/GTDT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/IORT.aml
-    SECTION RAW = sdm845Pkg/AcpiTables/testing/MCFG.aml
+       SECTION RAW = sdm845Pkg/AcpiTables/testing/MCFG.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/MADT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/PPTT.aml
     SECTION RAW = sdm845Pkg/AcpiTables/testing/TPM2.aml
-    SECTION UI = "AcpiTables"
+         SECTION UI = "AcpiTables"
   }
 
+
+  
+   INF  sdm845Pkg/Binary/enchilada/shell/Shell.inf
+
+  
+  
+  
   #
   # SMBIOS Support
   #
   INF sdm845Pkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
   INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-
+  
+  
   #
   # UEFI applications
   #
-  INF ShellPkg/Application/Shell/Shell.inf
+  #INF ShellPkg/Application/Shell/Shell.inf
 !ifdef $(INCLUDE_TFTP_COMMAND)
-  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
+ INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 !endif #$(INCLUDE_TFTP_COMMAND)
 
+
+
+
+
+
   #
   # Bds
   #
@@ -311,6 +605,9 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
   INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
   INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+  
+
+  
   INF MdeModulePkg/Application/UiApp/UiApp.inf
   INF sdm845Pkg/Drivers/LogoDxe/LogoDxe.inf
 
@@ -341,3 +638,5 @@ READ_LOCK_STATUS   = TRUE
   }
 
 !include sdm845Pkg/CommonFdf.fdf.inc
+
+