From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from APC01-PU1-obe.outbound.protection.outlook.com (APC01-PU1-obe.outbound.protection.outlook.com [40.92.254.47]) by mx.groups.io with SMTP id smtpd.web10.8311.1594980197215482268 for ; Fri, 17 Jul 2020 03:03:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@outlook.com header.s=selector1 header.b=L+azHwYA; spf=pass (domain: outlook.com, ip: 40.92.254.47, mailfrom: vinxue@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jNMGPIWE3SiENgIXAke8cmuaIk8kNiHQ+VvLBlnQCDgyHUxlp6fwB5gVd72YmrQw5FVtULwAl9kSPqc+WyDnmzDzCTvGequqCfvZTVVlXP7JtU0dURaVsHAVP3lhXkbrKAt5Ri8iyTGK8m+oESPAGiCT9cgPGKJp9ZqEnq5K+jqq8fufZU0K8VHu1ipLFV2XHuXnDH4mMf1Z9kMfcZKgGrsJtrdkpvW/nl9ogJjqi3QjYIskA0TEB1chQhomJ+y6P2gXUeL0mg98N0kbBHGbyjZ1AiPYOc6YC0aNKaPS+sC3gRrO/NBsDavx6TLZ8CDSdlOPwLtTqkNdR2nnl4HZjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Zp1sIMOV6hkqVH5PkRGDInFFMvgnyzlLy4V/WEdkXCk=; b=OE2HWkJzdPKaPG00nmpqXuQ5cynk1PHQCsRh+QKCclACOcaGeFH305tKPtd5QUa+2hQIDMr9JDf+OPGmQcHYoYllgFDMwJqv1YNNx2h53NxT9zCaDFSNSLKFT3dgSQhZGKYzxKx55gINJ/UAHjmxZHFHtkNG+9z9BibjfdvGIKQeZ2s2s3EpZ5mylzGblLKp4pQ3oiyqvuMZvRfSy/8/z85ts1Isbvk/bgLmguCqFSq2aeeC5owmWgJOi1KKrhoBkpSoGSvZsAwsOSOKNZZnOi3Sd71a0cD+8FwBOHxjk6aKZ4WwxE8TNDbyvLuLvIB6PAP/iX+WKwR6PIKNmJT9Eg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Zp1sIMOV6hkqVH5PkRGDInFFMvgnyzlLy4V/WEdkXCk=; b=L+azHwYAq202PYWDoOU4bjPuJcVGteEEfw7mt9RXsdyhtd9dYizVfDyMy2gR28oD4SdzEYMnTYBTfcmWQwcmv5JDNduljQDNtvErWMrwMQ8sXeeVHM/pUQR14oa772Jlh9ju8hArgE9A8X35U30Wv2gZsm3S+3sJJQBQ78qpp9bEjNZb0C7WiEwMttadvGtm0KhPZjNXUANvrFWPzLAYEZQ4+kn6jSSuUeatf0gtn4DeGiY3dfUjUUymjLumyx3oZmokgLga94GNnqTMkTSCtoBprsZH1RxeOEqR374L+GmpReBjmB/Pg4xUvHrqzZP3bqTToQw/WEGEmxkw07Z4HQ== Received: from SG2APC01FT037.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebd::43) by SG2APC01HT240.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebd::306) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.18; Fri, 17 Jul 2020 10:03:14 +0000 Received: from SL2PR03MB4442.apcprd03.prod.outlook.com (2a01:111:e400:7ebd::53) by SG2APC01FT037.mail.protection.outlook.com (2a01:111:e400:7ebd::367) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.18 via Frontend Transport; Fri, 17 Jul 2020 10:03:14 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:01E6C19AC0499EA342419CADF54AA008BFBD8B601596A97979AC3023BACFE33B;UpperCasedChecksum:25EBE4AA5BC63195AD61F84A50E7A6EFC99339F24FFC75E8EBBCA207087A2E14;SizeAsReceived:7603;Count:49 Received: from SL2PR03MB4442.apcprd03.prod.outlook.com ([fe80::6887:4d23:2904:f332]) by SL2PR03MB4442.apcprd03.prod.outlook.com ([fe80::6887:4d23:2904:f332%7]) with mapi id 15.20.3195.020; Fri, 17 Jul 2020 10:03:14 +0000 From: Vin Xue To: devel@edk2.groups.io Cc: Vin Xue , Ard Biesheuvel , Leif Lindholm Subject: [edk2-platforms PATCH 4/5] Silicon/Synopsys/DesignWare: Support build against DesignWare.dsc Date: Fri, 17 Jul 2020 18:02:02 +0800 Message-ID: X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200717100203.724-1-vinxue@outlook.com> References: <20200717100203.724-1-vinxue@outlook.com> X-ClientProxiedBy: HK2PR02CA0134.apcprd02.prod.outlook.com (2603:1096:202:16::18) To SL2PR03MB4442.apcprd03.prod.outlook.com (2603:1096:100:5b::18) Return-Path: vinxue@outlook.com X-Microsoft-Original-Message-ID: <20200717100203.724-4-vinxue@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from SHA-D10WENXIXUE.amd.com (58.247.170.242) by HK2PR02CA0134.apcprd02.prod.outlook.com (2603:1096:202:16::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.18 via Frontend Transport; Fri, 17 Jul 2020 10:03:13 +0000 X-Mailer: git-send-email 2.27.0.windows.1 X-Microsoft-Original-Message-ID: <20200717100203.724-4-vinxue@outlook.com> X-TMN: [e7JLbff0wj5sJi7oLcIdl8KyUPPv7zWa] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 49 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c5918e3d-4ef0-4bfb-884c-08d82a389ea4 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEs2/OlovTS5GRrq1qJdtrxnsDD/vY6moKcb1NN8zdmEMN2Kti8oc3rF9sEYL6a48UE7L+LkWPHfVx07aRpLsaZNUxco56mrtXIJ4hyPc1WfmRxKIYH1HS5a4chBKVp/xWlO+0K5hMG4Gg0Yn245dIiUVEn21XpErbuGjrsjLk1MUP1Phi5IRAs6b78ThCD9uQsTokMJVIKZr+kYg3+JQr6sz6WfAohafpBSAV05q/WHfPc4i5W4pv70hThJFoAzuKvTV45fa76louMJ6QSx4vQ8yzZzAgUSweweh+PY8MEekXaRy2R86xJhO4mQ9NKESPwaEt38zz9HbI6+Mut+lWQy0eq0UhdPQzTz0jesxbhW++wsBBoDm9oTGgRoJD/PDfxDfLF/DxL4YVZiBie4vhIS6IMiFu82/QskssiQiw9zvEgwNElp6nCZX3ipiuCPdO7USksBsa7NatnoK0BKsvvA/WSTl6us3TpufrQGbmgQU/L3C8yKYd/pJtDa2a/Tj0tM4r5Qk7+YuCAe1jBafjpkWBu0ALqTsYmHu0hKWDsE3XnzWt4+U+w/0TwCL9AEBbCcrUTFUY32BXFIP7yIrhc7ShgGd9Yr9eIjhy8s4crKGabm2SvGu/AkursEw1u23eVorWvUGqW020/sjKau+BJLsVf3iySWOnLK70HXcrTk4zxPVREgTfgTonI9K2Wbn34aQmfvh0bbMTyTZ5xMlAw3BFkNyZzXSHL00/01/QiWvl5Dtu35GGuKHlsfGL1EYNiYZ3XeIKXucBcqiPDC1m3D X-MS-TrafficTypeDiagnostic: SG2APC01HT240: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ys3cdlx/vr5vgt646DsD+ZFcz742b1smDBt2ool/DaYXtqVLnECzgSxPKfrn3+mOEGBPM9rDm/fxIziARn5r/oPFTvrSDR6BdrezLSvipb9YAmMODFdeNN/11SkRWtLC3j+O16MoCiLpjtQBFdByeYHLmcTEjgMzWtJcGu0kHwEaUoxT5VR/Wxx1uENd9kpigIZXwLmH7BR0NxXQt+e7ZQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:0;SRV:;IPV:NLI;SFV:NSPM;H:SL2PR03MB4442.apcprd03.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:;DIR:OUT;SFP:1901; X-MS-Exchange-AntiSpam-MessageData: KQpCvQcdEZJKOYiS740TSZYmnPQ5oJe+RGeYRejppaLQ2f0U7kSrfBC5SG654dAByoHonq+CYDKrpuuvaYuuBVRHjxFqq/vawIwv6u4DU+QNUi+pRzFAeNTNy1pjClr81pw10giQyF19hLrDTvswIg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5918e3d-4ef0-4bfb-884c-08d82a389ea4 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2020 10:03:14.2862 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: SG2APC01FT037.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2APC01HT240 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Support GCC IA32/X64 build. Cc: Ard Biesheuvel Cc: Leif Lindholm Signed-off-by: Vin Xue --- 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 =3D 3b5936d8-c72d-412d-b4d9-3bf0dea73598= =0D PACKAGE_VERSION =3D 0.1=0D =0D +[Includes]=0D + Include=0D +=0D ##########################################################################= ######=0D #=0D # Include Section - list of Include Paths that are provided by this packag= e.=0D @@ -18,9 +21,13 @@ ##########################################################################= ######=0D =0D [Guids.common]=0D - gDesignWareTokenSpaceGuid =3D { 0x89cb1241, 0xd283, 0x4543, { 0x88, 0x9c= , 0x6b, 0x62, 0x36, 0x1a, 0x95, 0x7a } }=0D + gDesignWareTokenSpaceGuid =3D { 0x89cb1241, 0xd283, 0x4543, { = 0x88, 0x9c, 0x6b, 0x62, 0x36, 0x1a, 0x95, 0x7a } }=0D gDwEmacNetNonDiscoverableDeviceGuid =3D { 0x401950CD, 0xF9CD, 0x4A65, { = 0xAD, 0x8E, 0x84, 0x9F, 0x3B, 0xAF, 0x23, 0x04 } }=0D =0D +[Protocols]=0D + gEfiUsbFnIoProtocolGuid =3D { 0x32d2963a, 0xfe5d, 0x4f30, { = 0xb6, 0x33, 0x6e, 0x5d, 0xc5, 0x58, 0x03, 0xcc } }=0D + gEfiUsbDeviceModeProtocolGuid =3D { 0xC9923F7E, 0x1746, 0x4802, { = 0x86, 0x2e, 0x01, 0x1c, 0x2c, 0x2d, 0x9d, 0x86 } }=0D +=0D [PcdsFixedAtBuild.common]=0D #=0D # Permit the use of obsolete drivers in this package=0D 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 =3D 09b27b59-7195-4220-b81c-c1871c74d006= =0D PLATFORM_VERSION =3D 0.1=0D OUTPUT_DIRECTORY =3D Build/Synopsys=0D - SUPPORTED_ARCHITECTURES =3D AARCH64|ARM=0D + SUPPORTED_ARCHITECTURES =3D IA32|X64|ARM|AARCH64=0D BUILD_TARGETS =3D DEBUG|RELEASE|NOOPT=0D SKUID_IDENTIFIER =3D DEFAULT=0D =0D [LibraryClasses]=0D - ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/Ar= mGenericTimerPhyCounterLib.inf=0D - ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf=0D BaseLib|MdePkg/Library/BaseLib/BaseLib.inf=0D BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf=0D CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMain= tenanceLib.inf=0D @@ -28,16 +26,23 @@ IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf=0D MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf=0D NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf=0D - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf=0D NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf=0D PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf=0D PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf=0D - TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf=0D UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf=0D UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf=0D UefiLib|MdePkg/Library/UefiLib/UefiLib.inf=0D UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf=0D =0D -[Components]=0D +[LibraryClasses.ARM, LibraryClasses.AARCH64]=0D + ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/Ar= mGenericTimerPhyCounterLib.inf=0D + ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf=0D + NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf=0D + TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf=0D +=0D +[Components.ARM, Components.AARCH64]=0D Silicon/Synopsys/DesignWare/Drivers/DwEmacSnpDxe/DwEmacSnpDxe.inf=0D Silicon/Synopsys/DesignWare/Drivers/DwEmmcDxe/DwEmmcDxe.inf=0D +=0D +[Components.IA32, Components.X64]=0D + Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf=0D 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 @@ =20 [Packages] MdePkg/MdePkg.dec + Silicon/Synopsys/DesignWare/DesignWare.dec =20 [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[] =3D L"INT123456"; // replaced with device-specific unique values. // static GUID mSmBiosUniqueGuid =3D { - 0x5e24fe9c, 0xc8d0, 0x45bd, 0xa7, 0x9f, 0x54, 0xea, 0x5f, 0xbd, 0x= 3d, 0x97 + 0x5e24fe9c, 0xc8d0, 0x45bd, { 0xa7, 0x9f, 0x54, 0xea, 0x5f, 0xbd, = 0x3d, 0x97} }; =20 EFI_USBFN_IO_PROTOCOL mUsbFunIoProtocol =3D { @@ -413,7 +413,6 @@ GetMaxTransferSize ( @retval EFI_BUFFER_TOO_SMALL A parameter is invalid. =20 **/ -STATIC EFI_STATUS EFIAPI GetDeviceSerialNumber ( --=20 2.27.0.windows.1