• Subject: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Change BIOS ID.
  • Author: lushifex
  • Date: June 16, 2017, 9:13 a.m.
  • Patches: 1 / 1
Changeset
Platform/BroxtonPlatformPkg/BuildBios.bat | 10 ++++++++--
Platform/BroxtonPlatformPkg/BuildBios.sh  |  8 ++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
Git apply log
Switched to a new branch '9f35fb65-9536-4cfd-b5ad-1ccd933b01a6@SHWDEOPENPSI011.local'
Applying: Change BIOS ID.
fatal: sha1 information is lacking or useless (Platform/BroxtonPlatformPkg/BuildBios.bat).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Change BIOS ID.
The copy of the patch that failed is found in:
   /var/tmp/tmp85vytnw4/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Failed to apply patch:
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Change BIOS ID.
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Change BIOS ID.
Posted by lushifex, 4 weeks ago
Change BIOS ID to differentiate FAB A and FAB B Board.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a.lu@intel.com>
---
 Platform/BroxtonPlatformPkg/BuildBios.bat | 10 ++++++++--
 Platform/BroxtonPlatformPkg/BuildBios.sh  |  8 ++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat b/Platform/BroxtonPlatformPkg/BuildBios.bat
index b59e8eb..f656876 100644
--- a/Platform/BroxtonPlatformPkg/BuildBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBios.bat
@@ -216,9 +216,9 @@ if "%Arch%"=="IA32" (
 ::Stage of copy of BiosId.env in Conf/ with Platform_Type and Build_Target values removed
 
 if "%Arch%"=="X64" (
-    findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env
+    findstr /b /v "BOARD_ID BUILD_TYPE VERSION_MINOR" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env
 ) else if "%Arch%"=="IA32" (
-    findstr /b /v "BOARD_ID BUILD_TYPE BOARD_EXT" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env
+    findstr /b /v "BOARD_ID BUILD_TYPE VERSION_MINOR BOARD_EXT" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env
     echo BOARD_EXT = I32 >> Conf\BiosId.env
 )
 
@@ -230,6 +230,12 @@ if /i "%~2" == "RELEASE" (
     echo BUILD_TYPE = D >> Conf\BiosId.env
 )
 
+if %FabId%==B (
+    echo VERSION_MINOR = 0B >> Conf\BiosId.env
+) else (
+    echo VERSION_MINOR = 0A >> Conf\BiosId.env
+)
+
 :: Set the Build_Type, Version_Major, and Version_Minor environment variables
 find /v "#" Conf\BiosId.env > ver_strings
 for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j
diff --git a/Platform/BroxtonPlatformPkg/BuildBios.sh b/Platform/BroxtonPlatformPkg/BuildBios.sh
index 533993a..2195af6 100644
--- a/Platform/BroxtonPlatformPkg/BuildBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBios.sh
@@ -159,6 +159,7 @@ fi
 cp $WORKSPACE/$PLATFORM_PACKAGE/BiosId.env       $WORKSPACE/Conf/BiosId.env
 sed -i '/^BOARD_ID/d' $WORKSPACE/Conf/BiosId.env
 sed -i '/^BUILD_TYPE/d' $WORKSPACE/Conf/BiosId.env
+sed -i '/^VERSION_MINOR/d' $WORKSPACE/Conf/BiosId.env
 
 
 BOARD_ID=MNW3
@@ -203,6 +204,13 @@ else
   echo BUILD_TYPE = D >> $WORKSPACE/Conf/BiosId.env
 fi
 
+if [ $FabId == "B" ]; then
+  VERSION_MINOR=0B
+  echo VERSION_MINOR = 0B >> $WORKSPACE/Conf/BiosId.env
+else
+  VERSION_MINOR=0A
+  echo VERSION_MINOR = 0A >> $WORKSPACE/Conf/BiosId.env
+fi
 
 ##**********************************************************************
 ## Additional EDK Build Setup/Configuration
-- 
2.7.0.windows.1


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