Change board name on Minnowboard 3 and Minnowboard 3 Module.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a.lu@intel.com>
---
 BuildBIOS.bat                                                       | 2 +-
 BuildBIOS.sh                                                        | 2 +-
 .../Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c                  | 6 +++---
 .../Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c              | 4 ++--
 Platform/BroxtonPlatformPkg/BuildBxtBios.bat                        | 2 +-
 Platform/BroxtonPlatformPkg/BuildBxtBios.sh                         | 4 ++--
 .../BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat    | 2 ++
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/BuildBIOS.bat b/BuildBIOS.bat
index 2cec70f..051c0a9 100644
--- a/BuildBIOS.bat
+++ b/BuildBIOS.bat
@@ -57,7 +57,7 @@ echo        /IA32  Set Arch to IA32 (default: X64)
 echo        /A     Set FabId to A (default:  FAB_B)
 echo        /B     Set FabId to B (default:  FAB_B)
 echo        /MN    MinnowBoard 3(default: MN)
-echo        /MX    MinnowBoard 3 Next
+echo        /MX    MinnowBoard 3 Module
 echo        /BG    Benson Glacier Board
 echo        PlatformName:  Broxton
 echo        BuildTargets:  Release, Debug
diff --git a/BuildBIOS.sh b/BuildBIOS.sh
index d679d2e..b8d21d7 100755
--- a/BuildBIOS.sh
+++ b/BuildBIOS.sh
@@ -20,7 +20,7 @@ function Usage () {
   echo
   echo "       Build_Flags:                 /MN    MinnowBoard3 (default: MN)"
   echo "       Build_Flags:                 /BG    Benson Glacier Board"
-  echo "       Build_Flags:                 /MX    MinnowBoard3 Next"
+  echo "       Build_Flags:                 /MX    MinnowBoard3 Module"
   echo "       Build_Flags:                 /A     Set FabId to A (default:  FAB_B)"
   echo "       Build_Flags:                 /B     Set FabId to B (default:  FAB_B)"
   echo "       PlatformName [optional]:     Broxton  "                   
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
index 94c94a6..66962a8 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
@@ -2,7 +2,7 @@
   Board specific functions in DXE phase to be set as dynamic PCD and consumed by
   commmon platform code.
 
-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -26,9 +26,9 @@ Mb3GetBoardName (
 {
   STATIC CHAR16  BoardName[40];
 
-  DEBUG ((EFI_D_INFO,  "BoardInitDxe: GetBoardName - MinnowBoard V3\n"));
+  DEBUG ((EFI_D_INFO,  "BoardInitDxe: GetBoardName - MinnowBoard 3\n"));
 
-  UnicodeSPrint (BoardName, sizeof (BoardName), L"MinnowBoard V3 ");
+  UnicodeSPrint (BoardName, sizeof (BoardName), L"MinnowBoard 3 ");
 
   if (BoardId != (UINT8) BOARD_ID_MINNOW) {
     return NULL;
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c
index a1c2c39..71deb43 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c
@@ -26,9 +26,9 @@ Mb3NGetBoardName (
 {
   STATIC CHAR16  BoardName[40];
 
-  DEBUG ((EFI_D_INFO,  "BoardInitDxe: GetBoardName - Minnow Board v3 Next\n"));
+  DEBUG ((EFI_D_INFO,  "BoardInitDxe: GetBoardName - MinnowBoard 3 Module\n"));
 
-  UnicodeSPrint (BoardName, sizeof (BoardName), L"Minnow Board v3 Next (0x%02X)", BoardId);
+  UnicodeSPrint (BoardName, sizeof (BoardName), L"MinnowBoard 3 Module ");
 
   if (BoardId != (UINT8) BOARD_ID_MINNOW_NEXT) {
     return NULL;
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
index ede285e..994bb3a 100644
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
@@ -208,7 +208,7 @@ if /i "%~1" == "%Minnow_RVP%" (
   ) else if %BoardId%==BG (
     set BOARD_ID=BENSONV
   ) else if %BoardId%==MX (
-    set BOARD_ID=MINNEXT
+    set BOARD_ID=M3MODUL
   )
     set ENBDT_PF_BUILD=TRUE
     set PLATFORM_NAME=BroxtonPlatformPkg
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
index cf02ceb..ef261e6 100755
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
@@ -136,8 +136,8 @@ if [ $BoardId == "MN" ]; then
   BOARD_ID=MNW3
   echo BOARD_ID = MINNOW3 >> $WORKSPACE/Conf/BiosId.env
 elif [ $BoardId == "MX" ]; then
-  BOARD_ID=MNXT
-  echo BOARD_ID = MINNEXT >> $WORKSPACE/Conf/BiosId.env
+  BOARD_ID=M3MO
+  echo BOARD_ID = M3MODUL >> $WORKSPACE/Conf/BiosId.env
 else
   BOARD_ID=BEN1
   echo BOARD_ID = BENSONV >> $WORKSPACE/Conf/BiosId.env
diff --git a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
index 134807e..01e56c5 100644
--- a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
+++ b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
@@ -110,6 +110,8 @@ if /i "!Platform_Type!"=="MINN" (
     set Platform_Type=MINN
 ) else if /i "!Platform_Type!"=="BENS" (
     set Platform_Type=BENS
+) else if /i "!Platform_Type!"=="M3MO" (
+    set Platform_Type=M3MO
 ) else (
     echo Error - Unsupported PlatformType: !Platform_Type!
     goto Usage
-- 
2.7.0.windows.1


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