From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com [IPv6:2a00:1450:400c:c09::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 18AA62095DE51 for ; Thu, 10 Aug 2017 01:38:15 -0700 (PDT) Received: by mail-wm0-x231.google.com with SMTP id f15so16176976wmg.1 for ; Thu, 10 Aug 2017 01:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=50o/gh6+31xOZ2RgkHnNW6AeUb6vyL9mdgdyBkohoLY=; b=Mr3sGqyvmS0MynB3vG6LgRzaT9+XqzobW/4malUbvYFVWXQZfuFry0iBrQoAZcbhoc FA1GWtTAvFUmo2AUUWXmiOsrPrUP0NVqzxab9eqraVLdywapjJvbzyuoqNc81eOv/CcI FRu0/LIuYP86JrS/OdJ6zUTJXa97ea6aoj+rk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=50o/gh6+31xOZ2RgkHnNW6AeUb6vyL9mdgdyBkohoLY=; b=ZlkoAifOTi+IMrrU7uGLn+MTpEImV62Neomm6iZ3iqiEpdjmKPzeXHcAvPFmpgT76w y36TS+ESqHZeCIf8VNwxuQjx599FUaHXrrunWt7hERtJJXwOBsNSWlrXO4BQ8P2wfYYm 1a3DbDxjj/i5/TA/c+5LJYNtpYFRLat1LudYH7RVg9fJ3R0je4bpJZoknbkdzemuwy2m PGJ6xLCFTZPJl+Z8E4UDdjFzOmKyhAgpmNqWW3VeI8KPX/LtbwcuzsrphXU35MWPfp/g efvZ3JfxP93bqkjWe2huIMOiKtLpvhkyXPiQKiKhFUk/S/qj6YnAufPvpLeIyignV2Em wXdA== X-Gm-Message-State: AHYfb5hZ1NBlIwXnptH1cll0rghY5TJ/buld+XvEJSXbS5n5qYBElz30 pHCMdwBaqmi7gbDA X-Received: by 10.28.155.84 with SMTP id d81mr6289436wme.163.1502354432522; Thu, 10 Aug 2017 01:40:32 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id 134sm4772716wmw.24.2017.08.10.01.40.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Aug 2017 01:40:31 -0700 (PDT) Date: Thu, 10 Aug 2017 09:40:30 +0100 From: Leif Lindholm To: Michael D Kinney Cc: edk2-devel@lists.01.org, Kelly Steele Message-ID: <20170810084030.p6d6qrj6zaxhvjay@bivouac.eciton.net> References: <20170809193957.10644-1-michael.d.kinney@intel.com> <20170809193957.10644-3-michael.d.kinney@intel.com> MIME-Version: 1.0 In-Reply-To: <20170809193957.10644-3-michael.d.kinney@intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [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: , X-List-Received-Date: Thu, 10 Aug 2017 08:38:15 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Aug 09, 2017 at 12:39:57PM -0700, Michael D Kinney wrote: > The following commit moved the QuarkSocBinPkg from the root > directory to the the Silicon/Intel directory. > > https://github.com/tianocore/edk2-non-osi/commit/182e85d04566800fe188de4b1c30a50533dd74b7 > > 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 I don't think you need my r-b on this, but I appreciate the cc. If I was nitpicking, I would point out there are three logically unrelated changes going on here. However, since it all consist of updates to a single documentation file, the only change I would request would be to the subject line to say something a bit broader like "bring Readme.md up to date". With that: Reviewed-by: Leif Lindholm > Cc: Leif Lindholm > Cc: Kelly Steele > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael D Kinney > --- > 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 > > Create a new directory for an EDK II WORKSPACE. > > The code block below shows the GIT clone operations required to pull the EDK II > -source tree, the FatPkg sources, the pre-built versions of BaseTools as WIN32 > -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 for the > Quark Remote Management Unit (RMU). > > 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. > > +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 first 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. > > ```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 > > +set PYTHON_HOME=c:\Python27 > set WORKSPACE=%CD% > -set PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\edk2-non-osi > -set EDK_TOOLS_BIN=%WORKSPACE%\edk2-BaseTools-win32 > +set PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\edk2-non-osi\Silicon\Intel > +set EDK_TOOLS_PATH=%WORKSPACE%\edk2\BaseTools > +cd %WORKSPACE%\edk2 > > -cd edk2 > -edksetup.bat > +BaseTools\toolsetup.bat Rebuild > + > +edksetup.bat Rebuild > > 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 > > Create a new directory for an EDK II WORKSPACE. > > The code block below shows the GIT clone operations required to pull the EDK II > -source tree, the FatPkg sources, and the edk2-non-osi repository that provides a > -binary file for the Quark Remote Management Unit (RMU). > +source tree and the edk2-non-osi repository that provides a binary file for the > +Quark Remote Management Unit (RMU). > > Next it sets environment variables that must be set before running > ```edksetup.bat```. Since content is being pulled from multiple repositories, > @@ -106,7 +110,7 @@ feature is used. > > 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 > +Next, the ```edksetup.sh``` file is run to complete the initialization of an > EDK II build environment. Two example build commands are shown. The first 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 of new features. > > ```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 > > export WORKSPACE=$PWD > -export PACKAGES_PATH=$WORKSPACE/edk2:$WORKSPACE/edk2-non-osi > +export PACKAGES_PATH=$WORKSPACE/edk2:$WORKSPACE/edk2-non-osi/Silicon/Intel > export EDK_TOOLS_PATH=$WORKSPACE/edk2/BaseTools > - > -make -C edk2/BaseTools > - > cd $WORKSPACE/edk2 > > +make -C BaseTools > + > . edksetup.sh BaseTools > > build -a IA32 -t GCC49 -p QuarkPlatformPkg/Quark.dsc > -- > 2.13.1.windows.2 >