QuarkPlatformPkg/Readme.md: Bring Readme.md up to date

The following commit moved the QuarkSocBinPkg from the root
directory of the edk2-non-osi repository to 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

Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Kelly Steele <kelly.steele@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Kelly Steele <kelly.steele@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/QuarkPlatformPkg/Readme.md b/QuarkPlatformPkg/Readme.md
index f925f9ef2766811fe970bacfe9fa541ab018cdeb..aa9d9856bd160cd38510c8e491d33db46c369313 100644 (file)
--- a/QuarkPlatformPkg/Readme.md
+++ b/QuarkPlatformPkg/Readme.md
@@ -46,12 +46,12 @@
   - Install\r
 * ASL compiler: Available from http://www.acpica.org\r
   - Install into ```C:\ASL``` to match default tools_def.txt configuration.\r
   - Install\r
 * ASL compiler: Available from http://www.acpica.org\r
   - Install into ```C:\ASL``` to match default tools_def.txt configuration.\r

+* Python 2.7: Available from http://www.python.org\r

 \r
 Create a new directory for an EDK II WORKSPACE.\r
 \r
 The code block below shows the GIT clone operations required to pull the EDK II\r
 \r
 Create a new directory for an EDK II WORKSPACE.\r
 \r
 The code block below shows the GIT clone operations required to pull the EDK II\r

-source tree, the FatPkg sources, the pre-built versions of BaseTools as WIN32\r
-binaries, and the edk2-non-osi repository that provides a binary file for the\r
+source tree and the edk2-non-osi repository that provides a binary file for the\r

 Quark Remote Management Unit (RMU).\r
 \r
 Next it sets environment variables that must be set before running\r
 Quark Remote Management Unit (RMU).\r
 \r
 Next it sets environment variables that must be set before running\r


