From nobody Wed May 8 08:38:55 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1502307609701291.8773127782438; Wed, 9 Aug 2017 12:40:09 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1D33421E11D92; Wed, 9 Aug 2017 12:37:48 -0700 (PDT) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 578E921B06E9B for ; Wed, 9 Aug 2017 12:37:46 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP; 09 Aug 2017 12:40:04 -0700 Received: from mdkinney-mobl1.amr.corp.intel.com ([10.254.74.194]) by fmsmga006.fm.intel.com with ESMTP; 09 Aug 2017 12:40:04 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,349,1498546800"; d="scan'208";a="138372459" From: Michael D Kinney To: edk2-devel@lists.01.org Date: Wed, 9 Aug 2017 12:39:56 -0700 Message-Id: <20170809193957.10644-2-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.13.1.windows.2 In-Reply-To: <20170809193957.10644-1-michael.d.kinney@intel.com> References: <20170809193957.10644-1-michael.d.kinney@intel.com> Subject: [edk2] [Patch 1/2] QuarkSocPkg/MemoryInit: Remove use of memset()/memcpy() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Map the use of memset() and memcpy() to the BaseMemoryLib functions ZeroMem(), SetMem(), and CopyMem(). This fixes GCC build issues with this module. With the remap of the functions, the [BuildOptions] MSFT CC_FLAGS to enable /Oi can also be removed, so the MSFT and GCC builds behave the same. Cc: Kelly Steele Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney --- QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei/MemoryInitPei.inf | 6 +----- QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei/meminit_utils.h | 10 ++++++= +--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei/MemoryInitPei.inf= b/QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei/MemoryInitPei.inf index 78821f59a3..05766133ed 100644 --- a/QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei/MemoryInitPei.inf +++ b/QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei/MemoryInitPei.inf @@ -1,7 +1,7 @@ ## @file # This is the Memory Initialization Driver for Quark # -# Copyright (c) 2013-2015 Intel Corporation. +# Copyright (c) 2013-2017 Intel Corporation. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BS= D License @@ -74,7 +74,3 @@ =20 [Depex] TRUE - -[BuildOptions] - # /Oi option to use the intrinsic memset function in source code. - MSFT:*_*_*_CC_FLAGS =3D /Oi diff --git a/QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei/meminit_utils.h b= /QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei/meminit_utils.h index 04c59f5af0..dcc40c7782 100644 --- a/QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei/meminit_utils.h +++ b/QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei/meminit_utils.h @@ -1,6 +1,6 @@ /************************************************************************ * - * Copyright (c) 2013-2015 Intel Corporation. + * Copyright (c) 2013-2017 Intel Corporation. * * This program and the accompanying materials * are licensed and made available under the terms and conditions of the BS= D License @@ -90,8 +90,12 @@ void restore_timings(MRCParams_t *mrc_params); void default_timings(MRCParams_t *mrc_params); =20 #ifndef SIM -void *memset(void *d, int c, size_t n); -void *memcpy(void *d, const void *s, size_t n); +// +// Map memset() and memcpy() to BaseMemoryLib functions +// +#include +#define memset(d,c,n) ((c) =3D=3D 0) ? ZeroMem ((d), (n)) : SetMem ((d), (= n), (c)) +#define memcpy(d,s,n) CopyMem ((d), (s), (n)) #endif =20 #endif // _MEMINIT_UTILS_H_ --=20 2.13.1.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Wed May 8 08:38:55 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1502307612145521.1285687667703; Wed, 9 Aug 2017 12:40:12 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5EEF221E1DB4D; Wed, 9 Aug 2017 12:37:49 -0700 (PDT) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 97C5B21E11D7F for ; Wed, 9 Aug 2017 12:37:47 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP; 09 Aug 2017 12:40:06 -0700 Received: from mdkinney-mobl1.amr.corp.intel.com ([10.254.74.194]) by fmsmga006.fm.intel.com with ESMTP; 09 Aug 2017 12:40:04 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,349,1498546800"; d="scan'208";a="138372468" From: Michael D Kinney To: edk2-devel@lists.01.org Date: Wed, 9 Aug 2017 12:39:57 -0700 Message-Id: <20170809193957.10644-3-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.13.1.windows.2 In-Reply-To: <20170809193957.10644-1-michael.d.kinney@intel.com> References: <20170809193957.10644-1-michael.d.kinney@intel.com> Subject: [edk2] [Patch 2/2] QuarkPlatformPkg/Readme.md: edk2-non-osi directory layout X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leif Lindholm MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The following commit moved the QuarkSocBinPkg from the root directory to the the Silicon/Intel directory. https://github.com/tianocore/edk2-non-osi/commit/182e85d04566800fe188de4b1c= 30a50533dd74b7 The following updates are made to Readme.md: * PACKAGES_PATH setting for edk2-non-osi directory changes * Remove use of edk2-FatPkg repository * Remove use of edk2-BaseTools-win32 repository * Run python build tools from sources Cc: Leif Lindholm Cc: Kelly Steele Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Leif Lindholm --- QuarkPlatformPkg/Readme.md | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/QuarkPlatformPkg/Readme.md b/QuarkPlatformPkg/Readme.md index f925f9ef27..aa9d9856bd 100644 --- a/QuarkPlatformPkg/Readme.md +++ b/QuarkPlatformPkg/Readme.md @@ -46,12 +46,12 @@ - Install * ASL compiler: Available from http://www.acpica.org - Install into ```C:\ASL``` to match default tools_def.txt configuration. +* Python 2.7: Available from http://www.python.org =20 Create a new directory for an EDK II WORKSPACE. =20 The code block below shows the GIT clone operations required to pull the E= DK II -source tree, the FatPkg sources, the pre-built versions of BaseTools as WI= N32 -binaries, and the edk2-non-osi repository that provides a binary file for = the +source tree and the edk2-non-osi repository that provides a binary file fo= r the Quark Remote Management Unit (RMU). =20 Next it sets environment variables that must be set before running @@ -60,6 +60,8 @@ the EDK II [Multiple Workspace]( https://github.com/tianocore/tianocore.github.io/wiki/Multiple_Workspace) feature is used. =20 +Next, the EDK II BaseTools required to build firmware images are built. + Next, the ```edksetup.bat``` file is run to complete the initialization of= an EDK II build environment. Two example build commands are shown. The firs= t one in ```QuarkPlatformPlg/Quark.dsc``` builds a full UEFI firmware image that= is @@ -69,16 +71,17 @@ image that is useful for initial power-on and debug of = new features. =20 ```cmd git clone https://github.com/tianocore/edk2.git -git clone https://github.com/tianocore/edk2-FatPkg.git FatPkg -git clone https://github.com/tianocore/edk2-BaseTools-win32.git git clone https://github.com/tianocore/edk2-non-osi.git =20 +set PYTHON_HOME=3Dc:\Python27 set WORKSPACE=3D%CD% -set PACKAGES_PATH=3D%WORKSPACE%\edk2;%WORKSPACE%\edk2-non-osi -set EDK_TOOLS_BIN=3D%WORKSPACE%\edk2-BaseTools-win32 +set PACKAGES_PATH=3D%WORKSPACE%\edk2;%WORKSPACE%\edk2-non-osi\Silicon\Intel +set EDK_TOOLS_PATH=3D%WORKSPACE%\edk2\BaseTools +cd %WORKSPACE%\edk2 =20 -cd edk2 -edksetup.bat +BaseTools\toolsetup.bat Rebuild + +edksetup.bat Rebuild =20 build -a IA32 -t VS2015x86 -p QuarkPlatformPkg/Quark.dsc build -a IA32 -t VS2015x86 -p QuarkPlatformPkg/QuarkMin.dsc @@ -91,12 +94,13 @@ build -a IA32 -t VS2015x86 -p QuarkPlatformPkg/QuarkMin= .dsc * GIT client * GCC 4.9 compiler * ASL compiler: Available from http://www.acpica.org. +* Python 2.7 =20 Create a new directory for an EDK II WORKSPACE. =20 The code block below shows the GIT clone operations required to pull the E= DK II -source tree, the FatPkg sources, and the edk2-non-osi repository that prov= ides a -binary file for the Quark Remote Management Unit (RMU). +source tree and the edk2-non-osi repository that provides a binary file fo= r the +Quark Remote Management Unit (RMU). =20 Next it sets environment variables that must be set before running ```edksetup.bat```. Since content is being pulled from multiple repositori= es, @@ -106,7 +110,7 @@ feature is used. =20 Next, the EDK II BaseTools required to build firmware images are built. =20 -Next, the ```edksetup.bat``` file is run to complete the initialization of= an +Next, the ```edksetup.sh``` file is run to complete the initialization of = an EDK II build environment. Two example build commands are shown. The firs= t one in ```QuarkPlatformPlg/Quark.dsc``` builds a full UEFI firmware image that= is able to boot the built-in UEFI Shell and Linux from a micro SD FLASH card.= The @@ -115,17 +119,15 @@ image that is useful for initial power-on and debug o= f new features. =20 ```sh git clone https://github.com/tianocore/edk2.git -git clone https://github.com/tianocore/edk2-FatPkg.git FatPkg git clone https://github.com/tianocore/edk2-non-osi.git =20 export WORKSPACE=3D$PWD -export PACKAGES_PATH=3D$WORKSPACE/edk2:$WORKSPACE/edk2-non-osi +export PACKAGES_PATH=3D$WORKSPACE/edk2:$WORKSPACE/edk2-non-osi/Silicon/Int= el export EDK_TOOLS_PATH=3D$WORKSPACE/edk2/BaseTools - -make -C edk2/BaseTools - cd $WORKSPACE/edk2 =20 +make -C BaseTools + . edksetup.sh BaseTools =20 build -a IA32 -t GCC49 -p QuarkPlatformPkg/Quark.dsc --=20 2.13.1.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel