edit apriori, dxe and sm6225.fog files

edk2-porting · Nov 5, 2023 · ce9f9d7 · ce9f9d7
1 parent 2723ff9
commit ce9f9d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Platform/Qualcomm/sm6225/Apriori.fog.fdf.inc b/Platform/Qualcomm/sm6225/Apriori.fog.fdf.inc
@@ -19,7 +19,7 @@ APRIORI DXE {
   INF  Platform/EFI_Binaries/Drivers/sm6225/HWIODxe/HWIODxe.inf
   INF  Platform/EFI_Binaries/Drivers/sm6225/ChipInfoDxe/ChipInfoDxe.inf
   INF  Platform/EFI_Binaries/Drivers/sm6225/PlatformInfoDxe/PlatformInfoDxe.inf
-  INF  Platform/EFI_Binaries/Drivers/sm6225/HALIOMMUDxe/HALIOMMUDxe.inf
+  INF  Platform/EFI_Binaries/Drivers/Devices/fog/HALIOMMUDxe/HALIOMMUDxe.inf
   INF  Platform/EFI_Binaries/Drivers/sm6225/GLinkDxe/GLinkDxe.inf
   INF  Platform/EFI_Binaries/Drivers/sm6225/ULogDxe/ULogDxe.inf
   INF  Platform/EFI_Binaries/Drivers/sm6225/NpaDxe/NpaDxe.inf
@@ -46,7 +46,7 @@ APRIORI DXE {
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
 
-    INF  Platform/EFI_Binaries/Drivers/sm6225/SdccDxe/SdccDxe.inf
+    INF  Platform/EFI_Binaries/Drivers/Devices/fog/SdccDxe/SdccDxe.inf
     INF  Platform/EFI_Binaries/Drivers/Devices/fog/UFSDxe/UFSDxe.inf
 
   INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf

diff --git a/Platform/Qualcomm/sm6225/dxe.fog.fdf.inc b/Platform/Qualcomm/sm6225/dxe.fog.fdf.inc
@@ -3,7 +3,7 @@
   INF  Platform/EFI_Binaries/Drivers/sm6225/HWIODxe/HWIODxe.inf
   INF  Platform/EFI_Binaries/Drivers/sm6225/ChipInfoDxe/ChipInfoDxe.inf
   INF  Platform/EFI_Binaries/Drivers/sm6225/PlatformInfoDxe/PlatformInfoDxe.inf
-  INF  Platform/EFI_Binaries/Drivers/sm6225/HALIOMMUDxe/HALIOMMUDxe.inf
+  INF  Platform/EFI_Binaries/Drivers/Devices/fog/HALIOMMUDxe/HALIOMMUDxe.inf
   INF  Platform/EFI_Binaries/Drivers/sm6225/GLinkDxe/GLinkDxe.inf
   INF  Platform/EFI_Binaries/Drivers/sm6225/ULogDxe/ULogDxe.inf
   INF  Platform/EFI_Binaries/Drivers/sm6225/NpaDxe/NpaDxe.inf
@@ -17,7 +17,7 @@
             SECTION UI = "ScmDxe"
     }
 
-    INF  Platform/EFI_Binaries/Drivers/sm6225/SdccDxe/SdccDxe.inf
+    INF  Platform/EFI_Binaries/Drivers/Devices/fog/SdccDxe/SdccDxe.inf
     INF  Platform/EFI_Binaries/Drivers/Devices/fog/UFSDxe/UFSDxe.inf
 
     # INF  Platform/EFI_Binaries/Drivers/sm6225/TzDxe/TzDxeLA.inf

diff --git a/Platform/Qualcomm/sm6225/sm6225.fog.dsc b/Platform/Qualcomm/sm6225/sm6225.fog.dsc
@@ -62,8 +62,8 @@
 
   # Ported from SurfaceDuoPkg
   AslUpdateLib|Silicon/Qualcomm/QcomPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf
-  SerialPortLib|Silicon/Qualcomm/QcomPkg/Library/FrameBufferSerialPortLib/FrameBufferSerialPortLib.inf
-  #SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
+  #SerialPortLib|Silicon/Qualcomm/QcomPkg/Library/FrameBufferSerialPortLib/FrameBufferSerialPortLib.inf
+  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
   PlatformMemoryMapLib|Silicon/Qualcomm/sm6225/Library/PlatformMemoryMapLib/PlatformMemoryMapLib.inf
   PlatformPeiLib|Silicon/Qualcomm/sm6225/Library/PlatformPeiLib/PlatformPeiLib.inf
   PlatformPrePiLib|Silicon/Qualcomm/sm6225/Library/PlatformPrePiLib/PlatformPrePiLib.inf