* [Patch][edk2-platforms/devel-IntelAtomProcessorE3900] Add /C build option
@ 2018-08-21 8:00 Guo, Mang
0 siblings, 0 replies; 2+ messages in thread
From: Guo, Mang @ 2018-08-21 8:00 UTC (permalink / raw)
To: edk2-devel@lists.01.org; +Cc: Wei, David
Add /C build option for Module FAB C board
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Guo Mang <mang.guo@intel.com>
---
BuildBIOS.bat | 1 +
Platform/BroxtonPlatformPkg/BuildBxtBios.bat | 26 +++++++---------------
Platform/BroxtonPlatformPkg/BuildIFWI.bat | 12 +++++-----
.../Common/Tools/Stitch/IFWIStitch_Simple.bat | 7 ++++++
4 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/BuildBIOS.bat b/BuildBIOS.bat
index 22c8792..d8275ac 100644
--- a/BuildBIOS.bat
+++ b/BuildBIOS.bat
@@ -57,6 +57,7 @@ echo /x64 Set Arch to X64 (default: X64)
echo /IA32 Set Arch to IA32 (default: X64)
echo /A Set FabId to A
echo /B Set FabId to B (default: FAB_B)
+echo /C Set FabId to C
echo /D Set FabId to D
echo /MN MinnowBoard 3(default: MN)
echo /MX MinnowBoard 3 Module
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
index c3dd9f8..9858cea 100644
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
@@ -90,21 +90,6 @@ if /i "%~1"=="/l" (
shift
goto OptLoop
)
-if /i "%~1" == "/c" (
- echo Removing previous Build files...
- if exist build (
- del /f/s/q build > nul
- rmdir /s/q build
- )
- if exist Conf\.cache (
- del /f/s/q Conf\.cache > nul
- rmdir /s/q Conf\.cache
- )
- echo.
- shift
- goto OptLoop
-)
-
if /i "%~1"=="/ia32" (
set Arch=IA32
shift
@@ -164,6 +149,12 @@ if /i "%~1"=="/B" (
shift
goto OptLoop
)
+if /i "%~1"=="/C" (
+ set FabId=C
+ echo.
+ shift
+ goto OptLoop
+)
if /i "%~1"=="/D" (
set FabId=D
echo.
@@ -318,8 +309,8 @@ if %BoardId%==MN (
)
if %BoardId%==MX (
- if %FabId%==B (
- echo BOARD_REV = B >> Conf\BiosId.env
+ if %FabId%==C (
+ echo BOARD_REV = C >> Conf\BiosId.env
) else (
echo BOARD_REV = A >> Conf\BiosId.env
)
@@ -652,7 +643,6 @@ echo Usage: %0 [options] ^<PlatformType^> ^<BuildTarget^>
echo.
echo. /? Display this help text
echo /l Log a copy of the build output to EDK2.log
-echo /c CleanAll before building
echo /x64 Set Arch to X64 (default)
echo /ia32 Set Arch to IA32
echo /vs08 Set compiler to VisualStudio 2008
diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.bat b/Platform/BroxtonPlatformPkg/BuildIFWI.bat
index 396e8c4..3212693 100644
--- a/Platform/BroxtonPlatformPkg/BuildIFWI.bat
+++ b/Platform/BroxtonPlatformPkg/BuildIFWI.bat
@@ -31,12 +31,6 @@ if /i "%~1"=="" goto Usage
if /i "%~1"=="/?" goto Usage
::Build Flags
-if /i "%~1" == "/c" (
- set Build_Flags=%Build_Flags% /c
- shift
- set SkipUsageFlag=TRUE
- goto OptLoop
-)
if /i "%~1"=="/ia32" (
set Arch=IA32
set Build_Flags=%Build_Flags% /ia32
@@ -92,6 +86,12 @@ if /i "%~1"=="/B" (
shift
goto OptLoop
)
+if /i "%~1"=="/C" (
+ set FabId=C
+ set Build_Flags=%Build_Flags% /C
+ shift
+ goto OptLoop
+)
if /i "%~1"=="/D" (
set FabId=D
set Build_Flags=%Build_Flags% /D
diff --git a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
index c8d0973..b859cb1 100644
--- a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
+++ b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
@@ -175,10 +175,17 @@ if %BoardId%==BG (
copy /y /b SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin spi_out.bin
)
) else if %BoardId%==MX (
+ if %FabId%==A (
copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChunk1.bin .
copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChunk2.bin .
copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChunk3.bin .
copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_A\SpiChunk1SpiAccessControl.bin .
+ ) else (
+ copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_C\SpiChunk1.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_C\SpiChunk2.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_C\SpiChunk3.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3Module\IFWI\FAB_C\SpiChunk1SpiAccessControl.bin .
+ )
if %SpiAccessControl% EQU 0 (
copy /y /b SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin spi_out.bin
) else (
--
2.10.1.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Add /C build option.
@ 2018-08-23 6:13 Tu, Yunshan
0 siblings, 0 replies; 2+ messages in thread
From: Tu, Yunshan @ 2018-08-23 6:13 UTC (permalink / raw)
To: edk2-devel@lists.01.org
Add /C build option for Module FAB C board in the GCC environment.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunshan Tu <yunshan.tu@intel.com>
Reviewed-by: David Wei <david.wei@intel.com>
---
BuildBIOS.sh | 5 +++++
Platform/BroxtonPlatformPkg/BuildBxtBios.sh | 22 +++++++++++++--------
Platform/BroxtonPlatformPkg/BuildIFWI.sh | 5 +++++
3 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/BuildBIOS.sh b/BuildBIOS.sh
index 64eeac0687..e02a16f1bf 100644
--- a/BuildBIOS.sh
+++ b/BuildBIOS.sh
@@ -25,6 +25,7 @@ function Usage () {
echo " Build_Flags: /UP AAEON UP2 Board"
echo " Build_Flags: /A Set FabId to A "
echo " Build_Flags: /B Set FabId to B (default: FAB_B)"
+ echo " Build_Flags: /C Set FabId to C "
echo " Build_Flags: /D Set FabId to D "
echo " Build_Flags: /L Flash region access permission for host CPU"
echo " PlatformName [optional]: Broxton "
@@ -82,6 +83,10 @@ for (( i=1; i<=$#; ))
FabId=D
Build_Flags="$Build_Flags /D"
shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
+ FabId=C
+ Build_Flags="$Build_Flags /C"
+ shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then
FabId=B
Build_Flags="$Build_Flags /B"
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
index ac2c58abb1..c8060f8d25 100644
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
@@ -117,12 +117,18 @@ for (( i=1; i<=$#; ))
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/MX" ]; then
BoardId=MX
shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/UP" ]; then
+ BoardId=UP
+ shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/LH" ]; then
BoardId=LH
shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/D" ]; then
FabId=D
shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
+ FabId=C
+ shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then
FabId=B
shift
@@ -234,9 +240,9 @@ if [ $BoardId == "MN" ]; then
fi
if [ $BoardId == "MX" ]; then
- if [ $FabId == "B" ]; then
- BOARD_REV=B
- echo BOARD_REV = B >> $WORKSPACE/Conf/BiosId.env
+ if [ $FabId == "C" ]; then
+ BOARD_REV=C
+ echo BOARD_REV = C >> $WORKSPACE/Conf/BiosId.env
else
BOARD_REV=A
echo BOARD_REV = A >> $WORKSPACE/Conf/BiosId.env
@@ -409,11 +415,11 @@ if [ $BoardId == "MN" ]; then
fi
if [ $BoardId == "MX" ]; then
- if [ $FabId == "B" ]; then
- cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Module/IFWI/FAB_B/SpiChunk1.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Module/IFWI/FAB_B/SpiChunk2.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Module/IFWI/FAB_B/SpiChunk3.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Module/IFWI/FAB_B/SpiChunk1SpiAccessControl.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ if [ $FabId == "C" ]; then
+ cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Module/IFWI/FAB_C/SpiChunk1.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Module/IFWI/FAB_C/SpiChunk2.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Module/IFWI/FAB_C/SpiChunk3.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Module/IFWI/FAB_C/SpiChunk1SpiAccessControl.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
else
cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Module/IFWI/FAB_A/SpiChunk1.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
cp -f $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Module/IFWI/FAB_A/SpiChunk2.bin $PLATFORM_PATH/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.sh b/Platform/BroxtonPlatformPkg/BuildIFWI.sh
index 447cfb507c..4cc22850de 100644
--- a/Platform/BroxtonPlatformPkg/BuildIFWI.sh
+++ b/Platform/BroxtonPlatformPkg/BuildIFWI.sh
@@ -26,6 +26,7 @@ function Usage () {
echo " Build_Flags: /UP AAEON UP2 Board"
echo " Build_Flags: /A Set FabId to A"
echo " Build_Flags: /B Set FabId to B (default)"
+ echo " Build_Flags: /C Set FabId to C"
echo " Build_Flags: /D Set FabId to D"
echo " Build_Flags: /L Flash region access permission for host CPU"
echo " Platform_Type [optional]: Broxton "
@@ -87,6 +88,10 @@ for (( i=1; i<=$#; ))
FabId=D
Build_Flags="$Build_Flags /D"
shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
+ FabId=C
+ Build_Flags="$Build_Flags /C"
+ shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then
FabId=B
Build_Flags="$Build_Flags /B"
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-23 6:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-21 8:00 [Patch][edk2-platforms/devel-IntelAtomProcessorE3900] Add /C build option Guo, Mang
-- strict thread matches above, loose matches on Subject: below --
2018-08-23 6:13 [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] " Tu, Yunshan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox