Aurora Glacier Code.

Add board specific code for Aurora Glacier.
Build command is "BuildBIOS /AG /A /vs13 Broxton Release".

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: zwei4 <david.wei@intel.com>

3 files changed, 39 insertions, 17 deletions

diff --git a/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo.h b/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo.h
index b2fbd0bd27..bebbda4349 100644
--- a/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo.h
+++ b/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo.h
@@ -1,7 +1,7 @@
 /** @file

   GUID used for Platform Info Data entries in the HOB list.

 

-  Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 1999 - 2018, 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

@@ -161,11 +161,23 @@ typedef enum {
 

 #define BOARD_ID_BXT_KsankaGt_MASK  0x8F

 

+//

+// Board ID pin definiton

+//

+// Bit     SoC Pin            Value (Leaf Hill)  Value (Minnow Board 3)    Value (Benson Glacier)   Value (Aurora Glacier)

+// 0    GPIO_224 (J45)         PU (1)              PU (1)                    PD  (0)                  PD  (0)

+// 1    GPIO_213 (M47)         PU (1)              PU (1)                    PD  (0)                  PU  (1)

+// 2    GPIO_223 (H48)         PU (1)              PU (1)                    PU  (1)                  PU  (1)

+// 3    GP_CAMERASB10 (R34)    PD (0)              PU (1)                    PU  (1)                  PU  (1)

+//

+

+

 typedef enum {

+  BOARD_ID_MINNOW_NEXT     = 0x03,     // Minnow Board Next

   BOARD_ID_LFH_CRB         = 0x07,     // Leaf Hill

   BOARD_ID_MINNOW          = 0x0F,     // Minnow Board

   BOARD_ID_BENSON          = 0x0C,     // Benson Glacier

-  BOARD_ID_MINNOW_NEXT     = 0x03,     // Minnow Board Next

+  BOARD_ID_AURORA          = 0x0E,     // Aurora Glacier

   BOARD_ID_APL_UNKNOWN     = 0xFF

 } APL_BOARD_ID_LIST;

 

diff --git a/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo_Aplk.h b/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo_Aplk.h
index 0bf9fb6eb7..e721cda959 100644
--- a/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo_Aplk.h
+++ b/Platform/BroxtonPlatformPkg/Common/Include/Guid/PlatformInfo_Aplk.h
@@ -1,7 +1,7 @@
 /** @file

   GUID used for Platform Info Data entries in the HOB list.

 

-  Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 1999 - 2018, 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

@@ -147,11 +147,22 @@ typedef struct {
   UINT8  IgdPAVP;               // IGD PAVP data

 } EFI_PLATFORM_IGD_DATA;

 

+//

+// Board ID pin definiton

+//

+// Bit     SoC Pin            Value (Leaf Hill)  Value (Minnow Board 3)    Value (Benson Glacier)   Value (Aurora Glacier)

+// 0    GPIO_224 (J45)         PU (1)              PU (1)                    PD  (0)                  PD  (0)

+// 1    GPIO_213 (M47)         PU (1)              PU (1)                    PD  (0)                  PU  (1)

+// 2    GPIO_223 (H48)         PU (1)              PU (1)                    PU  (1)                  PU  (1)

+// 3    GP_CAMERASB10 (R34)    PD (0)              PU (1)                    PU  (1)                  PU  (1)

+//

+

 typedef enum {

+  BOARD_ID_MINNOW_NEXT     = 0x03,     // Minnow Board Next

   BOARD_ID_LFH_CRB         = 0x07,     // Leaf Hill

   BOARD_ID_MINNOW          = 0x0F,     // Minnow Board

-  BOARD_ID_MINNOW_NEXT     = 0x03,     // Minnow Board Next

   BOARD_ID_BENSON          = 0x0C,     // Benson Glacier

+  BOARD_ID_AURORA          = 0x0E,     // Aurora Glacier

   BOARD_ID_APL_UNKNOWN     = 0xFF

 } APL_BOARD_ID_LIST;

 

diff --git a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
index 207183112d..8ace30f8db 100644
--- a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
+++ b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
@@ -48,6 +48,10 @@ if /i "%~3"=="BG" (
     set BoardId=BG

 )

 

+if /i "%~3"=="AG" (

+    set BoardId=AG

+)

+

 if /i "%~3"=="MX" (

     set BoardId=MX

 )

@@ -110,19 +114,6 @@ if not "!BIOS_Name!"=="!BIOS_Name:_R_=!" (
     goto Usage

 )

 

-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 if /i "!Platform_Type!"=="LEAF" (

-    set Platform_Type=LEAF

-) else (

-    echo Error - Unsupported PlatformType: !Platform_Type!

-    goto Usage

-)

-

 :: rd /s /q %BIOS_Names%  >>Stitching.log

 

 pushd %BIOS_Names%

@@ -154,6 +145,14 @@ if %BoardId%==BG (
     copy /y /b ..\..\..\Board\BensonGlacier\IFWI\FAB_A\SpiChunk3.bin .  

   )  

   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%==AG (

+  copy /y /b ..\..\..\Board\AuroraGlacier\IFWI\FAB_A\SpiChunk1.bin .

+  copy /y /b ..\..\..\Board\AuroraGlacier\IFWI\FAB_A\SpiChunk2.bin .

+  copy /y /b ..\..\..\Board\AuroraGlacier\IFWI\FAB_A\SpiChunk3.bin .

+

+  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%==MN (

          if %FabId%==B (

            copy /y /b ..\..\..\Board\MinnowBoard3\IFWI\FAB_B\SpiChunk1.bin .