[edk2-platforms PATCH 4/5] Silicon/Synopsys/DesignWare: Support build against DesignWare.dsc

[Vin Xue <vinxue@outlook.com>]

Support GCC IA32/X64 build.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Signed-off-by: Vin Xue <vinxue@outlook.com>
---
 Silicon/Synopsys/DesignWare/DesignWare.dec      |  9 ++++++++-
 Silicon/Synopsys/DesignWare/DesignWare.dsc      | 17 +++++++++++------
 .../Drivers/UsbDeviceDxe/UsbDeviceDxe.inf       |  1 +
 .../DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c |  3 +--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Silicon/Synopsys/DesignWare/DesignWare.dec b/Silicon/Synopsys/DesignWare/DesignWare.dec
index f7ec792754..6063f64664 100755
--- a/Silicon/Synopsys/DesignWare/DesignWare.dec
+++ b/Silicon/Synopsys/DesignWare/DesignWare.dec
@@ -7,6 +7,9 @@
   PACKAGE_GUID                   = 3b5936d8-c72d-412d-b4d9-3bf0dea73598
   PACKAGE_VERSION                = 0.1
 
+[Includes]
+  Include
+
 ################################################################################
 #
 # Include Section - list of Include Paths that are provided by this package.
@@ -18,9 +21,13 @@
 ################################################################################
 
 [Guids.common]
-  gDesignWareTokenSpaceGuid = { 0x89cb1241, 0xd283, 0x4543, { 0x88, 0x9c, 0x6b, 0x62, 0x36, 0x1a, 0x95, 0x7a } }
+  gDesignWareTokenSpaceGuid           = { 0x89cb1241, 0xd283, 0x4543, { 0x88, 0x9c, 0x6b, 0x62, 0x36, 0x1a, 0x95, 0x7a } }
   gDwEmacNetNonDiscoverableDeviceGuid = { 0x401950CD, 0xF9CD, 0x4A65, { 0xAD, 0x8E, 0x84, 0x9F, 0x3B, 0xAF, 0x23, 0x04 } }
 
+[Protocols]
+  gEfiUsbFnIoProtocolGuid             = { 0x32d2963a, 0xfe5d, 0x4f30, { 0xb6, 0x33, 0x6e, 0x5d, 0xc5, 0x58, 0x03, 0xcc } }
+  gEfiUsbDeviceModeProtocolGuid       = { 0xC9923F7E, 0x1746, 0x4802, { 0x86, 0x2e, 0x01, 0x1c, 0x2c, 0x2d, 0x9d, 0x86 } }
+
 [PcdsFixedAtBuild.common]
   #
   # Permit the use of obsolete drivers in this package
diff --git a/Silicon/Synopsys/DesignWare/DesignWare.dsc b/Silicon/Synopsys/DesignWare/DesignWare.dsc
index 098bba3f7d..37f13a1562 100755
--- a/Silicon/Synopsys/DesignWare/DesignWare.dsc
+++ b/Silicon/Synopsys/DesignWare/DesignWare.dsc
@@ -11,13 +11,11 @@
   PLATFORM_GUID                  = 09b27b59-7195-4220-b81c-c1871c74d006
   PLATFORM_VERSION               = 0.1
   OUTPUT_DIRECTORY               = Build/Synopsys
-  SUPPORTED_ARCHITECTURES        = AARCH64|ARM
+  SUPPORTED_ARCHITECTURES        = IA32|X64|ARM|AARCH64
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [LibraryClasses]
-  ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
-  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
   CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
@@ -28,16 +26,23 @@
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-  TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
 
-[Components]
+[LibraryClasses.ARM, LibraryClasses.AARCH64]
+  ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
+  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
+  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+  TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
+
+[Components.ARM, Components.AARCH64]
   Silicon/Synopsys/DesignWare/Drivers/DwEmacSnpDxe/DwEmacSnpDxe.inf
   Silicon/Synopsys/DesignWare/Drivers/DwEmmcDxe/DwEmmcDxe.inf
+
+[Components.IA32, Components.X64]
+  Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
index a5fbe2336a..fc064b85c1 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
@@ -33,6 +33,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  Silicon/Synopsys/DesignWare/DesignWare.dec
 
 [LibraryClasses]
   BaseMemoryLib
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
index d4eea39e6d..be325665f3 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
@@ -24,7 +24,7 @@ static CHAR16 mUsbFnDxeSerialNumber[] = L"INT123456";
 // replaced with device-specific unique values.
 //
 static GUID mSmBiosUniqueGuid = {
-        0x5e24fe9c, 0xc8d0, 0x45bd, 0xa7, 0x9f, 0x54, 0xea, 0x5f, 0xbd, 0x3d, 0x97
+        0x5e24fe9c, 0xc8d0, 0x45bd, { 0xa7, 0x9f, 0x54, 0xea, 0x5f, 0xbd, 0x3d, 0x97}
     };
 
 EFI_USBFN_IO_PROTOCOL         mUsbFunIoProtocol = {
@@ -413,7 +413,6 @@ GetMaxTransferSize (
   @retval EFI_BUFFER_TOO_SMALL  A parameter is invalid.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 GetDeviceSerialNumber (
-- 
2.27.0.windows.1