[edk2] [PATCH edk2-platforms\devel-MinPlatform] PurleyOpenBoardPkg: Remove unnecessary Link16 and IASL override

Liming Gao posted 1 patch 5 years, 9 months ago
Failed in applying to current master (apply log)
.../BoardMtOlympus/PlatformPkgBuildOption.dsc                |  2 +-
.../Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat     | 12 +-----------
2 files changed, 2 insertions(+), 12 deletions(-)
[edk2] [PATCH edk2-platforms\devel-MinPlatform] PurleyOpenBoardPkg: Remove unnecessary Link16 and IASL override
Posted by Liming Gao 5 years, 9 months ago
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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH edk2-platforms\devel-MinPlatform] PurleyOpenBoardPkg: Remove unnecessary Link16 and IASL override
Posted by Yao, Jiewen 5 years, 9 months ago
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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel