[Patch][edk2-platforms/devel-IntelAtomProcessorE3900] Add /C build option

["Guo, Mang" <mang.guo@intel.com>]

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