• Subject: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build script.
  • Author: lushifex
  • Date: June 16, 2017, 2:48 a.m.
  • Patches: 1 / 1
Changeset
Platform/BroxtonPlatformPkg/BiosId.env    | 1 -
Platform/BroxtonPlatformPkg/BuildBios.bat | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
Git apply log
Switched to a new branch 'cd05c3c6-a27f-4cb8-92ce-eb51ca3c3f77@SHWDEOPENPSI011.local'
Applying: Build script.
fatal: sha1 information is lacking or useless (Platform/BroxtonPlatformPkg/BiosId.env).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Build script.
The copy of the patch that failed is found in:
   /var/tmp/tmpzrmboqzn/.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] Build script.
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build script.
Posted by lushifex, 5 weeks ago
Change build script.

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

diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env
index 18b4e01..1e28313 100644
--- a/Platform/BroxtonPlatformPkg/BiosId.env
+++ b/Platform/BroxtonPlatformPkg/BiosId.env
@@ -29,7 +29,6 @@
 
 BOARD_ID      = APLKRVP
 BOARD_REV     = 3
-OEM_ID     = X64
 BUILD_TYPE    = D
 VERSION_MAJOR = 0064
 VERSION_MINOR = 01
diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat b/Platform/BroxtonPlatformPkg/BuildBios.bat
index 5e06a98..b59e8eb 100644
--- a/Platform/BroxtonPlatformPkg/BuildBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBios.bat
@@ -218,8 +218,8 @@ if "%Arch%"=="IA32" (
 if "%Arch%"=="X64" (
     findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env
 ) else if "%Arch%"=="IA32" (
-    findstr /b /v "BOARD_ID BUILD_TYPE OEM_ID" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env
-    echo OEM_ID = I32 >> Conf\BiosId.env
+    findstr /b /v "BOARD_ID BUILD_TYPE BOARD_EXT" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env
+    echo BOARD_EXT = I32 >> Conf\BiosId.env
 )
 
 if /i "%~2" == "RELEASE" (
-- 
2.7.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-MinnowBoard3-UDK2017] Build script.
Posted by Wei, David, 5 weeks ago
Reviewed-by: zwei4 <david.wei@intel.com> 

Thanks,
David  Wei                                 

-----Original Message-----
From: Lu, ShifeiX A 
Sent: Friday, June 16, 2017 10:49 AM
To: Wei, David <david.wei@intel.com>
Cc: edk2-devel@lists.01.org
Subject: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build script.

Change build script.

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

diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env
index 18b4e01..1e28313 100644
--- a/Platform/BroxtonPlatformPkg/BiosId.env
+++ b/Platform/BroxtonPlatformPkg/BiosId.env
@@ -29,7 +29,6 @@
 
 BOARD_ID      = APLKRVP
 BOARD_REV     = 3
-OEM_ID     = X64
 BUILD_TYPE    = D
 VERSION_MAJOR = 0064
 VERSION_MINOR = 01
diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat b/Platform/BroxtonPlatformPkg/BuildBios.bat
index 5e06a98..b59e8eb 100644
--- a/Platform/BroxtonPlatformPkg/BuildBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBios.bat
@@ -218,8 +218,8 @@ if "%Arch%"=="IA32" (
 if "%Arch%"=="X64" (
     findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env
 ) else if "%Arch%"=="IA32" (
-    findstr /b /v "BOARD_ID BUILD_TYPE OEM_ID" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env
-    echo OEM_ID = I32 >> Conf\BiosId.env
+    findstr /b /v "BOARD_ID BUILD_TYPE BOARD_EXT" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env
+    echo BOARD_EXT = I32 >> Conf\BiosId.env
 )
 
 if /i "%~2" == "RELEASE" (
-- 
2.7.0.windows.1


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