Signed-off-by: Laurie0131 <laurie.jarlstrom@intel.com>

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laurie0131 <laurie.jarlstrom@intel.com>

FW/PlatformBuildLab/Max/Max_Version_1.00.txt

@@ -12,7 +12,7 @@
 3) Checkout MinnowBoard Max Branch from GitHub with the following command.
     i)  Run "git clone https://github.com/tianocore/edk2-platforms.git -b devel-MinnowBoardMax-UDK2017"
    ii)  Enter folder edk2-platforms
-  iii)  Run the command "git checkout 423105b15de6dfd769eed56026fa3bc28eb349ef"
+  iii)  Run the command "git checkout 2a5f80b862e46de213a3f3635c43394deacdfb05"
    iv)  Enter folder "C:\MyWorkspace"
 
 4) Checkout BaseTools binaries and copy them to BaseTools binary folder.
@@ -20,8 +20,8 @@
    ii)  Enter folder edk2-BaseTools-win32
   iii)  Run the command "git checkout 0e088c19ab31fccd1d2f55d9e4fe0314b57c0097"
 
-5) Download MinnowBoard MAX 0.99 Binary Object Modules from http://firmware.intel.com/projects/minnowboard-max.
-   The "MinnowBoard_MAX-0.99-Binary.Objects.zip" file contains three additional
+5) Download MinnowBoard MAX 1.00 Binary Object Modules from http://firmware.intel.com/projects/minnowboard-max.
+   The "MinnowBoard_MAX-1.00-Binary.Objects.zip" file contains three additional
    folders required for the full source tree.
 
     IA32FamilyCpuPkg

FW/PlatformBuildLab/Max/edk2-platforms/Maintainers.txt

@@ -2,9 +2,9 @@ MINNOWBOARD MAX/TURBOT PLATFORM Maintainers
 ==================
 
 Vlv2DeviceRefCodePkg
-  David Wei <david.wei@intel.com>
-  Mang Guo <mang.guo@intel.com>
+M: Zailiang Sun <zailiang.sun@intel.com>
+M: Yi Qian <yi.qian@intel.com>
 
 Vlv2TbltDevicePkg
-  David Wei <david.wei@intel.com>
-  Mang Guo <mang.guo@intel.com>
+M: Zailiang Sun <zailiang.sun@intel.com>
+M: Yi Qian <yi.qian@intel.com>

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/BiosId.env

@@ -24,6 +24,6 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            
 
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    
-
+
 #                                                                                  
 

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/BiosIdD.env

@@ -35,5 +35,5 @@ OEM_ID        = I32
 
 #                                                                                  
 
-
+
 #

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/BiosIdR.env

@@ -35,5 +35,5 @@ OEM_ID        = I32
 
 #                                                                                  
 
-
+
 #

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/BiosIdx64D.env

@@ -25,6 +25,6 @@ BOARD_REV     = 1
 
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    
 
-#                                                                                  
+#                                                                                  
 
 #

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/BiosIdx64R.env

@@ -25,6 +25,6 @@ BOARD_REV     = 1
 
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    
 
-#                                                                                  
+#                                                                                  
 
 #

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc

@@ -103,4 +103,4 @@ DEFINE ESRT_ENABLE       = TRUE
 
 DEFINE HTTP_BOOT_SUPPORT = FALSE
 DEFINE NETWORK_TLS_ENABLE = FALSE
-
+DEFINE BUILD_NEW_SHELL = FALSE

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc

@@ -1844,3 +1844,35 @@ MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
     <PcdsPatchableInModule>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x00000043
   }
+  
+!if $(BUILD_NEW_SHELL) == TRUE
+  ShellPkg/Application/Shell/Shell.inf {
+    <LibraryClasses>
+      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+!if $(NETWORK_IP6_ENABLE) == TRUE
+      NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
+!endif
+      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
+      HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+      PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
+#      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
+#      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
+      BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
+
+    <PcdsFixedAtBuild>
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+      gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
+  }
+!endif
+
+#### ADD new Modules here

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/PlatformPkgX64.dsc

@@ -1879,4 +1879,34 @@ MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
     <PcdsPatchableInModule>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x00000043
   }
+!if $(BUILD_NEW_SHELL) == TRUE
+  ShellPkg/Application/Shell/Shell.inf {
+    <LibraryClasses>
+      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+!if $(NETWORK_IP6_ENABLE) == TRUE
+      NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
+!endif
+      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
+      HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+      PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
+#      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
+#      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
+      BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
 
+    <PcdsFixedAtBuild>
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+      gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
+  }
+!endif
+
+#### ADD new Modules here

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c

@@ -164,7 +164,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
   }
 
   if (BOARD_ID_MINNOW2_TURBOT == mPlatformInfo->BoardId) {
-    UnicodeSPrint (Buffer, sizeof (Buffer),L"ADI");
+    UnicodeSPrint (Buffer, sizeof (Buffer),L"Silicom");
     HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_BASE_BOARD_MANUFACTURER), Buffer, NULL);
   }
   TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_MANUFACTURER);

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscChassisManufacturerFunction.c

@@ -70,7 +70,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscChassisManufacturer)
   CHAR16                          Buffer[40];
 
   ForType3InputData = (EFI_MISC_CHASSIS_MANUFACTURER *)RecordData;
-
+
   //
   // First check for invalid parameters.
   //

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c

@@ -294,11 +294,11 @@ if (Event != NULL) {
       DEBUG ((EFI_D_ERROR, "C0 Stepping Detected\n"));
       break;
    case PchD0:
-      UnicodeSPrint (Buffer, sizeof (Buffer),L"%s%s", PlatformNameBuffer, L"D0 PLATFORM");
+      UnicodeSPrint (Buffer, sizeof (Buffer),L"%s%s", PlatformNameBuffer, L"D0/D1 PLATFORM");
       HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_SYSTEM_PRODUCT_NAME), Buffer, NULL);
-      UnicodeSPrint (Buffer, sizeof (Buffer),L"%s",L"D0");
+      UnicodeSPrint (Buffer, sizeof (Buffer),L"%s",L"D0/D1");
       HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_SYSTEM_VERSION), Buffer, NULL);
-      DEBUG ((EFI_D_ERROR, "D0 Stepping Detected\n"));
+      DEBUG ((EFI_D_ERROR, "D0/D1 Stepping Detected\n"));
       break;
     default:
     DEBUG ((EFI_D_ERROR, "Unknow Stepping Detected\n"));
@@ -306,7 +306,7 @@ if (Event != NULL) {
   }
 
   if (BOARD_ID_MINNOW2_TURBOT == mPlatformInfo->BoardId) {
-    UnicodeSPrint (Buffer, sizeof (Buffer),L"ADI");
+    UnicodeSPrint (Buffer, sizeof (Buffer),L"Silicom");
     HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_SYSTEM_MANUFACTURER), Buffer, NULL);
   }
   TokenToGet = STRING_TOKEN (STR_MISC_SYSTEM_MANUFACTURER);

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/bld_vlv.bat

@@ -165,10 +165,10 @@ if defined VS90COMNTOOLS (
    if /I "%VS90COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\" (
 
       set TOOL_CHAIN_TAG=VS2008
-   ) else (
+  ) else (
       set TOOL_CHAIN_TAG=VS2008x86
-   )
- ) else (
+  ) 
+  ) else (
 echo Not VS 2009
 )
 if defined VS100COMNTOOLS (
@@ -188,14 +188,14 @@ if defined VS110COMNTOOLS (
   ) else (
     set TOOL_CHAIN_TAG=VS2012x86
   )
-) else (
+  ) else (
 echo Not VS 2012
-) 
+  )
 if defined VS120COMNTOOLS (
   if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat"
   if /I "%VS120COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 12.0\Common7\Tools\" (
     set TOOL_CHAIN_TAG=VS2013
-  ) else (
+   ) else (
     set TOOL_CHAIN_TAG=VS2013x86
   )
 ) else (
@@ -207,8 +207,8 @@ if defined VS140COMNTOOLS (
     set TOOL_CHAIN_TAG=VS2015
   ) else (
     set TOOL_CHAIN_TAG=VS2015x86
-  )
-) else (
+   )
+) else (
 echo Not VS 2015
 )
 
@@ -218,8 +218,8 @@ if "%TOOL_CHAIN_TAG%" == "" (
   echo           VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS not defined ^^!
   echo.
   goto :BldFail
-)
-
+)
+
 
 echo Ensuring correct build directory is present for GenBiosId...
 set BUILD_PATH=Build\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_TAG%

FW/PlatformBuildLab/Max/edk2-platforms/Vlv2TbltDevicePkg/bld_vlv.sh

@@ -250,7 +250,7 @@ $PLATFORM_PACKAGE/GenBiosId -i $CORE_PATH/Conf/BiosId.env -o $WORKSPACE/$BUILD_P
  echo Current directory is $(pwd)
  echo . . . 
  echo  
- echo "Invoking EDK2 build..."
+echo "Invoking EDK2 build..."
  echo "build " $JLog  -D $SDB -D $LG $QF 
  echo "Press ENTER to continue OR Control-C to abort"
  read