* [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg: Enable PatchFv tool supports PCD value format in build report
@ 2018-07-06 7:45 Liming Gao
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: Update batch file to call python.exe Liming Gao
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Liming Gao @ 2018-07-06 7:45 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao
PCD value in build report shows HEX and DEC both. PatchFv tool only requires
one value.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
---
Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py | 2 +-
Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py | 2 +-
Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py | 2 +-
Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
index 73c18c5..bb9d280 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
@@ -101,7 +101,7 @@ class FileChecker:
if (cmp (splitLine[0], "FIXED") == 0) or (cmp (splitLine[0], "PATCH") == 0):
SplitLine = splitLine[1].strip()[1:].split(")", 1)
Type = SplitLine[0]
- Value = SplitLine[1].strip()[1:].strip()
+ Value = SplitLine[1].strip()[1:].strip().split()[0]
print " Type - (" + Type + "), Value - (" + Value + ")"
return [Value, Type]
return ["", ""]
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
index f5cb427..e1facd1 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
@@ -209,7 +209,7 @@ class FileChecker:
if (cmp (splitLine[0], "FIXED") == 0) or (cmp (splitLine[0], "PATCH") == 0):
SplitLine = splitLine[1].strip()[1:].split(")", 1)
Type = SplitLine[0]
- Value = SplitLine[1].strip()[1:].strip()
+ Value = SplitLine[1].strip()[1:].strip().split()[0]
print " Type - (" + Type + "), Value - (" + Value + ")"
return [Value, Type]
return ["", ""]
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
index 5463a93..4d194b3 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
@@ -643,7 +643,7 @@ class FileChecker:
if (cmp (splitLine[0], "FIXED") == 0) or (cmp (splitLine[0], "PATCH") == 0):
SplitLine = splitLine[1].strip()[1:].split(")", 1)
Type = SplitLine[0]
- Value = SplitLine[1].strip()[1:].strip()
+ Value = SplitLine[1].strip()[1:].strip().split()[0]
print " Type - (" + Type + "), Value - (" + Value + ")"
return [Value, Type]
return ["", ""]
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
index 57b6724..19c6e04 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
@@ -423,7 +423,7 @@ class FileChecker:
if (cmp (splitLine[0], "FIXED") == 0) or (cmp (splitLine[0], "PATCH") == 0):
SplitLine = splitLine[1].strip()[1:].split(")", 1)
Type = SplitLine[0]
- Value = SplitLine[1].strip()[1:].strip()
+ Value = SplitLine[1].strip()[1:].strip().split()[0]
print " Type - (" + Type + "), Value - (" + Value + ")"
return [Value, Type]
return ["", ""]
--
2.10.0.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: Update batch file to call python.exe
2018-07-06 7:45 [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg: Enable PatchFv tool supports PCD value format in build report Liming Gao
@ 2018-07-06 7:45 ` Liming Gao
2018-07-06 14:57 ` Yao, Jiewen
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: update ReadMe.md to correct branch name Liming Gao
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Liming Gao @ 2018-07-06 7:45 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao
Use python.exe from PYTHON_HOME
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
---
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat | 2 +-
.../Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py | 7 ++++---
.../Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat | 14 +++++++-------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
index 6b0918c..e0ad5ee 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
@@ -50,7 +50,7 @@ del /f %WORKSPACE_FSP_BIN%\KabylakeFspBinPkg\Fsp_Rebased*.fd
cd %WORKSPACE%
if exist %WORKSPACE_PLATFORM%\%PROJECT%\OpenBoardPkgPcd.dsc attrib -r %WORKSPACE_PLATFORM%\%PROJECT%\OpenBoardPkgPcd.dsc
-@call python %WORKSPACE_PLATFORM%\%PLATFORM_PACKAGE%\Tools\Fsp\RebaseAndPatchFspBinBaseAddress.py %WORKSPACE_PLATFORM%\%PLATFORM_BOARD_PACKAGE%\Include\Fdf\FlashMapInclude.fdf %WORKSPACE_FSP_BIN%\KabylakeFspBinPkg Fsp.fd %WORKSPACE_PLATFORM%\%PROJECT%\OpenBoardPkgPcd.dsc 0x0
+@call %PYTHON_HOME%\python.exe %WORKSPACE_PLATFORM%\%PLATFORM_PACKAGE%\Tools\Fsp\RebaseAndPatchFspBinBaseAddress.py %WORKSPACE_PLATFORM%\%PLATFORM_BOARD_PACKAGE%\Include\Fdf\FlashMapInclude.fdf %WORKSPACE_FSP_BIN%\KabylakeFspBinPkg Fsp.fd %WORKSPACE_PLATFORM%\%PROJECT%\OpenBoardPkgPcd.dsc 0x0
@if %ERRORLEVEL% NEQ 0 (
@echo !!! ERROR:RebaseAndPatchFspBinBaseAddress failed!!!
diff --git a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py
index 7fe26df..35f3f8c 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py
@@ -71,7 +71,8 @@ file.close()
# Get FSP-M Size, in order to calculate the FSP-T Base. Used SplitFspBin.py script
# to dump the header, and get the ImageSize in FSP-M section
#
-Process = subprocess.Popen("python edk2\IntelFsp2Pkg\Tools\SplitFspBin.py info -f" + fspBinFilePath, stdout=subprocess.PIPE)
+pythontool = os.environ['PYTHON_HOME'] + '\python.exe'
+Process = subprocess.Popen(pythontool + " edk2\IntelFsp2Pkg\Tools\SplitFspBin.py info -f" + fspBinFilePath, stdout=subprocess.PIPE)
Output = Process.communicate()[0]
FsptInfo = Output.rsplit("FSP_M", 1);
for line in FsptInfo[1].split("\n"):
@@ -88,13 +89,13 @@ fspTBaseAddress = flashBase + fspTBaseOffset
# Re-base FSP bin file to new address and save it as fspBinFileRebased using SplitFspBin.py
#
rebaseArguments = fspBinFilePath + " -c s m t -b " + str(hex(fspSBaseAddress).rstrip("L")) + " " + str(hex(fspMBaseAddress).rstrip("L")) + " " + str(hex(fspTBaseAddress).rstrip("L")) + " -o" + fspBinPath + " -n " + fspBinFileRebased
-os.system("python edk2\IntelFsp2Pkg\Tools\SplitFspBin.py rebase -f" + rebaseArguments)
+os.system(pythontool + " edk2\IntelFsp2Pkg\Tools\SplitFspBin.py rebase -f" + rebaseArguments)
#
# Split FSP bin to FSP-S/M/T segments
#
splitArguments = fspBinPath +"\\" + fspBinFileRebased + " -o " + fspBinPath + " -n Fsp_Rebased.fd"
-os.system("python edk2\IntelFsp2Pkg\Tools\SplitFspBin.py split -f" + splitArguments)
+os.system(pythontool + " edk2\IntelFsp2Pkg\Tools\SplitFspBin.py split -f" + splitArguments)
#
# Patch dsc file with the re-based FSP-S/M/T address, so internally build will use the same.
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
index 807b942..5c787bb 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
@@ -18,28 +18,28 @@ set /a postbuildstep=0
@echo BoardPostBuild.%postbuildstep% python PatchBinFv.py
@set /a postbuildstep=%postbuildstep%+1
echo python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvTempMemorySilicon
-call python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvTempMemorySilicon
+call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvTempMemorySilicon
if %ERRORLEVEL% NEQ 0 (
set SCRIPT_ERROR=1
echo PatchBinFv Error. Exit
goto :EOF
)
echo python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPreMemorySilicon
-call python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPreMemorySilicon
+call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPreMemorySilicon
if %ERRORLEVEL% NEQ 0 (
set SCRIPT_ERROR=1
echo PatchBinFv Error. Exit
goto :EOF
)
echo python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPostMemorySilicon
-call python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPostMemorySilicon
+call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPostMemorySilicon
if %ERRORLEVEL% NEQ 0 (
set SCRIPT_ERROR=1
echo PatchBinFv Error. Exit
goto :EOF
)
echo python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvLateSilicon
-call python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvLateSilicon
+call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvLateSilicon
if %ERRORLEVEL% NEQ 0 (
set SCRIPT_ERROR=1
echo PatchBinFv Error. Exit
@@ -50,7 +50,7 @@ if %ERRORLEVEL% NEQ 0 (
@echo BoardPostBuild.%postbuildstep% python RebaseBinFv.py
@set /a postbuildstep=%postbuildstep%+1
echo python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\RebaseBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPreMemorySilicon gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMBase
-call python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\RebaseBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPreMemorySilicon gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMBase
+call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\RebaseBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPreMemorySilicon gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMBase
if %ERRORLEVEL% NEQ 0 (
set SCRIPT_ERROR=1
echo RebaseBinFv Error. Exit
@@ -58,7 +58,7 @@ if %ERRORLEVEL% NEQ 0 (
)
echo python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\RebaseBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPostMemorySilicon gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSBase
-call python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\RebaseBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPostMemorySilicon gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSBase
+call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\RebaseBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPostMemorySilicon gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSBase
if %ERRORLEVEL% NEQ 0 (
set SCRIPT_ERROR=1
echo RebaseBinFv Error. Exit
@@ -80,7 +80,7 @@ if %ERRORLEVEL% NEQ 0 (
@echo BoardPostBuild.%postbuildstep% python PatchBfv.py
@set /a postbuildstep=%postbuildstep%+1
echo python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBfv.py %WORKSPACE%\Build\%BOARD_PKG%\%BOARD_NAME%\%TARGET%_%TOOL_CHAIN_TAG%\FV\PLATFORM.fd %WORKSPACE%\Build\BuildReport.txt gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase
-call python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBfv.py %WORKSPACE%\Build\%BOARD_PKG%\%BOARD_NAME%\%TARGET%_%TOOL_CHAIN_TAG%\FV\PLATFORM.fd %WORKSPACE%\Build\BuildReport.txt gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase
+call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\PatchFv\PatchBfv.py %WORKSPACE%\Build\%BOARD_PKG%\%BOARD_NAME%\%TARGET%_%TOOL_CHAIN_TAG%\FV\PLATFORM.fd %WORKSPACE%\Build\BuildReport.txt gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase
if %ERRORLEVEL% NEQ 0 (
set SCRIPT_ERROR=1
echo PatchBfv Error. Exit
--
2.10.0.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: Update batch file to call python.exe
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: Update batch file to call python.exe Liming Gao
@ 2018-07-06 14:57 ` Yao, Jiewen
0 siblings, 0 replies; 8+ messages in thread
From: Yao, Jiewen @ 2018-07-06 14:57 UTC (permalink / raw)
To: Gao, Liming, edk2-devel@lists.01.org
Reviewed-by: Jiewen.yao@intel.com
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Liming
> Gao
> Sent: Thursday, July 5, 2018 11:46 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [edk2] [PATCH edk2-platforms\devel-MinPlatform] MinPlatform:
> Update batch file to call python.exe
>
> Use python.exe from PYTHON_HOME
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> ---
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat | 2 +-
> .../Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py | 7 ++++---
> .../Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat | 14
> +++++++-------
> 3 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> index 6b0918c..e0ad5ee 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat
> @@ -50,7 +50,7 @@ del
> /f %WORKSPACE_FSP_BIN%\KabylakeFspBinPkg\Fsp_Rebased*.fd
> cd %WORKSPACE%
>
> if exist %WORKSPACE_PLATFORM%\%PROJECT%\OpenBoardPkgPcd.dsc attrib
> -r %WORKSPACE_PLATFORM%\%PROJECT%\OpenBoardPkgPcd.dsc
> -@call
> python %WORKSPACE_PLATFORM%\%PLATFORM_PACKAGE%\Tools\Fsp\Rebas
> eAndPatchFspBinBaseAddress.py %WORKSPACE_PLATFORM%\%PLATFORM_BO
> ARD_PACKAGE%\Include\Fdf\FlashMapInclude.fdf %WORKSPACE_FSP_BIN%\K
> abylakeFspBinPkg
> Fsp.fd %WORKSPACE_PLATFORM%\%PROJECT%\OpenBoardPkgPcd.dsc 0x0
> +@call %PYTHON_HOME%\python.exe %WORKSPACE_PLATFORM%\%PLATFOR
> M_PACKAGE%\Tools\Fsp\RebaseAndPatchFspBinBaseAddress.py %WORKSPACE
> _PLATFORM%\%PLATFORM_BOARD_PACKAGE%\Include\Fdf\FlashMapInclude.
> fdf %WORKSPACE_FSP_BIN%\KabylakeFspBinPkg
> Fsp.fd %WORKSPACE_PLATFORM%\%PROJECT%\OpenBoardPkgPcd.dsc 0x0
>
> @if %ERRORLEVEL% NEQ 0 (
> @echo !!! ERROR:RebaseAndPatchFspBinBaseAddress failed!!!
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress
> .py
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress
> .py
> index 7fe26df..35f3f8c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress
> .py
> +++
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress
> .py
> @@ -71,7 +71,8 @@ file.close()
> # Get FSP-M Size, in order to calculate the FSP-T Base. Used SplitFspBin.py
> script
> # to dump the header, and get the ImageSize in FSP-M section
> #
> -Process = subprocess.Popen("python edk2\IntelFsp2Pkg\Tools\SplitFspBin.py
> info -f" + fspBinFilePath, stdout=subprocess.PIPE)
> +pythontool = os.environ['PYTHON_HOME'] + '\python.exe'
> +Process = subprocess.Popen(pythontool + "
> edk2\IntelFsp2Pkg\Tools\SplitFspBin.py info -f" + fspBinFilePath,
> stdout=subprocess.PIPE)
> Output = Process.communicate()[0]
> FsptInfo = Output.rsplit("FSP_M", 1);
> for line in FsptInfo[1].split("\n"):
> @@ -88,13 +89,13 @@ fspTBaseAddress = flashBase + fspTBaseOffset
> # Re-base FSP bin file to new address and save it as fspBinFileRebased using
> SplitFspBin.py
> #
> rebaseArguments = fspBinFilePath + " -c s m t -b " +
> str(hex(fspSBaseAddress).rstrip("L")) + " " +
> str(hex(fspMBaseAddress).rstrip("L")) + " " +
> str(hex(fspTBaseAddress).rstrip("L")) + " -o" + fspBinPath + " -n " +
> fspBinFileRebased
> -os.system("python edk2\IntelFsp2Pkg\Tools\SplitFspBin.py rebase -f" +
> rebaseArguments)
> +os.system(pythontool + " edk2\IntelFsp2Pkg\Tools\SplitFspBin.py rebase -f" +
> rebaseArguments)
>
> #
> # Split FSP bin to FSP-S/M/T segments
> #
> splitArguments = fspBinPath +"\\" + fspBinFileRebased + " -o " + fspBinPath + "
> -n Fsp_Rebased.fd"
> -os.system("python edk2\IntelFsp2Pkg\Tools\SplitFspBin.py split -f" +
> splitArguments)
> +os.system(pythontool + " edk2\IntelFsp2Pkg\Tools\SplitFspBin.py split -f" +
> splitArguments)
>
> #
> # Patch dsc file with the re-based FSP-S/M/T address, so internally build will use
> the same.
> diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
> b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
> index 807b942..5c787bb 100644
> --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
> +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/postbuild.bat
> @@ -18,28 +18,28 @@ set /a postbuildstep=0
> @echo BoardPostBuild.%postbuildstep% python PatchBinFv.py
> @set /a postbuildstep=%postbuildstep%+1
> echo
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\
> PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt
> FvTempMemorySilicon
> -call
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\
> PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt
> FvTempMemorySilicon
> +call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform
> \Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE
> %\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildRe
> port.txt FvTempMemorySilicon
> if %ERRORLEVEL% NEQ 0 (
> set SCRIPT_ERROR=1
> echo PatchBinFv Error. Exit
> goto :EOF
> )
> echo
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\
> PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPreMemorySilicon
> -call
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\
> PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPreMemorySilicon
> +call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform
> \Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE
> %\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildRe
> port.txt FvPreMemorySilicon
> if %ERRORLEVEL% NEQ 0 (
> set SCRIPT_ERROR=1
> echo PatchBinFv Error. Exit
> goto :EOF
> )
> echo
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\
> PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPostMemorySilicon
> -call
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\
> PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPostMemorySilicon
> +call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform
> \Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE
> %\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildRe
> port.txt FvPostMemorySilicon
> if %ERRORLEVEL% NEQ 0 (
> set SCRIPT_ERROR=1
> echo PatchBinFv Error. Exit
> goto :EOF
> )
> echo
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\
> PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvLateSilicon
> -call
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\PatchBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel\
> PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvLateSilicon
> +call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform
> \Intel\MinPlatformPkg\Tools\PatchFv\PatchBinFv.py %TARGET% %WORKSPACE
> %\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildRe
> port.txt FvLateSilicon
> if %ERRORLEVEL% NEQ 0 (
> set SCRIPT_ERROR=1
> echo PatchBinFv Error. Exit
> @@ -50,7 +50,7 @@ if %ERRORLEVEL% NEQ 0 (
> @echo BoardPostBuild.%postbuildstep% python RebaseBinFv.py
> @set /a postbuildstep=%postbuildstep%+1
> echo
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\RebaseBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel
> \PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPreMemorySilicon
> gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMBase
> -call
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\RebaseBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel
> \PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt FvPreMemorySilicon
> gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMBase
> +call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform
> \Intel\MinPlatformPkg\Tools\PatchFv\RebaseBinFv.py %TARGET% %WORKSPAC
> E%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildR
> eport.txt FvPreMemorySilicon
> gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMBase
> if %ERRORLEVEL% NEQ 0 (
> set SCRIPT_ERROR=1
> echo RebaseBinFv Error. Exit
> @@ -58,7 +58,7 @@ if %ERRORLEVEL% NEQ 0 (
> )
>
> echo
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\RebaseBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel
> \PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt
> FvPostMemorySilicon gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSBase
> -call
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\RebaseBinFv.py %TARGET% %WORKSPACE%\edk2-non-osi\Silicon\Intel
> \PurleySiliconBinPkg %WORKSPACE%\Build\BuildReport.txt
> FvPostMemorySilicon gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSBase
> +call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform
> \Intel\MinPlatformPkg\Tools\PatchFv\RebaseBinFv.py %TARGET% %WORKSPAC
> E%\edk2-non-osi\Silicon\Intel\PurleySiliconBinPkg %WORKSPACE%\Build\BuildR
> eport.txt FvPostMemorySilicon
> gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSBase
> if %ERRORLEVEL% NEQ 0 (
> set SCRIPT_ERROR=1
> echo RebaseBinFv Error. Exit
> @@ -80,7 +80,7 @@ if %ERRORLEVEL% NEQ 0 (
> @echo BoardPostBuild.%postbuildstep% python PatchBfv.py
> @set /a postbuildstep=%postbuildstep%+1
> echo
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\PatchBfv.py %WORKSPACE%\Build\%BOARD_PKG%\%BOARD_NAME%
> \%TARGET%_%TOOL_CHAIN_TAG%\FV\PLATFORM.fd %WORKSPACE%\Build\Bu
> ildReport.txt gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase
> -call
> python %WORKSPACE%\edk2-platforms\Platform\Intel\MinPlatformPkg\Tools\
> PatchFv\PatchBfv.py %WORKSPACE%\Build\%BOARD_PKG%\%BOARD_NAME%
> \%TARGET%_%TOOL_CHAIN_TAG%\FV\PLATFORM.fd %WORKSPACE%\Build\Bu
> ildReport.txt gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase
> +call %PYTHON_HOME%\python.exe %WORKSPACE%\edk2-platforms\Platform
> \Intel\MinPlatformPkg\Tools\PatchFv\PatchBfv.py %WORKSPACE%\Build\%BOA
> RD_PKG%\%BOARD_NAME%\%TARGET%_%TOOL_CHAIN_TAG%\FV\PLATFOR
> M.fd %WORKSPACE%\Build\BuildReport.txt
> gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase
> if %ERRORLEVEL% NEQ 0 (
> set SCRIPT_ERROR=1
> echo PatchBfv Error. Exit
> --
> 2.10.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: update ReadMe.md to correct branch name
2018-07-06 7:45 [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg: Enable PatchFv tool supports PCD value format in build report Liming Gao
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: Update batch file to call python.exe Liming Gao
@ 2018-07-06 7:45 ` Liming Gao
2018-07-06 14:56 ` Yao, Jiewen
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] PurleyOpenBoardPkg: Remove unnecessary Link16 and IASL override Liming Gao
2018-07-06 14:57 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg: Enable PatchFv tool supports PCD value format in build report Yao, Jiewen
3 siblings, 1 reply; 8+ messages in thread
From: Liming Gao @ 2018-07-06 7:45 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
---
ReadMe.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ReadMe.md b/ReadMe.md
index 9de6493..5bcdd1d 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -32,7 +32,7 @@ edk2-non-osi repository
``git clone https://github.com/tianocore/edk2-non-osi.git -b devel-MinPlatform``
FSP repository
- ``git clone https://github.com/IntelFsp/FSP.git -b KabylakeFsp0001``
+ ``git clone https://github.com/IntelFsp/FSP.git -b Kabylake``
### Build
--
2.10.0.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: update ReadMe.md to correct branch name
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: update ReadMe.md to correct branch name Liming Gao
@ 2018-07-06 14:56 ` Yao, Jiewen
0 siblings, 0 replies; 8+ messages in thread
From: Yao, Jiewen @ 2018-07-06 14:56 UTC (permalink / raw)
To: Gao, Liming, edk2-devel@lists.01.org
Reviewed-by: Jiewen.yao@intel.com
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Liming
> Gao
> Sent: Thursday, July 5, 2018 11:46 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [edk2] [PATCH edk2-platforms\devel-MinPlatform] MinPlatform:
> update ReadMe.md to correct branch name
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> ---
> ReadMe.md | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/ReadMe.md b/ReadMe.md
> index 9de6493..5bcdd1d 100644
> --- a/ReadMe.md
> +++ b/ReadMe.md
> @@ -32,7 +32,7 @@ edk2-non-osi repository
> ``git clone https://github.com/tianocore/edk2-non-osi.git -b
> devel-MinPlatform``
>
> FSP repository
> - ``git clone https://github.com/IntelFsp/FSP.git -b KabylakeFsp0001``
> + ``git clone https://github.com/IntelFsp/FSP.git -b Kabylake``
>
> ### Build
>
> --
> 2.10.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH edk2-platforms\devel-MinPlatform] PurleyOpenBoardPkg: Remove unnecessary Link16 and IASL override
2018-07-06 7:45 [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg: Enable PatchFv tool supports PCD value format in build report Liming Gao
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: Update batch file to call python.exe Liming Gao
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: update ReadMe.md to correct branch name Liming Gao
@ 2018-07-06 7:45 ` Liming Gao
2018-07-06 14:56 ` Yao, Jiewen
2018-07-06 14:57 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg: Enable PatchFv tool supports PCD value format in build report Yao, Jiewen
3 siblings, 1 reply; 8+ messages in thread
From: Liming Gao @ 2018-07-06 7:45 UTC (permalink / raw)
To: edk2-devel; +Cc: Jiewen Yao
Link16 is not used any longer. Remove the checker for it.
IASL path is not required to be override.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
---
.../BoardMtOlympus/PlatformPkgBuildOption.dsc | 2 +-
.../Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat | 12 +-----------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc
index 151cbdc..3b55e78 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOption.dsc
@@ -76,7 +76,7 @@
#
# Override the existing iasl path in tools_def.template
#
- MSFT:*_*_*_ASL_PATH == c:/Iasl/iasl.exe
+# MSFT:*_*_*_ASL_PATH == c:/Iasl/iasl.exe
#
# Override the VFR compile flags to speed the build time
diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
index 7c444fb..ceb2bbb 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
@@ -105,18 +105,8 @@ set TOOL_CHAIN_TAG=
)
)
-echo ..WinDDK
-set CHECK_PATH_WINDDK=C:\WINDDK\3790.1830
-if not exist %CHECK_PATH_WINDDK%\bin\bin16\link16.exe (
- echo.
- echo !!! ERROR !!! Could not find 16-bit linker at %CHECK_PATH_WINDDK%\bin\bin16\link16.exe. !!!
- echo.
- set SCRIPT_ERROR=1
-)
-set CHECK_PATH_WINDDK=
-
echo ..iASL
-set CHECK_PATH_IASL=c:\Iasl
+set CHECK_PATH_IASL=%IASL_PREFIX%
if not exist %CHECK_PATH_IASL%\iasl.exe (
echo.
echo !!! ERROR !!! Could not find iASL compiler at %CHECK_PATH_IASL%\iasl.exe. !!!
--
2.10.0.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH edk2-platforms\devel-MinPlatform] PurleyOpenBoardPkg: Remove unnecessary Link16 and IASL override
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] PurleyOpenBoardPkg: Remove unnecessary Link16 and IASL override Liming Gao
@ 2018-07-06 14:56 ` Yao, Jiewen
0 siblings, 0 replies; 8+ messages in thread
From: Yao, Jiewen @ 2018-07-06 14:56 UTC (permalink / raw)
To: Gao, Liming, edk2-devel@lists.01.org
Reviewed-by: Jiewen.yao@intel.com
> -----Original Message-----
> From: Gao, Liming
> Sent: Thursday, July 5, 2018 11:46 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH edk2-platforms\devel-MinPlatform] PurleyOpenBoardPkg:
> Remove unnecessary Link16 and IASL override
>
> Link16 is not used any longer. Remove the checker for it.
> IASL path is not required to be override.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> ---
> .../BoardMtOlympus/PlatformPkgBuildOption.dsc | 2 +-
> .../Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat | 12
> +-----------
> 2 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git
> a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOpti
> on.dsc
> b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOpti
> on.dsc
> index 151cbdc..3b55e78 100644
> ---
> a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOpti
> on.dsc
> +++
> b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkgBuildOpti
> on.dsc
> @@ -76,7 +76,7 @@
> #
> # Override the existing iasl path in tools_def.template
> #
> - MSFT:*_*_*_ASL_PATH == c:/Iasl/iasl.exe
> +# MSFT:*_*_*_ASL_PATH == c:/Iasl/iasl.exe
>
> #
> # Override the VFR compile flags to speed the build time
> diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
> b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
> index 7c444fb..ceb2bbb 100644
> --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
> +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat
> @@ -105,18 +105,8 @@ set TOOL_CHAIN_TAG=
> )
> )
>
> -echo ..WinDDK
> -set CHECK_PATH_WINDDK=C:\WINDDK\3790.1830
> -if not exist %CHECK_PATH_WINDDK%\bin\bin16\link16.exe (
> - echo.
> - echo !!! ERROR !!! Could not find 16-bit linker
> at %CHECK_PATH_WINDDK%\bin\bin16\link16.exe. !!!
> - echo.
> - set SCRIPT_ERROR=1
> -)
> -set CHECK_PATH_WINDDK=
> -
> echo ..iASL
> -set CHECK_PATH_IASL=c:\Iasl
> +set CHECK_PATH_IASL=%IASL_PREFIX%
> if not exist %CHECK_PATH_IASL%\iasl.exe (
> echo.
> echo !!! ERROR !!! Could not find iASL compiler
> at %CHECK_PATH_IASL%\iasl.exe. !!!
> --
> 2.10.0.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg: Enable PatchFv tool supports PCD value format in build report
2018-07-06 7:45 [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg: Enable PatchFv tool supports PCD value format in build report Liming Gao
` (2 preceding siblings ...)
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] PurleyOpenBoardPkg: Remove unnecessary Link16 and IASL override Liming Gao
@ 2018-07-06 14:57 ` Yao, Jiewen
3 siblings, 0 replies; 8+ messages in thread
From: Yao, Jiewen @ 2018-07-06 14:57 UTC (permalink / raw)
To: Gao, Liming, edk2-devel@lists.01.org
Reviewed-by: Jiewen.yao@intel.com
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Liming
> Gao
> Sent: Thursday, July 5, 2018 11:46 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [edk2] [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg:
> Enable PatchFv tool supports PCD value format in build report
>
> PCD value in build report shows HEX and DEC both. PatchFv tool only requires
> one value.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> ---
> Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py | 2 +-
> Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py | 2 +-
> Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py | 2 +-
> Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> index 73c18c5..bb9d280 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> @@ -101,7 +101,7 @@ class FileChecker:
> if (cmp (splitLine[0], "FIXED") == 0) or (cmp
> (splitLine[0], "PATCH") == 0):
> SplitLine = splitLine[1].strip()[1:].split(")", 1)
> Type = SplitLine[0]
> - Value = SplitLine[1].strip()[1:].strip()
> + Value = SplitLine[1].strip()[1:].strip().split()[0]
> print " Type - (" + Type + "), Value - (" + Value
> + ")"
> return [Value, Type]
> return ["", ""]
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> index f5cb427..e1facd1 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> @@ -209,7 +209,7 @@ class FileChecker:
> if (cmp (splitLine[0], "FIXED") == 0) or (cmp
> (splitLine[0], "PATCH") == 0):
> SplitLine = splitLine[1].strip()[1:].split(")", 1)
> Type = SplitLine[0]
> - Value = SplitLine[1].strip()[1:].strip()
> + Value = SplitLine[1].strip()[1:].strip().split()[0]
> print " Type - (" + Type + "), Value - (" + Value
> + ")"
> return [Value, Type]
> return ["", ""]
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> index 5463a93..4d194b3 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> @@ -643,7 +643,7 @@ class FileChecker:
> if (cmp (splitLine[0], "FIXED") == 0) or (cmp
> (splitLine[0], "PATCH") == 0):
> SplitLine = splitLine[1].strip()[1:].split(")", 1)
> Type = SplitLine[0]
> - Value = SplitLine[1].strip()[1:].strip()
> + Value = SplitLine[1].strip()[1:].strip().split()[0]
> print " Type - (" + Type + "), Value - (" + Value
> + ")"
> return [Value, Type]
> return ["", ""]
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> index 57b6724..19c6e04 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> @@ -423,7 +423,7 @@ class FileChecker:
> if (cmp (splitLine[0], "FIXED") == 0) or (cmp
> (splitLine[0], "PATCH") == 0):
> SplitLine = splitLine[1].strip()[1:].split(")", 1)
> Type = SplitLine[0]
> - Value = SplitLine[1].strip()[1:].strip()
> + Value = SplitLine[1].strip()[1:].strip().split()[0]
> print " Type - (" + Type + "), Value - (" + Value
> + ")"
> return [Value, Type]
> return ["", ""]
> --
> 2.10.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-07-06 14:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-06 7:45 [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg: Enable PatchFv tool supports PCD value format in build report Liming Gao
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: Update batch file to call python.exe Liming Gao
2018-07-06 14:57 ` Yao, Jiewen
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatform: update ReadMe.md to correct branch name Liming Gao
2018-07-06 14:56 ` Yao, Jiewen
2018-07-06 7:45 ` [PATCH edk2-platforms\devel-MinPlatform] PurleyOpenBoardPkg: Remove unnecessary Link16 and IASL override Liming Gao
2018-07-06 14:56 ` Yao, Jiewen
2018-07-06 14:57 ` [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg: Enable PatchFv tool supports PCD value format in build report Yao, Jiewen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox