[edk2] [Patch][edk2-platforms/devel-IntelAtomProcessorE3900 9Add MODULE_BOARD macro

Guo, Mang posted 1 patch 16 weeks ago
Failed in applying to current master (apply log)
gPlatformModuleTokenSpaceGuid.PcdSerialIoUartNumber|2

[edk2] [Patch][edk2-platforms/devel-IntelAtomProcessorE3900 9Add MODULE_BOARD macro

Posted by Guo, Mang 16 weeks ago
Cc: David Wei <david.wei@intel.com>
Cc: Mike Wu  <mike.wu@intel.com>

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Guo Mang <mang.guo@intel.com>
---
 Platform/BroxtonPlatformPkg/BuildBxtBios.bat       |  5 ++++-
 Platform/BroxtonPlatformPkg/BuildBxtBios.sh        | 23 ++++++++++++----------
 .../PlatformDsc/Components.IA32.dsc                | 12 +++++++----
 .../PlatformDsc/PcdsFixedAtBuild.dsc               |  2 +-
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
index 3e31d52..c3dd9f8 100644
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
@@ -62,6 +62,7 @@ set APLK_SETUP_ENABLE_BUILD=FALSE
 set FSP_BUILD=FALSE
 set FSP_WRAPPER=FALSE
 set UP2_BOARD=FALSE
+set MINNOW3_MODULE_BOARD=FALSE
 
 :: Set Defaults of platform specific environment variables.
 set EFI_SOURCE=%CD%
@@ -70,6 +71,7 @@ set PLATFORM_NAME=BxtPlatformPkg
 set PLATFORM_RC_PACKAGE=%SILICON_PATH%\BroxtonSiPkg
 set FSP_BIN_PKG_NAME=BroxtonFspBinPkg
 set STITCH_PATH=%WORKSPACE%\%PLATFORM_PATH%\Common\Tools\Stitch
+set ResetVectorPath=%WORKSPACE%\%PLATFORM_RC_PACKAGE%\Cpu\ResetVector
 
 PATH=%PATH%;%WORKSPACE%\%PLATFORM_PATH%\Common\Tools\GenBiosId;%WORKSPACE%\%PLATFORM_PATH%\Common\Tools\nasm\Win32
 PATH=%PATH%;%WORKSPACE%\%PLATFORM_PATH%\Common\Tools\FCE;%WORKSPACE%\%PLATFORM_PATH%\Common\Tools\nasm\Win32
@@ -234,6 +236,7 @@ if /i "%~1" == "%Minnow_RVP%" (
     set BOARD_ID=AURORAV
   ) else if %BoardId%==MX (
     set BOARD_ID=M3MODUL
+    set MINNOW3_MODULE_BOARD=TRUE
   ) else if %BoardId%==LH (
     set BOARD_ID=LEAFHIL
   ) else if %BoardId%==UP (
@@ -275,6 +278,7 @@ if "%Arch%"=="IA32" (
 )
 
 echo DEFINE UP2_BOARD                = %UP2_BOARD%               >> %Build_Macros%
+echo DEFINE MINNOW3_MODULE_BOARD     = %MINNOW3_MODULE_BOARD%    >> %Build_Macros%
 
 ::Stage of copy of BiosId.env in Conf/ with Platform_Type and Build_Target values removed
 
@@ -419,7 +423,6 @@ if ErrorLevel 1 goto BldFail
 
 echo Building ResetVector...
 
-set ResetVectorPath=%WORKSPACE%\%PLATFORM_RC_PACKAGE%\Cpu\ResetVector
 
 pushd %ResetVectorPath%\Vtf0
   nasm.exe %Nasm_Flags% -o Bin\ResetVector.ia32.port80.raw ResetVectorCode.asm
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
index 95665c7..c2b5f17 100755
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
@@ -45,6 +45,7 @@ RVVP_BIOS_ENABLE=FALSE
 RVV_BIOS_ENABLE=FALSE
 SrcDebug=FALSE
 UP2_BOARD=FALSE
+MINNOW3_MODULE_BOARD=FALSE
 
 ## Clean up previous build files.
 if [ -e $(pwd)/EDK2.log ]; then
@@ -156,6 +157,7 @@ if [ $BoardId == "MN" ]; then
 elif [ $BoardId == "MX" ]; then
   BOARD_ID=M3MO
   echo BOARD_ID = M3MODUL >> $WORKSPACE/Conf/BiosId.env
+  MINNOW3_MODULE_BOARD=TRUE
 elif [ $BoardId == "BG" ]; then
   BOARD_ID=BEN1
   echo BOARD_ID = BENSONV >> $WORKSPACE/Conf/BiosId.env
@@ -184,16 +186,17 @@ fi
 touch $Build_Macros
 
 ## Output platform specific build macros to DefineAtBuildMacros.dsc
-echo DEFINE ENBDT_PF_BUILD      = $ENBDT_PF_BUILD   >> $Build_Macros
-echo DEFINE TABLET_PF_BUILD     = $TABLET_PF_BUILD  >> $Build_Macros
-echo DEFINE BYTI_PF_BUILD       = $BYTI_PF_BUILD    >> $Build_Macros
-echo DEFINE CSLE_ENABLE         = $CSLE_ENABLE      >> $Build_Macros
-echo DEFINE VP_BIOS_ENABLE      = $VP_BIOS_ENABLE   >> $Build_Macros
-echo DEFINE SV_BIOS_ENABLE      = $SV_BIOS_ENABLE   >> $Build_Macros
-echo DEFINE PPV_BIOS_ENABLE     = $PPV_BIOS_ENABLE  >> $Build_Macros
-echo DEFINE RVVP_BIOS_ENABLE    = $RVVP_BIOS_ENABLE >> $Build_Macros
-echo DEFINE RVV_BIOS_ENABLE     = $RVV_BIOS_ENABLE  >> $Build_Macros
-echo DEFINE UP2_BOARD           = $UP2_BOARD        >> $Build_Macros
+echo DEFINE ENBDT_PF_BUILD       = $ENBDT_PF_BUILD           >> $Build_Macros
+echo DEFINE TABLET_PF_BUILD      = $TABLET_PF_BUILD          >> $Build_Macros
+echo DEFINE BYTI_PF_BUILD        = $BYTI_PF_BUILD            >> $Build_Macros
+echo DEFINE CSLE_ENABLE          = $CSLE_ENABLE              >> $Build_Macros
+echo DEFINE VP_BIOS_ENABLE       = $VP_BIOS_ENABLE           >> $Build_Macros
+echo DEFINE SV_BIOS_ENABLE       = $SV_BIOS_ENABLE           >> $Build_Macros
+echo DEFINE PPV_BIOS_ENABLE      = $PPV_BIOS_ENABLE          >> $Build_Macros
+echo DEFINE RVVP_BIOS_ENABLE     = $RVVP_BIOS_ENABLE         >> $Build_Macros
+echo DEFINE RVV_BIOS_ENABLE      = $RVV_BIOS_ENABLE          >> $Build_Macros
+echo DEFINE UP2_BOARD            = $UP2_BOARD                >> $Build_Macros
+echo DEFINE MINNOW3_MODULE_BOARD = $MINNOW3_MODULE_BOARD     >> $Build_Macros
 
 if [ $Arch == "IA32" ]; then
   echo DEFINE X64_CONFIG = FALSE      >> $Build_Macros
diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc
index abd89bf..dd65c37 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.IA32.dsc
@@ -80,12 +80,13 @@
     <LibraryClasses>
       !if $(UP2_BOARD) == TRUE
         NULL|$(PLATFORM_NAME)/Board/UP2/BoardInitPreMem/BoardInitPreMem.inf
-      !else 
+      !elseif $(MINNOW3_MODULE_BOARD) == TRUE
+        NULL|$(PLATFORM_NAME)/Board/MinnowBoard3Module/BoardInitPreMem/BoardInitPreMem.inf
+     !else
         NULL|$(PLATFORM_NAME)/Board/MinnowBoard3/BoardInitPreMem/BoardInitPreMem.inf
         NULL|$(PLATFORM_NAME)/Board/LeafHill/BoardInitPreMem/BoardInitPreMem.inf
         NULL|$(PLATFORM_NAME)/Board/BensonGlacier/BoardInitPreMem/BoardInitPreMem.inf
         NULL|$(PLATFORM_NAME)/Board/AuroraGlacier/BoardInitPreMem/BoardInitPreMem.inf
-        NULL|$(PLATFORM_NAME)/Board/MinnowBoard3Next/BoardInitPreMem/BoardInitPreMem.inf
       !endif
       BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
       CpuPolicyLib|$(PLATFORM_SI_PACKAGE)/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf
@@ -119,13 +120,16 @@
 
   $(PLATFORM_PACKAGE_COMMON)/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf {
      <LibraryClasses>
+     !if $(UP2_BOARD) == TRUE
        NULL|$(PLATFORM_NAME)/Board/UP2/BoardInitPostMem/BoardInitPostMem.inf
+     !elseif $(MINNOW3_MODULE_BOARD) == TRUE
+       NULL|$(PLATFORM_NAME)/Board/MinnowBoard3Module/BoardInitPostMem/BoardInitPostMem.inf
+     !else
        NULL|$(PLATFORM_NAME)/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf
        NULL|$(PLATFORM_NAME)/Board/LeafHill/BoardInitPostMem/BoardInitPostMem.inf
        NULL|$(PLATFORM_NAME)/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf
        NULL|$(PLATFORM_NAME)/Board/AuroraGlacier/BoardInitPostMem/BoardInitPostMem.inf
-       NULL|$(PLATFORM_NAME)/Board/MinnowBoard3Next/BoardInitPostMem/BoardInitPostMem.inf
-       I2cLibPei|$(PLATFORM_SI_PACKAGE)/SouthCluster/Library/I2CLibPei/I2CLibPei.inf
+     !endif
     <PcdsPatchableInModule>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6
   }
diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc
index 5a162d6..db9b2e6 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/PcdsFixedAtBuild.dsc
@@ -86,7 +86,7 @@
   
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x3000
   
-  !if $(UP2_BOARD) == TRUE || $(MODULE_BOARD) == TRUE
+  !if $(UP2_BOARD) == TRUE || $(MINNOW3_MODULE_BOARD) == TRUE
     gPlatformModuleTokenSpaceGuid.PcdSerialIoUartNumber|0
   !else 
     gPlatformModuleTokenSpaceGuid.PcdSerialIoUartNumber|2
-- 
2.10.1.windows.1

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