@@ -60,6 +60,8 @@ the EDK II [Multiple Workspace](
 https://github.com/tianocore/tianocore.github.io/wiki/Multiple_Workspace)\r
 feature is used.\r
 \r
 https://github.com/tianocore/tianocore.github.io/wiki/Multiple_Workspace)\r
 feature is used.\r
 \r

+Next, the EDK II BaseTools required to build firmware images are built.\r
+\r

 Next, the ```edksetup.bat``` file is run to complete the initialization of an\r
 EDK II build environment.  Two example build commands are shown.  The first one\r
 in ```QuarkPlatformPlg/Quark.dsc``` builds a full UEFI firmware image that is\r
 Next, the ```edksetup.bat``` file is run to complete the initialization of an\r
 EDK II build environment.  Two example build commands are shown.  The first one\r
 in ```QuarkPlatformPlg/Quark.dsc``` builds a full UEFI firmware image that is\r


@@ -69,16 +71,17 @@ image that is useful for initial power-on and debug of new features.
 \r
 ```cmd\r
 git clone https://github.com/tianocore/edk2.git\r
 \r
 ```cmd\r
 git clone https://github.com/tianocore/edk2.git\r

-git clone https://github.com/tianocore/edk2-FatPkg.git FatPkg\r
-git clone https://github.com/tianocore/edk2-BaseTools-win32.git\r

 git clone https://github.com/tianocore/edk2-non-osi.git\r
 \r
 git clone https://github.com/tianocore/edk2-non-osi.git\r
 \r

+set PYTHON_HOME=c:\Python27\r

 set WORKSPACE=%CD%\r
 set WORKSPACE=%CD%\r

-set PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\edk2-non-osi\r
-set EDK_TOOLS_BIN=%WORKSPACE%\edk2-BaseTools-win32\r
+set PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\edk2-non-osi\Silicon\Intel\r
+set EDK_TOOLS_PATH=%WORKSPACE%\edk2\BaseTools\r
+cd %WORKSPACE%\edk2\r

 \r
 \r

-cd edk2\r
-edksetup.bat\r
+BaseTools\toolsetup.bat Rebuild\r
+\r
+edksetup.bat Rebuild\r

 \r
 build -a IA32 -t VS2015x86 -p QuarkPlatformPkg/Quark.dsc\r
 build -a IA32 -t VS2015x86 -p QuarkPlatformPkg/QuarkMin.dsc\r
 \r
 build -a IA32 -t VS2015x86 -p QuarkPlatformPkg/Quark.dsc\r
 build -a IA32 -t VS2015x86 -p QuarkPlatformPkg/QuarkMin.dsc\r


@@ -91,12 +94,13 @@ build -a IA32 -t VS2015x86 -p QuarkPlatformPkg/QuarkMin.dsc
 * GIT client\r
 * GCC 4.9 compiler\r
 * ASL compiler: Available from http://www.acpica.org.\r
 * GIT client\r
 * GCC 4.9 compiler\r
 * ASL compiler: Available from http://www.acpica.org.\r

+* Python 2.7\r

 \r
 Create a new directory for an EDK II WORKSPACE.\r
 \r
 The code block below shows the GIT clone operations required to pull the EDK II\r
 \r
 Create a new directory for an EDK II WORKSPACE.\r
 \r
 The code block below shows the GIT clone operations required to pull the EDK II\r

-source tree, the FatPkg sources, and the edk2-non-osi repository that provides a\r
-binary file for the Quark Remote Management Unit (RMU).\r
+source tree and the edk2-non-osi repository that provides a binary file for the\r
+Quark Remote Management Unit (RMU).\r

 \r
 Next it sets environment variables that must be set before running\r
 ```edksetup.bat```. Since content is being pulled from multiple repositories,\r
 \r
 Next it sets environment variables that must be set before running\r
 ```edksetup.bat```. Since content is being pulled from multiple repositories,\r


@@ -106,7 +110,7 @@ feature is used.
 \r
 Next, the EDK II BaseTools required to build firmware images are built.\r
 \r
 \r
 Next, the EDK II BaseTools required to build firmware images are built.\r
 \r

-Next, the ```edksetup.bat``` file is run to complete the initialization of an\r
+Next, the ```edksetup.sh``` file is run to complete the initialization of an\r

 EDK II build environment.  Two example build commands are shown.  The first one\r
 in ```QuarkPlatformPlg/Quark.dsc``` builds a full UEFI firmware image that is\r
 able to boot the built-in UEFI Shell and Linux from a micro SD FLASH card.  The\r
 EDK II build environment.  Two example build commands are shown.  The first one\r
 in ```QuarkPlatformPlg/Quark.dsc``` builds a full UEFI firmware image that is\r
 able to boot the built-in UEFI Shell and Linux from a micro SD FLASH card.  The\r


@@ -115,17 +119,15 @@ image that is useful for initial power-on and debug of new features.
 \r
 ```sh\r
 git clone https://github.com/tianocore/edk2.git\r
 \r
 ```sh\r
 git clone https://github.com/tianocore/edk2.git\r

-git clone https://github.com/tianocore/edk2-FatPkg.git FatPkg\r

 git clone https://github.com/tianocore/edk2-non-osi.git\r
 \r
 export WORKSPACE=$PWD\r
 git clone https://github.com/tianocore/edk2-non-osi.git\r
 \r
 export WORKSPACE=$PWD\r

-export PACKAGES_PATH=$WORKSPACE/edk2:$WORKSPACE/edk2-non-osi\r
+export PACKAGES_PATH=$WORKSPACE/edk2:$WORKSPACE/edk2-non-osi/Silicon/Intel\r

 export EDK_TOOLS_PATH=$WORKSPACE/edk2/BaseTools\r
 export EDK_TOOLS_PATH=$WORKSPACE/edk2/BaseTools\r

-\r
-make -C edk2/BaseTools\r
-\r

 cd $WORKSPACE/edk2\r
 \r
 cd $WORKSPACE/edk2\r
 \r

+make -C BaseTools\r
+\r

 . edksetup.sh BaseTools\r
 \r
 build -a IA32 -t GCC49 -p QuarkPlatformPkg/Quark.dsc\r
 . edksetup.sh BaseTools\r
 \r
 build -a IA32 -t GCC49 -p QuarkPlatformPkg/Quark.dsc\r