[edk2-devel] [edk2/master PATCH RISC-V CI Code Changes v1 05/11] CryptoPkg: Add RISC-V architecture for EDK2 CI.

Guomin Jiang guomin.jiang at intel.com
Wed Jul 22 00:58:21 UTC 2020 

Reviewed-by: Guomin Jiang <guomin.jiang at intel.com>

> -----Original Message-----
> From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Abner
> Chang
> Sent: Friday, March 6, 2020 1:36 PM
> To: devel at edk2.groups.io
> Cc: abner.chang at hpe.com; Daniel Schaefer <daniel.schaefer at hpe.com>;
> Wang, Jian J <jian.j.wang at intel.com>; Lu, XiaoyuX <xiaoyux.lu at intel.com>;
> Leif Lindholm <leif at nuviainc.com>; Gilbert Chen <gilbert.chen at hpe.com>
> Subject: [edk2-devel] [edk2/master PATCH RISC-V CI Code Changes v1
> 05/11] CryptoPkg: Add RISC-V architecture for EDK2 CI.
> 
> Add RISC-V architecture for EDK2 CI testing.
> 
> BZ:2562:
> https://bugzilla.tianocore.org/show_bug.cgi?id=2562
> 
> Signed-off-by: Abner Chang <abner.chang at hpe.com>
> Co-authored-by: Daniel Schaefer <daniel.schaefer at hpe.com>
> 
> Cc: Jian J Wang <jian.j.wang at intel.com>
> Cc: Xiaoyu Lu <xiaoyux.lu at intel.com>
> Cc: Leif Lindholm <leif at nuviainc.com>
> Cc: Gilbert Chen <gilbert.chen at hpe.com>
> ---
>  CryptoPkg/CryptoPkg.dsc                                     | 3 ++-
>  CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf             | 6 +++++-
>  CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf          | 4 ++++
>  CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf     | 3 ++-
>  CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf | 3 ++-
>  CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf | 3 ++-
>  CryptoPkg/Library/OpensslLib/OpensslLib.inf                 | 2 ++
>  CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf           | 2 ++
>  CryptoPkg/Library/TlsLib/TlsLib.inf                         | 4 ++--
>  CryptoPkg/Library/TlsLibNull/TlsLibNull.inf                 | 4 ++--
>  CryptoPkg/Library/Include/CrtLibSupport.h                   | 3 ++-
>  11 files changed, 27 insertions(+), 10 deletions(-)
> 
> diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
> index 4cb37b1349..f79ff331cf 100644
> --- a/CryptoPkg/CryptoPkg.dsc
> +++ b/CryptoPkg/CryptoPkg.dsc
> @@ -3,6 +3,7 @@
>  #  PEIM, DXE Driver, and SMM Driver with all crypto services enabled.
> 
>  #
> 
>  #  Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.<BR>
> 
> +#  Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
> reserved.<BR>
> 
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
>  ##
> 
> @@ -18,7 +19,7 @@
>    PLATFORM_VERSION               = 0.98
> 
>    DSC_SPECIFICATION              = 0x00010005
> 
>    OUTPUT_DIRECTORY               = Build/CryptoPkg
> 
> -  SUPPORTED_ARCHITECTURES        = IA32|X64|ARM|AARCH64
> 
> +  SUPPORTED_ARCHITECTURES        = IA32|X64|ARM|AARCH64|RISCV64
> 
>    BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
> 
>    SKUID_IDENTIFIER               = DEFAULT
> 
> 
> 
> diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> index 1bbe4f435a..a63ad66b4f 100644
> --- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> @@ -7,6 +7,7 @@
>  #  buffer overflow or integer overflow.
> 
>  #
> 
>  #  Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
> 
> +#  Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
> reserved.<BR>
> 
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
>  ##
> 
> @@ -23,7 +24,7 @@
>  #
> 
>  # The following information is for reference only and not required by the
> build tools.
> 
>  #
> 
> -#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64
> 
> +#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64 RISCV64
> 
>  #
> 
> 
> 
>  [Sources]
> 
> @@ -72,6 +73,9 @@
>  [Sources.AARCH64]
> 
>    Rand/CryptRand.c
> 
> 
> 
> +[Sources.RISCV64]
> 
> +  Rand/CryptRand.c
> 
> +
> 
>  [Packages]
> 
>    MdePkg/MdePkg.dec
> 
>    CryptoPkg/CryptoPkg.dec
> 
> diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> index bff308a4f5..e5b8ececc1 100644
> --- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
> @@ -12,6 +12,7 @@
>  #  authenticode signature verification functions are not supported in this
> instance.
> 
>  #
> 
>  #  Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
> 
> +#  Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
> reserved.<BR>
> 
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
>  ##
> 
> @@ -77,6 +78,9 @@
>  [Sources.AARCH64]
> 
>    Rand/CryptRand.c
> 
> 
> 
> +[Sources.RISCV64]
> 
> +  Rand/CryptRand.c
> 
> +
> 
>  [Packages]
> 
>    MdePkg/MdePkg.dec
> 
>    CryptoPkg/CryptoPkg.dec
> 
> diff --git a/CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf
> b/CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf
> index 8f53b0dfd0..9b4991cbb0 100644
> --- a/CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf
> +++ b/CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf
> @@ -7,6 +7,7 @@
>  #  buffer overflow or integer overflow.
> 
>  #
> 
>  #  Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.<BR>
> 
> +#  Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
> reserved.<BR>
> 
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
>  ##
> 
> @@ -23,7 +24,7 @@
>  #
> 
>  # The following information is for reference only and not required by the
> build tools.
> 
>  #
> 
> -#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64
> 
> +#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64 RISCV64
> 
>  #
> 
> 
> 
>  [Sources]
> 
> diff --git a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf
> index 9282b0fd6b..baa4433cbe 100644
> --- a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/DxeCryptLib.inf
> @@ -3,6 +3,7 @@
>  # Protocol.
> 
>  #
> 
>  # Copyright (C) Microsoft Corporation. All rights reserved.
> 
> +# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
> reserved.<BR>
> 
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
>  ##
> 
> @@ -21,7 +22,7 @@
>  #
> 
>  # The following information is for reference only and not required by the
> build tools.
> 
>  #
> 
> -# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64
> 
> +# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64 RISCV64
> 
>  #
> 
> 
> 
>  [Packages]
> 
> diff --git a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf
> b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf
> index 5c56e3320e..038ca71890 100644
> --- a/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf
> +++ b/CryptoPkg/Library/BaseCryptLibOnProtocolPpi/PeiCryptLib.inf
> @@ -3,6 +3,7 @@
>  # PPI.
> 
>  #
> 
>  # Copyright (C) Microsoft Corporation. All rights reserved.
> 
> +# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
> reserved.<BR>
> 
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
>  ##
> 
> @@ -20,7 +21,7 @@
>  #
> 
>  # The following information is for reference only and not required by the
> build tools.
> 
>  #
> 
> -# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64
> 
> +# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64 RISCV64
> 
>  #
> 
> 
> 
>  [Packages]
> 
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index 3fa52f5543..01ee665183 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -2,6 +2,7 @@
>  #  This module provides OpenSSL Library implementation.
> 
>  #
> 
>  #  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
> 
> +#  (C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>
> 
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
>  ##
> 
> @@ -661,6 +662,7 @@
>    GCC:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -
> Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-
> error=unused-but-set-variable -DNO_MSABI_VA_FUNCS
> 
>    GCC:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-error=unused-but-set-variable
> 
>    GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable
> 
> +  GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=format -
> Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-
> variable
> 
>    GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> 
>    GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> 
>    GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> 
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> index f1f9fbb938..5c2206f6fb 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> @@ -2,6 +2,7 @@
>  #  This module provides OpenSSL Library implementation.
> 
>  #
> 
>  #  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
> 
> +#  (C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>
> 
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
>  ##
> 
> @@ -610,6 +611,7 @@
>    GCC:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -
> Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-
> error=unused-but-set-variable -DNO_MSABI_VA_FUNCS
> 
>    GCC:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-error=unused-but-set-variable
> 
>    GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable
> 
> +  GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-
> uninitialized -Wno-format -Wno-error=unused-but-set-variable
> 
>    GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> 
>    GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
> 
>    GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -
> Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-
> error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
> 
> diff --git a/CryptoPkg/Library/TlsLib/TlsLib.inf
> b/CryptoPkg/Library/TlsLib/TlsLib.inf
> index 2f3ce695c3..27209f4d7f 100644
> --- a/CryptoPkg/Library/TlsLib/TlsLib.inf
> +++ b/CryptoPkg/Library/TlsLib/TlsLib.inf
> @@ -2,7 +2,7 @@
>  #  SSL/TLS Wrapper Library Instance based on OpenSSL.
> 
>  #
> 
>  #  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
> 
> -#  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> 
> +#  (C) Copyright 2016-2020 Hewlett Packard Enterprise Development
> LP<BR>
> 
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
>  ##
> 
> @@ -19,7 +19,7 @@
>  #
> 
>  # The following information is for reference only and not required by the
> build tools.
> 
>  #
> 
> -#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64
> 
> +#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64 RISCV64
> 
>  #
> 
> 
> 
>  [Sources]
> 
> diff --git a/CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
> b/CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
> index 33f0e7493f..b2920ddacf 100644
> --- a/CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
> +++ b/CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
> @@ -2,7 +2,7 @@
>  #  SSL/TLS Wrapper Null Library Instance.
> 
>  #
> 
>  #  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
> 
> -#  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> 
> +#  (C) Copyright 2016-2020 Hewlett Packard Enterprise Development
> LP<BR>
> 
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
>  ##
> 
> @@ -19,7 +19,7 @@
>  #
> 
>  # The following information is for reference only and not required by the
> build tools.
> 
>  #
> 
> -#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64
> 
> +#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64 RISCV64
> 
>  #
> 
> 
> 
>  [Sources]
> 
> diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h
> b/CryptoPkg/Library/Include/CrtLibSupport.h
> index 5a20ba636f..7a82f1d406 100644
> --- a/CryptoPkg/Library/Include/CrtLibSupport.h
> +++ b/CryptoPkg/Library/Include/CrtLibSupport.h
> @@ -3,6 +3,7 @@
>    cryptographic library.
> 
> 
> 
>  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>
> 
> +Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights
> reserved.<BR>
> 
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> 
> 
>  **/
> 
> @@ -43,7 +44,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> 
>  #define CONFIG_HEADER_BN_H
> 
> 
> 
> -#if defined(MDE_CPU_X64) || defined(MDE_CPU_AARCH64) ||
> defined(MDE_CPU_IA64)
> 
> +#if defined(MDE_CPU_X64) || defined(MDE_CPU_AARCH64) ||
> defined(MDE_CPU_IA64) || defined(MDE_CPU_RISCV64)
> 
>  //
> 
>  // With GCC we would normally use SIXTY_FOUR_BIT_LONG, but MSVC
> needs
> 
>  // SIXTY_FOUR_BIT, because 'long' is 32-bit and only 'long long' is
> 
> --
> 2.25.0
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> 
> View/Reply Online (#55577): https://edk2.groups.io/g/devel/message/55577
> Mute This Topic: https://groups.io/mt/71767313/4399222
> Group Owner: devel+owner at edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [guomin.jiang at intel.com]
> -=-=-=-=-=-=


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#63034): https://edk2.groups.io/g/devel/message/63034
Mute This Topic: https://groups.io/mt/71767313/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-

More information about the edk2-devel-archive mailing list