[edk2-devel] [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules for X64

Michael D Kinney posted 28 patches 6 years, 7 months ago
[edk2-devel] [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules for X64
Posted by Michael D Kinney 6 years, 7 months ago
Only build capsules for X64 builds.  More changes are
required to build IA32 capsules.

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 6 +++++-
 Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
index c39b8ccd62..99c1068663 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -277,7 +277,11 @@ if %ERRORLEVEL% NEQ 0 goto BldFail
 ::echo FD successfully updated with default Hii values.
 
 @REM build capsule here
-call build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
+if "%Arch%"=="X64" (
+  echo Invoking EDK2 build for capsules...
+  echo build -t %TOOL_CHAIN_TAG% -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
+  call build -t %TOOL_CHAIN_TAG% -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
+)
 
 goto Exit
 
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index d32beb6a45..0d1ea60ac6 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -224,7 +224,11 @@ cp -f $BUILD_PATH/FV/VLV.fd $BUILD_PATH/FV/Vlv.ROM
 ##**********************************************************************
 ## Build Capsules
 ##**********************************************************************
-build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
+if [ $Arch == "X64" ]; then
+  echo "Invoking EDK2 build for capsules..."
+  echo build -t $TOOL_CHAIN_TAG -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
+  build -t $TOOL_CHAIN_TAG -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
+fi
 
 echo
 echo -------------------- The EDKII BIOS build has successfully completed. --------------------
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#43516): https://edk2.groups.io/g/devel/message/43516
Mute This Topic: https://groups.io/mt/32419749/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules for X64
Posted by Sun, Zailiang 6 years, 7 months ago
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>

> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules
> for X64
> 
> Only build capsules for X64 builds.  More changes are required to build IA32
> capsules.
> 
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 6 +++++-
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh  | 6 +++++-
>  2 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> index c39b8ccd62..99c1068663 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> @@ -277,7 +277,11 @@ if %ERRORLEVEL% NEQ 0 goto BldFail  ::echo FD
> successfully updated with default Hii values.
> 
>  @REM build capsule here
> -call build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
> +if "%Arch%"=="X64" (
> +  echo Invoking EDK2 build for capsules...
> +  echo build -t %TOOL_CHAIN_TAG% -p
> +%PLATFORM_PACKAGE%\PlatformCapsule.dsc
> +  call build -t %TOOL_CHAIN_TAG% -p
> +%PLATFORM_PACKAGE%\PlatformCapsule.dsc
> +)
> 
>  goto Exit
> 
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index d32beb6a45..0d1ea60ac6 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -224,7 +224,11 @@ cp -f $BUILD_PATH/FV/VLV.fd
> $BUILD_PATH/FV/Vlv.ROM
> 
> ##********************************************************
> **************
>  ## Build Capsules
> 
> ##********************************************************
> **************
> -build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
> +if [ $Arch == "X64" ]; then
> +  echo "Invoking EDK2 build for capsules..."
> +  echo build -t $TOOL_CHAIN_TAG -p
> +$PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
> +  build -t $TOOL_CHAIN_TAG -p
> $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
> +fi
> 
>  echo
>  echo -------------------- The EDKII BIOS build has successfully completed. ------
> --------------
> --
> 2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#43573): https://edk2.groups.io/g/devel/message/43573
Mute This Topic: https://groups.io/mt/32419749/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-