Fix APRIORI and grow FD

diff --git a/sdm845Pkg/Devices/845.fdf b/sdm845Pkg/Devices/845.fdf
index c064d5f83e71bfbb0b97d88cbc35fbadeb1cb38d..41be497b59f9fd66b1fd16b117014bfecb920629 100644 (file)
--- a/sdm845Pkg/Devices/845.fdf
+++ b/sdm845Pkg/Devices/845.fdf
@@ -68,7 +68,7 @@ DATA = {
   0x00, 0x00, 0x00, 0x00                          # res5
 }
 
-0x00008000|0x004f8000
+0x00008000|0x005f8000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
@@ -116,33 +116,9 @@ APRIORI DXE {
   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 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 MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
-
-  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/845/SerialDxe/SerialDxe.depex
@@ -180,17 +156,15 @@ APRIORI DXE {
     SECTION UI = "PlatformInfoDxeDriver"
   }
 
-  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
-    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
-    SECTION UI = "DDRInfoDxe"
-  }
-
   FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.depex
     SECTION PE32 = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.efi
     SECTION UI = "HALIOMMU"
   }
 
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
+
   FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.efi
@@ -227,23 +201,18 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"
   }
 
-  FILE DRIVER = 1B52138D-3FA3-4E50-B958-20887353F809 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/CPRDxe/CPRDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/CPRDxe/CPRDxe.efi
-    SECTION UI = "CPRDxe"
-  }
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 
-  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
-    SECTION UI = "DALTLMM"
+  FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi
+    SECTION UI = "UFSDxe"
   }
 
-  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
-    SECTION UI = "I2C"
-  }
+  INF FatPkg/EnhancedFatDxe/Fat.inf
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
 
   FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SPMI/SPMI.depex
@@ -251,14 +220,30 @@ APRIORI DXE {
     SECTION UI = "SPMI"
   }
 
-  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
-    SECTION UI = "XhciPciEmulation"
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.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
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
+
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
+
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+
+  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
+    SECTION UI = "DALTLMM"
   }
 
-  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
-    SECTION UI = "XhciDxe"
+  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
+    SECTION UI = "I2C"
   }
 
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
@@ -267,6 +252,16 @@ APRIORI DXE {
     SECTION UI = "PmicDxe"
   }
 
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+
+  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+  }
+
   FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
@@ -278,7 +273,20 @@ APRIORI DXE {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
     SECTION UI = "UsbfnDwc3Dxe"
   }
-  
+
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
+    SECTION UI = "XhciPciEmulation"
+  }
+
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
+    SECTION UI = "XhciDxe"
+  }
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
     SECTION UI = "UsbKbDxe"
@@ -302,14 +310,10 @@ APRIORI DXE {
     SECTION UI = "UsbDeviceDxe"
   }
 
-  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.efi
-    SECTION UI = "ButtonsDxe"
+  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
+    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
+    SECTION UI = "DDRInfoDxe"
   }
-
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
-
 }
 
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -533,7 +537,7 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

diff --git a/sdm845Pkg/Devices/beryllium.fdf b/sdm845Pkg/Devices/beryllium.fdf
index de57b6ed96bed6c90adced84c413c6f103f311a3..0351c70a75fb36925080af99bd728c1342899913 100644 (file)
--- a/sdm845Pkg/Devices/beryllium.fdf
+++ b/sdm845Pkg/Devices/beryllium.fdf
@@ -68,7 +68,7 @@ DATA = {
   0x00, 0x00, 0x00, 0x00                          # res5
 }
 
-0x00008000|0x004f8000
+0x00008000|0x005f8000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
@@ -116,33 +116,9 @@ APRIORI DXE {
   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 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 MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
-
-  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/845/SerialDxe/SerialDxe.depex
@@ -180,17 +156,15 @@ APRIORI DXE {
     SECTION UI = "PlatformInfoDxeDriver"
   }
 
-  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
-    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
-    SECTION UI = "DDRInfoDxe"
-  }
-
   FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.depex
     SECTION PE32 = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.efi
     SECTION UI = "HALIOMMU"
   }
 
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
+
   FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.efi
@@ -227,32 +201,49 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"
   }
 
-  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
-    SECTION UI = "DALTLMM"
-  }
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 
-  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
-    SECTION UI = "I2C"
+  FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi
+    SECTION UI = "UFSDxe"
   }
 
+  INF FatPkg/EnhancedFatDxe/Fat.inf
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
+
   FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SPMI/SPMI.depex
     SECTION PE32 = sdm845Pkg/Binary/845/SPMI/SPMI.efi
     SECTION UI = "SPMI"
   }
 
-  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
-    SECTION UI = "XhciPciEmulation"
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.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
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
+
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
+
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+
+  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
+    SECTION UI = "DALTLMM"
   }
 
-  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
-    SECTION UI = "XhciDxe"
+  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
+    SECTION UI = "I2C"
   }
 
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
@@ -261,6 +252,16 @@ APRIORI DXE {
     SECTION UI = "PmicDxe"
   }
 
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+
+  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/Beryllium/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/Beryllium/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+  }
+
   FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
@@ -272,7 +273,20 @@ APRIORI DXE {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
     SECTION UI = "UsbfnDwc3Dxe"
   }
-  
+
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
+    SECTION UI = "XhciPciEmulation"
+  }
+
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
+    SECTION UI = "XhciDxe"
+  }
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
     SECTION UI = "UsbKbDxe"
@@ -296,14 +310,10 @@ APRIORI DXE {
     SECTION UI = "UsbDeviceDxe"
   }
 
-  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/Beryllium/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/Beryllium/ButtonsDxe/ButtonsDxe.efi
-    SECTION UI = "ButtonsDxe"
+  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
+    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
+    SECTION UI = "DDRInfoDxe"
   }
-
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
-
 }
 
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -521,7 +531,7 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

diff --git a/sdm845Pkg/Devices/dipper.fdf b/sdm845Pkg/Devices/dipper.fdf
index 757446ac01cd171dab5ef864e73715f7c5e3bdb3..ba9c55a205b28ed2c81c2f2e442978488392ae55 100644 (file)
--- a/sdm845Pkg/Devices/dipper.fdf
+++ b/sdm845Pkg/Devices/dipper.fdf
@@ -68,7 +68,7 @@ DATA = {
   0x00, 0x00, 0x00, 0x00                          # res5
 }
 
-0x00008000|0x004f8000
+0x00008000|0x005f8000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
@@ -116,33 +116,9 @@ APRIORI DXE {
   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 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 MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
-
-  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/845/SerialDxe/SerialDxe.depex
@@ -180,17 +156,15 @@ APRIORI DXE {
     SECTION UI = "PlatformInfoDxeDriver"
   }
 
-  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
-    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
-    SECTION UI = "DDRInfoDxe"
-  }
-
   FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.depex
     SECTION PE32 = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.efi
     SECTION UI = "HALIOMMU"
   }
 
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
+
   FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.efi
@@ -227,32 +201,49 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"
   }
 
-  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
-    SECTION UI = "DALTLMM"
-  }
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 
-  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
-    SECTION UI = "I2C"
+  FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi
+    SECTION UI = "UFSDxe"
   }
 
+  INF FatPkg/EnhancedFatDxe/Fat.inf
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
+
   FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SPMI/SPMI.depex
     SECTION PE32 = sdm845Pkg/Binary/845/SPMI/SPMI.efi
     SECTION UI = "SPMI"
   }
 
-  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
-    SECTION UI = "XhciPciEmulation"
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.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
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
+
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
+
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+
+  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
+    SECTION UI = "DALTLMM"
   }
 
-  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
-    SECTION UI = "XhciDxe"
+  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
+    SECTION UI = "I2C"
   }
 
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
@@ -261,6 +252,16 @@ APRIORI DXE {
     SECTION UI = "PmicDxe"
   }
 
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+
+  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/Polaris/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/Polaris/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+  }
+
   FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
@@ -272,7 +273,20 @@ APRIORI DXE {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
     SECTION UI = "UsbfnDwc3Dxe"
   }
-  
+
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
+    SECTION UI = "XhciPciEmulation"
+  }
+
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
+    SECTION UI = "XhciDxe"
+  }
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
     SECTION UI = "UsbKbDxe"
@@ -296,14 +310,10 @@ APRIORI DXE {
     SECTION UI = "UsbDeviceDxe"
   }
 
-  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.efi
-    SECTION UI = "ButtonsDxe"
+  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
+    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
+    SECTION UI = "DDRInfoDxe"
   }
-
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
-
 }
 
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -521,7 +531,7 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

diff --git a/sdm845Pkg/Devices/enchilada.fdf b/sdm845Pkg/Devices/enchilada.fdf
index 43d99f6d563bfb416d1e3ddc35c61a77cc505b75..0ab591c097ea2456d879fa75d3b2832f6d0df691 100644 (file)
--- a/sdm845Pkg/Devices/enchilada.fdf
+++ b/sdm845Pkg/Devices/enchilada.fdf
@@ -68,7 +68,7 @@ DATA = {
   0x00, 0x00, 0x00, 0x00                          # res5
 }
 
-0x00008000|0x004f8000
+0x00008000|0x005f8000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
@@ -116,33 +116,9 @@ APRIORI DXE {
   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 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 MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
-
-  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/845/SerialDxe/SerialDxe.depex
@@ -180,17 +156,15 @@ APRIORI DXE {
     SECTION UI = "PlatformInfoDxeDriver"
   }
 
-  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
-    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
-    SECTION UI = "DDRInfoDxe"
-  }
-
   FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.depex
     SECTION PE32 = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.efi
     SECTION UI = "HALIOMMU"
   }
 
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
+
   FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.efi
@@ -227,18 +201,18 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"
   }
 
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 
-  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
-    SECTION UI = "DALTLMM"
+  FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi
+    SECTION UI = "UFSDxe"
   }
 
-  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
-    SECTION UI = "I2C"
-  }
+  INF FatPkg/EnhancedFatDxe/Fat.inf
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
 
   FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SPMI/SPMI.depex
@@ -246,14 +220,30 @@ APRIORI DXE {
     SECTION UI = "SPMI"
   }
 
-  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
-    SECTION UI = "XhciPciEmulation"
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.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
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
+
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
+
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+
+  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
+    SECTION UI = "DALTLMM"
   }
 
-  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
-    SECTION UI = "XhciDxe"
+  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
+    SECTION UI = "I2C"
   }
 
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
@@ -262,6 +252,16 @@ APRIORI DXE {
     SECTION UI = "PmicDxe"
   }
 
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+
+  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+  }
+
   FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
@@ -273,7 +273,20 @@ APRIORI DXE {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
     SECTION UI = "UsbfnDwc3Dxe"
   }
-  
+
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
+    SECTION UI = "XhciPciEmulation"
+  }
+
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
+    SECTION UI = "XhciDxe"
+  }
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
     SECTION UI = "UsbKbDxe"
@@ -297,14 +310,10 @@ APRIORI DXE {
     SECTION UI = "UsbDeviceDxe"
   }
 
-  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.efi
-    SECTION UI = "ButtonsDxe"
+  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
+    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
+    SECTION UI = "DDRInfoDxe"
   }
-
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
-
 }
 
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -533,7 +542,7 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

diff --git a/sdm845Pkg/Devices/fajita.fdf b/sdm845Pkg/Devices/fajita.fdf
index 1025436d37836230cc1c4dca084112af9273a440..e0d626f747d9b0f69b5ebd1eb9b6752ab540b2cd 100644 (file)
--- a/sdm845Pkg/Devices/fajita.fdf
+++ b/sdm845Pkg/Devices/fajita.fdf
@@ -68,7 +68,7 @@ DATA = {
   0x00, 0x00, 0x00, 0x00                          # res5
 }
 
-0x00008000|0x004f8000
+0x00008000|0x005f8000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
@@ -116,33 +116,9 @@ APRIORI DXE {
   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 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 MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
-
-  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/845/SerialDxe/SerialDxe.depex
@@ -180,17 +156,15 @@ APRIORI DXE {
     SECTION UI = "PlatformInfoDxeDriver"
   }
 
-  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
-    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
-    SECTION UI = "DDRInfoDxe"
-  }
-
   FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.depex
     SECTION PE32 = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.efi
     SECTION UI = "HALIOMMU"
   }
 
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
+
   FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.efi
@@ -227,32 +201,49 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"
   }
 
-  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
-    SECTION UI = "DALTLMM"
-  }
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 
-  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
-    SECTION UI = "I2C"
+  FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi
+    SECTION UI = "UFSDxe"
   }
 
+  INF FatPkg/EnhancedFatDxe/Fat.inf
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
+
   FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SPMI/SPMI.depex
     SECTION PE32 = sdm845Pkg/Binary/845/SPMI/SPMI.efi
     SECTION UI = "SPMI"
   }
 
-  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
-    SECTION UI = "XhciPciEmulation"
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.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
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
+
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
+
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+
+  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
+    SECTION UI = "DALTLMM"
   }
 
-  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
-    SECTION UI = "XhciDxe"
+  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
+    SECTION UI = "I2C"
   }
 
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
@@ -261,6 +252,16 @@ APRIORI DXE {
     SECTION UI = "PmicDxe"
   }
 
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+
+  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+  }
+
   FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
@@ -273,6 +274,19 @@ APRIORI DXE {
     SECTION UI = "UsbfnDwc3Dxe"
   }
 
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
+    SECTION UI = "XhciPciEmulation"
+  }
+
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
+    SECTION UI = "XhciDxe"
+  }
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
     SECTION UI = "UsbKbDxe"
@@ -296,14 +310,10 @@ APRIORI DXE {
     SECTION UI = "UsbDeviceDxe"
   }
 
-  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.efi
-    SECTION UI = "ButtonsDxe"
+  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
+    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
+    SECTION UI = "DDRInfoDxe"
   }
-
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
-
 }
 
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -496,25 +506,24 @@ APRIORI DXE {
     SECTION UI = "UFSDxe"
   }
   
-      FILE DRIVER = F0D87C5E-4D5D-4FB5-939F-A6768AE8A309 {
+  FILE DRIVER = F0D87C5E-4D5D-4FB5-939F-A6768AE8A309 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/Synaptics/SynapticsTouchDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/Synaptics/SynapticsTouchDxe.efi
     SECTION UI = "SynapticsTouchDxe"
   }
 
-    FILE DRIVER = F0D87C5E-4D5D-4FB5-939F-A6768AE8A310 {
+  FILE DRIVER = F0D87C5E-4D5D-4FB5-939F-A6768AE8A310 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/Synaptics/SynapticsTouchDeviceDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/Synaptics/SynapticsTouchDeviceDxe.efi
     SECTION UI = "SynapticsTouchDeviceDxe"
   }
 
-    FILE DRIVER = 5AF77F10-90DF-4E7E-8325-A17EC09D5443 {
+  FILE DRIVER = 5AF77F10-90DF-4E7E-8325-A17EC09D5443 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbMsdDxe/UsbMsdDxe.efi
     SECTION UI = "UsbMsdDxe"
   }
 
-
   INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf
   INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf
   
@@ -537,7 +546,7 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

diff --git a/sdm845Pkg/Devices/m1892.fdf b/sdm845Pkg/Devices/m1892.fdf
index cb55bbdb5fe11e72ca16f2b0213a324b599d6599..2b8ad4f22657a84000b820565fa5d1bb4fce5267 100644 (file)
--- a/sdm845Pkg/Devices/m1892.fdf
+++ b/sdm845Pkg/Devices/m1892.fdf
@@ -68,7 +68,7 @@ DATA = {
   0x00, 0x00, 0x00, 0x00                          # res5
 }
 
-0x00008000|0x004f8000
+0x00008000|0x005f8000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
@@ -116,33 +116,9 @@ APRIORI DXE {
   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 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 MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
-
-  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/845/SerialDxe/SerialDxe.depex
@@ -180,17 +156,15 @@ APRIORI DXE {
     SECTION UI = "PlatformInfoDxeDriver"
   }
 
-  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
-    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
-    SECTION UI = "DDRInfoDxe"
-  }
-
   FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.depex
     SECTION PE32 = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.efi
     SECTION UI = "HALIOMMU"
   }
 
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
+
   FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.efi
@@ -227,32 +201,49 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"
   }
 
-  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
-    SECTION UI = "DALTLMM"
-  }
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 
-  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
-    SECTION UI = "I2C"
+  FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi
+    SECTION UI = "UFSDxe"
   }
 
+  INF FatPkg/EnhancedFatDxe/Fat.inf
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
+
   FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SPMI/SPMI.depex
     SECTION PE32 = sdm845Pkg/Binary/845/SPMI/SPMI.efi
     SECTION UI = "SPMI"
   }
 
-  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
-    SECTION UI = "XhciPciEmulation"
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.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
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
+
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
+
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+
+  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
+    SECTION UI = "DALTLMM"
   }
 
-  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
-    SECTION UI = "XhciDxe"
+  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
+    SECTION UI = "I2C"
   }
 
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
@@ -261,6 +252,16 @@ APRIORI DXE {
     SECTION UI = "PmicDxe"
   }
 
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+
+  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/m1892/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+  }
+
   FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
@@ -273,6 +274,19 @@ APRIORI DXE {
     SECTION UI = "UsbfnDwc3Dxe"
   }
 
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
+    SECTION UI = "XhciPciEmulation"
+  }
+
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
+    SECTION UI = "XhciDxe"
+  }
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
     SECTION UI = "UsbKbDxe"
@@ -296,14 +310,10 @@ APRIORI DXE {
     SECTION UI = "UsbDeviceDxe"
   }
 
-  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/m1892/ButtonsDxe/ButtonsDxe.efi
-    SECTION UI = "ButtonsDxe"
+  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
+    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
+    SECTION UI = "DDRInfoDxe"
   }
-
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
-
 }
 
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -532,6 +542,7 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 

diff --git a/sdm845Pkg/Devices/odin.fdf b/sdm845Pkg/Devices/odin.fdf
index 92c4d1d4e9677627ed9f8f7852ce76c9fe65b460..d6ba7b3a476d90846c83559375134f3bb2b47acf 100644 (file)
--- a/sdm845Pkg/Devices/odin.fdf
+++ b/sdm845Pkg/Devices/odin.fdf
@@ -68,7 +68,7 @@ DATA = {
   0x00, 0x00, 0x00, 0x00                          # res5
 }
 
-0x00008000|0x004f8000
+0x00008000|0x005f8000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
@@ -116,33 +116,9 @@ APRIORI DXE {
   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 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 MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
-
-  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/845/SerialDxe/SerialDxe.depex
@@ -180,17 +156,15 @@ APRIORI DXE {
     SECTION UI = "PlatformInfoDxeDriver"
   }
 
-  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
-    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
-    SECTION UI = "DDRInfoDxe"
-  }
-
   FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.depex
     SECTION PE32 = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.efi
     SECTION UI = "HALIOMMU"
   }
 
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
+
   FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.efi
@@ -227,32 +201,49 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"
   }
 
-  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
-    SECTION UI = "DALTLMM"
-  }
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 
-  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
-    SECTION UI = "I2C"
+  FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi
+    SECTION UI = "UFSDxe"
   }
 
+  INF FatPkg/EnhancedFatDxe/Fat.inf
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
+
   FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SPMI/SPMI.depex
     SECTION PE32 = sdm845Pkg/Binary/845/SPMI/SPMI.efi
     SECTION UI = "SPMI"
   }
 
-  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
-    SECTION UI = "XhciPciEmulation"
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.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
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
+
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
+
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+
+  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
+    SECTION UI = "DALTLMM"
   }
 
-  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
-    SECTION UI = "XhciDxe"
+  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
+    SECTION UI = "I2C"
   }
 
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
@@ -261,6 +252,16 @@ APRIORI DXE {
     SECTION UI = "PmicDxe"
   }
 
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+
+  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/Odin/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/Odin/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+  }
+
   FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
@@ -272,7 +273,20 @@ APRIORI DXE {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
     SECTION UI = "UsbfnDwc3Dxe"
   }
-  
+
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
+    SECTION UI = "XhciPciEmulation"
+  }
+
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
+    SECTION UI = "XhciDxe"
+  }
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
     SECTION UI = "UsbKbDxe"
@@ -296,14 +310,10 @@ APRIORI DXE {
     SECTION UI = "UsbDeviceDxe"
   }
 
-  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/Odin/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/Odin/ButtonsDxe/ButtonsDxe.efi
-    SECTION UI = "ButtonsDxe"
+  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
+    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
+    SECTION UI = "DDRInfoDxe"
   }
-
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
-
 }
 
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -520,7 +530,7 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

diff --git a/sdm845Pkg/Devices/perseus.fdf b/sdm845Pkg/Devices/perseus.fdf
index 80552f989ddebb07298e3cda35407ccb5e3ce758..8422d901872ce06d7c244c53b888e3c446832dae 100644 (file)
--- a/sdm845Pkg/Devices/perseus.fdf
+++ b/sdm845Pkg/Devices/perseus.fdf
@@ -68,7 +68,7 @@ DATA = {
   0x00, 0x00, 0x00, 0x00                          # res5
 }
 
-0x00008000|0x004f8000
+0x00008000|0x005f8000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
@@ -116,33 +116,9 @@ APRIORI DXE {
   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 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 MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
-
-  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/845/SerialDxe/SerialDxe.depex
@@ -180,17 +156,15 @@ APRIORI DXE {
     SECTION UI = "PlatformInfoDxeDriver"
   }
 
-  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
-    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
-    SECTION UI = "DDRInfoDxe"
-  }
-
   FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.depex
     SECTION PE32 = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.efi
     SECTION UI = "HALIOMMU"
   }
 
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
+
   FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.efi
@@ -227,32 +201,49 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"
   }
 
-  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
-    SECTION UI = "DALTLMM"
-  }
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 
-  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
-    SECTION UI = "I2C"
+  FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi
+    SECTION UI = "UFSDxe"
   }
 
+  INF FatPkg/EnhancedFatDxe/Fat.inf
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
+
   FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SPMI/SPMI.depex
     SECTION PE32 = sdm845Pkg/Binary/845/SPMI/SPMI.efi
     SECTION UI = "SPMI"
   }
 
-  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
-    SECTION UI = "XhciPciEmulation"
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.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
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
+
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
+
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+
+  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
+    SECTION UI = "DALTLMM"
   }
 
-  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
-    SECTION UI = "XhciDxe"
+  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
+    SECTION UI = "I2C"
   }
 
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
@@ -261,6 +252,16 @@ APRIORI DXE {
     SECTION UI = "PmicDxe"
   }
 
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+
+  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/Perseus/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/Perseus/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+  }
+
   FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
@@ -272,7 +273,20 @@ APRIORI DXE {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbfnDwc3Dxe/UsbfnDwc3Dxe.efi
     SECTION UI = "UsbfnDwc3Dxe"
   }
-  
+
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
+    SECTION UI = "XhciPciEmulation"
+  }
+
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
+    SECTION UI = "XhciDxe"
+  }
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
     SECTION UI = "UsbKbDxe"
@@ -296,14 +310,10 @@ APRIORI DXE {
     SECTION UI = "UsbDeviceDxe"
   }
 
-  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/Perseus/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/Perseus/ButtonsDxe/ButtonsDxe.efi
-    SECTION UI = "ButtonsDxe"
+  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
+    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
+    SECTION UI = "DDRInfoDxe"
   }
-
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
-
 }
 
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -520,7 +530,7 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

diff --git a/sdm845Pkg/Devices/polaris.fdf b/sdm845Pkg/Devices/polaris.fdf
index b715af7ced88e997788811e5be4965441b97dfe5..3b63c2aa8619864785712d5fc3430039cb4490f7 100644 (file)
--- a/sdm845Pkg/Devices/polaris.fdf
+++ b/sdm845Pkg/Devices/polaris.fdf
@@ -67,7 +67,7 @@ DATA = {
   0x00, 0x00, 0x00, 0x00                          # res5\r
 }\r
 \r
