[edk2-devel] [edk2-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely

Michael D Kinney posted 28 patches 22 weeks ago

[edk2-devel] [edk2-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely

Posted by Michael D Kinney 22 weeks ago
From: Gary Lin <glin@suse.com>

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

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index 0aa1edfb22..bceea99b2d 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -53,10 +53,6 @@ if [ -e $CORE_PATH/Conf/target.txt ]; then
   rm $CORE_PATH/Conf/target.txt
 fi
 
-if [ -e $CORE_PATH/Conf/BiosId.env ]; then
-  rm $CORE_PATH/Conf/BiosId.env
-fi
-
 if [ -e $CORE_PATH/Conf/tools_def.txt ]; then
   rm $CORE_PATH/Conf/tools_def.txt
 fi
@@ -119,18 +115,11 @@ if [ "$2" == "" ]; then
   Usage
 fi
 
-## Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf
 if [ $Arch == "IA32" ]; then
-  cp $PLATFORM_PKG_PATH/BiosIdR.env Conf/BiosId.env
-  echo DEFINE X64_CONFIG = FALSE      >> $auto_config_inc
+  echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc
 else
-  cp $PLATFORM_PKG_PATH/BiosIdx64R.env Conf/BiosId.env
-  echo DEFINE X64_CONFIG = TRUE       >> $auto_config_inc
+  echo DEFINE X64_CONFIG = TRUE  >> $auto_config_inc
 fi
-sed -i '/^BOARD_ID/d' Conf/BiosId.env
-sed -i '/^BUILD_TYPE/d' Conf/BiosId.env
-
-
 
 ## -- Build flags settings for each Platform --
 ##    AlpineValley (ALPV):  SVP_PF_BUILD = TRUE,   ENBDT_PF_BUILD = FALSE,  TABLET_PF_BUILD = FALSE,  BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
@@ -141,26 +130,18 @@ sed -i '/^BUILD_TYPE/d' Conf/BiosId.env
 ##            FFD8 (BLAK):  SVP_PF_BUILD = FALSE,  ENBDT_PF_BUILD = FALSE,  TABLET_PF_BUILD = TRUE,   BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
 echo "Setting  $1  platform configuration and BIOS ID..."
 if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "MNW2" ]; then
-  echo BOARD_ID = MNW2MAX             >> Conf/BiosId.env
-  echo DEFINE ENBDT_PF_BUILD = TRUE  >> $auto_config_inc
+  echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc
 else
   echo "Error - Unsupported PlatformType: $1"
   Usage
 fi
 
-Platform_Type=$1
-
 if [ "$(echo $2 | tr 'a-z' 'A-Z')" == "RELEASE" ]; then
   export TARGET=RELEASE
-  BUILD_TYPE=R
-  echo BUILD_TYPE = R >> Conf/BiosId.env
 else
   export TARGET=DEBUG
-  BUILD_TYPE=D
-  echo BUILD_TYPE = D >> Conf/BiosId.env
 fi
 
-
 ##**********************************************************************
 ## Additional EDK Build Setup/Configuration
 ##**********************************************************************
-- 
2.21.0.windows.1


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

View/Reply Online (#43513): https://edk2.groups.io/g/devel/message/43513
Mute This Topic: https://groups.io/mt/32419746/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 08/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely

Posted by Sun, Zailiang 22 weeks 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: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: [edk2-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh:
> Remove BiosId.env completely
> 
> From: Gary Lin <glin@suse.com>
> 
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
>  Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 25 +++------------------
>  1 file changed, 3 insertions(+), 22 deletions(-)
> 
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index 0aa1edfb22..bceea99b2d 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -53,10 +53,6 @@ if [ -e $CORE_PATH/Conf/target.txt ]; then
>    rm $CORE_PATH/Conf/target.txt
>  fi
> 
> -if [ -e $CORE_PATH/Conf/BiosId.env ]; then
> -  rm $CORE_PATH/Conf/BiosId.env
> -fi
> -
>  if [ -e $CORE_PATH/Conf/tools_def.txt ]; then
>    rm $CORE_PATH/Conf/tools_def.txt
>  fi
> @@ -119,18 +115,11 @@ if [ "$2" == "" ]; then
>    Usage
>  fi
> 
> -## Remove the values for Platform_Type and Build_Target from BiosIdX.env
> and stage in Conf  if [ $Arch == "IA32" ]; then
> -  cp $PLATFORM_PKG_PATH/BiosIdR.env Conf/BiosId.env
> -  echo DEFINE X64_CONFIG = FALSE      >> $auto_config_inc
> +  echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc
>  else
> -  cp $PLATFORM_PKG_PATH/BiosIdx64R.env Conf/BiosId.env
> -  echo DEFINE X64_CONFIG = TRUE       >> $auto_config_inc
> +  echo DEFINE X64_CONFIG = TRUE  >> $auto_config_inc
>  fi
> -sed -i '/^BOARD_ID/d' Conf/BiosId.env
> -sed -i '/^BUILD_TYPE/d' Conf/BiosId.env
> -
> -
> 
>  ## -- Build flags settings for each Platform --
>  ##    AlpineValley (ALPV):  SVP_PF_BUILD = TRUE,   ENBDT_PF_BUILD =
> FALSE,  TABLET_PF_BUILD = FALSE,  BYTI_PF_BUILD = FALSE, IVI_PF_BUILD =
> FALSE
> @@ -141,26 +130,18 @@ sed -i '/^BUILD_TYPE/d' Conf/BiosId.env
>  ##            FFD8 (BLAK):  SVP_PF_BUILD = FALSE,  ENBDT_PF_BUILD = FALSE,
> TABLET_PF_BUILD = TRUE,   BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
>  echo "Setting  $1  platform configuration and BIOS ID..."
>  if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "MNW2" ]; then
> -  echo BOARD_ID = MNW2MAX             >> Conf/BiosId.env
> -  echo DEFINE ENBDT_PF_BUILD = TRUE  >> $auto_config_inc
> +  echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc
>  else
>    echo "Error - Unsupported PlatformType: $1"
>    Usage
>  fi
> 
> -Platform_Type=$1
> -
>  if [ "$(echo $2 | tr 'a-z' 'A-Z')" == "RELEASE" ]; then
>    export TARGET=RELEASE
> -  BUILD_TYPE=R
> -  echo BUILD_TYPE = R >> Conf/BiosId.env  else
>    export TARGET=DEBUG
> -  BUILD_TYPE=D
> -  echo BUILD_TYPE = D >> Conf/BiosId.env  fi
> 
> -
> 
> ##********************************************************
> **************
>  ## Additional EDK Build Setup/Configuration
> 
> ##********************************************************
> **************
> --
> 2.21.0.windows.1


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

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