Merge pull request #323 from remtrik/main

Add some changes for POCO X3 Pro in upstream

Platforms/SurfaceDuo1Pkg/Device/xiaomi-vayu/DXE.dsc.inc

@@ -73,7 +73,6 @@ SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/AdcDxe/AdcDxe.in
 SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/TsensDxe/TsensDxe.inf
 #QcomPkg/Drivers/LimitsDxe/LimitsDxe.inf
 SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/DDRInfoDxe/DDRInfoDxe.inf
-SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/UsbfnDwc3Dxe/UsbfnDwc3Dxe.inf
 #QcomPkg/Drivers/UsbMsdDxe/UsbMsdDxe.inf
 #QcomPkg/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
 #QcomPkg/Drivers/HashDxe/HashDxe.inf
@@ -90,4 +89,5 @@ QcomPkg/PatchedBinaries/HALIOMMUDxe.inf
 QcomPkg/PatchedBinaries/PciHostBridgeDxe.inf
 SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/PatchedBinaries/UFSDxe.inf
 SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/PatchedBinaries/UsbConfigDxe.inf
+SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/PatchedBinaries/UsbfnDwc3Dxe.inf
 SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/PatchedBinaries/ButtonsDxe.inf

Platforms/SurfaceDuo1Pkg/Device/xiaomi-vayu/DXE.inc

@@ -83,7 +83,6 @@ INF SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/AdcDxe/AdcDx
 INF SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/TsensDxe/TsensDxe.inf
 #INF QcomPkg/Drivers/LimitsDxe/LimitsDxe.inf
 INF SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/DDRInfoDxe/DDRInfoDxe.inf
-INF SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/UsbfnDwc3Dxe/UsbfnDwc3Dxe.inf
 #INF SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/UsbMsdDxe/UsbMsdDxe.inf
 #INF SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
 #INF SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/Binaries/QcomPkg/Drivers/UsbConfigDxe/UsbConfigDxe.inf
@@ -102,6 +101,7 @@ INF QcomPkg/PatchedBinaries/HALIOMMUDxe.inf
 INF QcomPkg/PatchedBinaries/PciHostBridgeDxe.inf
 INF SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/PatchedBinaries/UFSDxe.inf
 INF SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/PatchedBinaries/UsbConfigDxe.inf
+INF SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/PatchedBinaries/UsbfnDwc3Dxe.inf
 INF SurfaceDuo1Pkg/Device/$(TARGET_DEVICE)/PatchedBinaries/ButtonsDxe.inf
 
 # DXE without depex

Platforms/SurfaceDuo1Pkg/Device/xiaomi-vayu/Defines.dsc.inc

@@ -1 +1,2 @@
 DEFINE HAS_MLVM = FALSE
+DEFINE USE_SCREEN_FOR_SERIAL_OUTPUT = 0

Platforms/SurfaceDuo1Pkg/Device/xiaomi-vayu/PatchedBinaries/UsbfnDwc3Dxe.inf

@@ -0,0 +1,22 @@
+# ****************************************************************************
+# AUTOGENERATED BY UEFIReader
+# AUTOGENED AS UsbfnDwc3Dxe.inf
+# DO NOT MODIFY
+# GENERATED ON: 2022-12-12 09:37:16Z
+
+[Defines]
+  INF_VERSION    = 0x0001001B
+  BASE_NAME      = UsbfnDwc3Dxe
+  FILE_GUID      = 94F8A6A7-DC34-4101-88C1-99179CCEAE83
+  MODULE_TYPE    = DXE_DRIVER
+  VERSION_STRING = 1.0
+  ENTRY_POINT    = EfiEntry
+
+[Binaries.AARCH64]
+   DXE_DEPEX|UsbfnDwc3Dxe.depex|*
+   PE32|UsbfnDwc3Dxe.efi|*
+
+[Depex]
+  TRUE
+# AUTOGEN ENDS
+# ****************************************************************************

Platforms/SurfaceDuo1Pkg/Device/xiaomi-vayu/PcdsFixedAtBuild.dsc.inc

@@ -4,8 +4,9 @@ gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdMipiFrameBufferHeight|2400
 #gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdMipiFrameBufferPixelBpp|32
 
 # Smbios Info
+gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosBoardModel|"POCO X3 Pro"
 gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemBrand|"Xiaomi"
-gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemModel|"Poco X3 Pro"
+gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemModel|"POCO X3 Pro"
 gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemRetailModel|"vayu"
 gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemRetailSku|"MP"
 gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosProcessorModel|"Snapdragon (TM) 860 @ 2.96 GHz"