-0x00008000|0x004f8000\r
+0x00008000|0x005f8000\r
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r
@@ -115,33 +115,9 @@ APRIORI DXE {
   INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
   INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf\r
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
-  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
-  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
   INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
-  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf\r
 \r
-  #\r
-  # FAT filesystem + GPT/MBR partitioning\r
-  #\r
-  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
-  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
-  INF FatPkg/EnhancedFatDxe/Fat.inf\r
-  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
-  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
-\r
-  INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf\r
-  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf\r
-  INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
-  INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
-\r
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
-  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf\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
 \r
   FILE DRIVER = 9A5163E7-5C29-453F-825C-837A46A81E15 {\r
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SerialDxe/SerialDxe.depex\r
@@ -179,17 +155,15 @@ APRIORI DXE {
     SECTION UI = "PlatformInfoDxeDriver"\r
   }\r
 \r
-  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {\r
-    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi\r
-    SECTION UI = "DDRInfoDxe"\r
-  }\r
-\r
   FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {\r
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.depex\r
     SECTION PE32 = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.efi\r
     SECTION UI = "HALIOMMU"\r
   }\r
 \r
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf\r
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
+\r
   FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {\r
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.depex\r
     SECTION PE32 = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.efi\r
@@ -226,32 +200,49 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"\r
   }\r
 \r
-  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {\r
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex\r
-    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi\r
-    SECTION UI = "DALTLMM"\r
-  }\r
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
 \r
-  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {\r
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex\r
-    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi\r
-    SECTION UI = "I2C"\r
+  FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {\r
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex\r
+    SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi\r
+    SECTION UI = "UFSDxe"\r
   }\r
 \r
+  INF FatPkg/EnhancedFatDxe/Fat.inf\r
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
+\r
   FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {\r
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SPMI/SPMI.depex\r
     SECTION PE32 = sdm845Pkg/Binary/845/SPMI/SPMI.efi\r
     SECTION UI = "SPMI"\r
   }\r
 \r
-  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {\r
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi\r
-    SECTION UI = "XhciPciEmulation"\r
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+  INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf\r
+  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf\r
+  INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
+  INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
+  INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf\r
+\r
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  \r
+\r
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
+\r
+  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {\r
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex\r
+    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi\r
+    SECTION UI = "DALTLMM"\r
   }\r
 \r
-  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {\r
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi\r
-    SECTION UI = "XhciDxe"\r
+  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {\r
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex\r
+    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi\r
+    SECTION UI = "I2C"\r
   }\r
 \r
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {\r
@@ -260,6 +251,16 @@ APRIORI DXE {
     SECTION UI = "PmicDxe"\r
   }\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
+\r
+  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {\r
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/Polaris/ButtonsDxe/ButtonsDxe.depex\r
+    SECTION PE32 = sdm845Pkg/Binary/Polaris/ButtonsDxe/ButtonsDxe.efi\r
+    SECTION UI = "ButtonsDxe"\r
+  }\r
+\r
   FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {\r
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex\r
     SECTION PE32 = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi\r
@@ -272,6 +273,19 @@ APRIORI DXE {
     SECTION UI = "UsbfnDwc3Dxe"\r
   }\r
 \r
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {\r
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi\r
+    SECTION UI = "XhciPciEmulation"\r
+  }\r
+\r
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {\r
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi\r
+    SECTION UI = "XhciDxe"\r
+  }\r
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
+  INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf\r
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
+\r
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {\r
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi\r
     SECTION UI = "UsbKbDxe"\r
@@ -295,14 +309,10 @@ APRIORI DXE {
     SECTION UI = "UsbDeviceDxe"\r
   }\r
 \r
-  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {\r
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/Polaris/ButtonsDxe/ButtonsDxe.depex\r
-    SECTION PE32 = sdm845Pkg/Binary/Polaris/ButtonsDxe/ButtonsDxe.efi\r
-    SECTION UI = "ButtonsDxe"\r
+  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {\r
+    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi\r
+    SECTION UI = "DDRInfoDxe"\r
   }\r
-\r
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  \r
-\r
 }\r
 \r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
@@ -501,6 +511,11 @@ APRIORI DXE {
     SECTION UI = "UsbMsdDxe"\r
   }\r
 \r
+  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {\r
+    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi\r
+    SECTION UI = "DDRInfoDxe"\r
+  }\r
+\r
   INF sdm845Pkg/Drivers/sdm845Dxe/sdm845Dxe.inf\r
   INF sdm845Pkg/Drivers/SimpleFbDxe/SimpleFbDxe.inf\r
 \r
@@ -519,7 +534,7 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
   INF FatPkg/EnhancedFatDxe/Fat.inf\r
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
-\r
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
 \r
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r

diff --git a/sdm845Pkg/Devices/trident.fdf b/sdm845Pkg/Devices/trident.fdf
index 39f783c0a2cb05a8b0b74534866559c484045e35..e2fc19b3b85c075d4fc1ef015a1ca87c63c17116 100644 (file)
--- a/sdm845Pkg/Devices/trident.fdf
+++ b/sdm845Pkg/Devices/trident.fdf
@@ -68,7 +68,7 @@ DATA = {
   0x00, 0x00, 0x00, 0x00                          # res5
 }
 
-0x00008000|0x004f8000
+0x00008000|0x005f8000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = FVMAIN_COMPACT
 
@@ -116,33 +116,9 @@ APRIORI DXE {
   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 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 MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
-
-  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/845/SerialDxe/SerialDxe.depex
@@ -180,17 +156,15 @@ APRIORI DXE {
     SECTION UI = "PlatformInfoDxeDriver"
   }
 
-  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
-    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
-    SECTION UI = "DDRInfoDxe"
-  }
-
   FILE DRIVER = 9A00771F-36D4-4DD5-8916-C48ED9B16B86 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.depex
     SECTION PE32 = sdm845Pkg/Binary/845/HALIOMMU/HALIOMMU.efi
     SECTION UI = "HALIOMMU"
   }
 
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
+
   FILE DRIVER = E43128A8-8692-42B6-8AFA-676158578D18 {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/ULogDxe/ULogDxe.efi
@@ -227,32 +201,49 @@ APRIORI DXE {
     SECTION UI = "ClockDxe"
   }
 
-  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
-    SECTION UI = "DALTLMM"
-  }
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
 
-  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
-    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
-    SECTION UI = "I2C"
+  FILE DRIVER = 0d35cd8e-97ea-4f9a-96af-0f0d89f76567 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/UFSDxe/UFSDxe.efi
+    SECTION UI = "UFSDxe"
   }
 
+  INF FatPkg/EnhancedFatDxe/Fat.inf
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
+
   FILE DRIVER = 2a7b4bef-80cd-49e1-b473-374ba4d673fc {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/SPMI/SPMI.depex
     SECTION PE32 = sdm845Pkg/Binary/845/SPMI/SPMI.efi
     SECTION UI = "SPMI"
   }
 
-  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
-    SECTION UI = "XhciPciEmulation"
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.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
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
+  INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf
+
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
+
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+
+  FILE DRIVER = AF9763A2-033B-4109-8E17-56A98D380C92 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/DALTLMM/DALTLMM.efi
+    SECTION UI = "DALTLMM"
   }
 
-  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
-    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
-    SECTION UI = "XhciDxe"
+  FILE DRIVER = 04DE8591-D2B3-4077-BBBE-B12070094EB6 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/I2C/I2C.depex
+    SECTION PE32 = sdm845Pkg/Binary/845/I2C/I2C.efi
+    SECTION UI = "I2C"
   }
 
   FILE DRIVER = 5776232e-082d-4b75-9a0e-fe1d13f7a5d9 {
@@ -261,6 +252,16 @@ APRIORI DXE {
     SECTION UI = "PmicDxe"
   }
 
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+
+  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
+    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.depex
+    SECTION PE32 = sdm845Pkg/Binary/trident/ButtonsDxe/ButtonsDxe.efi
+    SECTION UI = "ButtonsDxe"
+  }
+
   FILE DRIVER = 11faed4c-b21f-4d88-8e48-c4c28a1e50df {
     SECTION DXE_DEPEX = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.depex
     SECTION PE32 = sdm845Pkg/Binary/845/UsbPwrCtrlDxe/UsbPwrCtrlDxe.efi
@@ -273,6 +274,19 @@ APRIORI DXE {
     SECTION UI = "UsbfnDwc3Dxe"
   }
 
+  FILE DRIVER = beb12bee-f6e1-11e1-9fb8-6c626de4aeb1 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciPciEmulation/XhciPciEmulation.efi
+    SECTION UI = "XhciPciEmulation"
+  }
+
+  FILE DRIVER = b7f50e91-a759-412c-ade4-dcd03e7f7c28 {
+    SECTION PE32 = sdm845Pkg/Binary/845/XhciDxe/XhciDxe.efi
+    SECTION UI = "XhciDxe"
+  }
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+
   FILE DRIVER = 2d2e62cf-9ecf-43b7-8219-94e7fc713dfe {
     SECTION PE32 = sdm845Pkg/Binary/845/UsbKbDxe/UsbKbDxe.efi
     SECTION UI = "UsbKbDxe"
@@ -296,14 +310,10 @@ APRIORI DXE {
     SECTION UI = "UsbDeviceDxe"
   }
 
-  FILE DRIVER = 5bd181db-0487-4f1a-ae73-820e165611b3 {
-    SECTION DXE_DEPEX = sdm845Pkg/Binary/845/ButtonsDxe/ButtonsDxe.depex
-    SECTION PE32 = sdm845Pkg/Binary/trident/ButtonsDxe/ButtonsDxe.efi
-    SECTION UI = "ButtonsDxe"
+  FILE DRIVER = 7DB0793A-4402-4BE1-906E-D0FABAD2707E {
+    SECTION PE32 = sdm845Pkg/Binary/845/DDRInfoDxe/DDRInfoDxe.efi
+    SECTION UI = "DDRInfoDxe"
   }
-
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf  
-
 }
 
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -531,6 +541,7 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   INF FatPkg/EnhancedFatDxe/Fat.inf
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 

diff --git a/sdm845Pkg/sdm845Pkg.dsc b/sdm845Pkg/sdm845Pkg.dsc
index cba1b2283f19b2273585827755b1c520ce5eca1a..8fb9c65dff56e13284f9fd14ed842aa04a37488b 100644 (file)
--- a/sdm845Pkg/sdm845Pkg.dsc
+++ b/sdm845Pkg/sdm845Pkg.dsc
@@ -265,6 +265,7 @@
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
 
   #