From: zwei4 <david.wei@intel.com>
To: edk2-devel@lists.01.org
Subject: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Multi board support.
Date: Thu, 13 Jul 2017 22:42:22 +0800 [thread overview]
Message-ID: <20170713144222.15908-1-david.wei@intel.com> (raw)
Cleanup libraries for multi boards.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>
---
.../BensonGlacier/BoardInitDxe/BoardInitDxe.h | 4 +-
.../BensonGlacier/BoardInitPostMem/BoardGpios.c | 72 +++++++++----------
.../BensonGlacier/BoardInitPostMem/BoardGpios.h | 22 +++---
.../BensonGlacier/BoardInitPostMem/BoardInit.c | 2 +-
.../BensonGlacier/BoardInitPostMem/BoardInit.h | 6 +-
.../BoardInitPostMem/BoardInitMiscs.c | 24 +++----
.../BoardInitPostMem/BoardInitMiscs.h | 18 ++---
.../BoardInitPostMem/PlatformInfoHob.c | 4 +-
.../BensonGlacier/BoardInitPreMem/BoardInit.c | 6 +-
.../BensonGlacier/BoardInitPreMem/BoardInit.h | 6 +-
.../BensonGlacier/BoardInitPreMem/BoardInitMiscs.h | 6 +-
.../BensonGlacier/BoardInitPreMem/PlatformId.c | 8 +--
.../BensonGlacier/BoardInitPreMem/PlatformId.h | 18 ++---
.../Board/LeafHill/BoardInitDxe/BoardInitDxe.h | 4 +-
.../Board/LeafHill/BoardInitPostMem/BoardGpios.c | 80 +++++++++++-----------
.../Board/LeafHill/BoardInitPostMem/BoardGpios.h | 32 ++++-----
.../Board/LeafHill/BoardInitPostMem/BoardInit.c | 2 +-
.../Board/LeafHill/BoardInitPostMem/BoardInit.h | 6 +-
.../LeafHill/BoardInitPostMem/BoardInitMiscs.c | 22 +++---
.../LeafHill/BoardInitPostMem/BoardInitMiscs.h | 16 ++---
.../LeafHill/BoardInitPostMem/PlatformInfoHob.c | 2 +-
.../Board/LeafHill/BoardInitPreMem/BoardInit.c | 6 +-
.../Board/LeafHill/BoardInitPreMem/BoardInit.h | 6 +-
.../LeafHill/BoardInitPreMem/BoardInitMiscs.h | 4 +-
.../Board/LeafHill/BoardInitPreMem/PlatformId.c | 4 +-
.../Board/LeafHill/BoardInitPreMem/PlatformId.h | 18 ++---
.../Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.h | 4 +-
.../MinnowBoard3/BoardInitPostMem/BoardGpios.c | 70 +++++++++----------
.../MinnowBoard3/BoardInitPostMem/BoardGpios.h | 22 +++---
.../MinnowBoard3/BoardInitPostMem/BoardInit.c | 2 +-
.../MinnowBoard3/BoardInitPostMem/BoardInit.h | 6 +-
.../MinnowBoard3/BoardInitPostMem/BoardInitMiscs.c | 22 +++---
.../MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h | 18 ++---
.../BoardInitPostMem/PlatformInfoHob.c | 4 +-
.../Board/MinnowBoard3/BoardInitPreMem/BoardInit.c | 8 +--
.../Board/MinnowBoard3/BoardInitPreMem/BoardInit.h | 6 +-
.../MinnowBoard3/BoardInitPreMem/BoardInitMiscs.h | 6 +-
.../MinnowBoard3/BoardInitPreMem/PlatformId.c | 8 +--
.../MinnowBoard3/BoardInitPreMem/PlatformId.h | 20 +++---
39 files changed, 297 insertions(+), 297 deletions(-)
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.h
index e8f2aa3f0..e7ba1d255 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.h
@@ -14,8 +14,8 @@
**/
-#ifndef __BOARD_INIT_DXE_H__
-#define __BOARD_INIT_DXE_H__
+#ifndef __BENSON_BOARD_INIT_DXE_H__
+#define __BENSON_BOARD_INIT_DXE_H__
#include <BoardFunctionsDxe.h>
#include <Library/UefiDriverEntryPoint.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.c
index eef62d9fa..df11c8bbd 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.c
@@ -13,7 +13,7 @@
**/
-#include <BoardGpios.h>
+#include "BoardGpios.h"
#include <Library/GpioLib.h>
#include <Library/SteppingLib.h>
@@ -30,12 +30,12 @@
**/
EFI_STATUS
-MultiPlatformGpioTableInit (
+BensonMultiPlatformGpioTableInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
{
- DEBUG ((DEBUG_INFO, "MultiPlatformGpioTableInit()...\n"));
+ DEBUG ((DEBUG_INFO, "BensonMultiPlatformGpioTableInit()...\n"));
DEBUG ((DEBUG_INFO, "PlatformInfoHob->BoardId: 0x%02X\n", PlatformInfoHob->BoardId));
//
@@ -45,16 +45,16 @@ MultiPlatformGpioTableInit (
case BOARD_ID_LFH_CRB:
case BOARD_ID_MINNOW:
case BOARD_ID_BENSON:
- PlatformInfoHob->PlatformGpioSetting_SW = &mBXT_GpioInitData_SW[0];
- PlatformInfoHob->PlatformGpioSetting_W = &mBXT_GpioInitData_W[0];
- PlatformInfoHob->PlatformGpioSetting_NW = &mBXT_GpioInitData_NW[0];
- PlatformInfoHob->PlatformGpioSetting_N = &mBXT_GpioInitData_N[0];
+ PlatformInfoHob->PlatformGpioSetting_SW = &mBenson_GpioInitData_SW[0];
+ PlatformInfoHob->PlatformGpioSetting_W = &mBenson_GpioInitData_W[0];
+ PlatformInfoHob->PlatformGpioSetting_NW = &mBenson_GpioInitData_NW[0];
+ PlatformInfoHob->PlatformGpioSetting_N = &mBenson_GpioInitData_N[0];
break;
default:
- PlatformInfoHob->PlatformGpioSetting_SW = &mBXT_GpioInitData_SW[0];
- PlatformInfoHob->PlatformGpioSetting_W = &mBXT_GpioInitData_W[0];
- PlatformInfoHob->PlatformGpioSetting_NW = &mBXT_GpioInitData_NW[0];
- PlatformInfoHob->PlatformGpioSetting_N = &mBXT_GpioInitData_N[0];
+ PlatformInfoHob->PlatformGpioSetting_SW = &mBenson_GpioInitData_SW[0];
+ PlatformInfoHob->PlatformGpioSetting_W = &mBenson_GpioInitData_W[0];
+ PlatformInfoHob->PlatformGpioSetting_NW = &mBenson_GpioInitData_NW[0];
+ PlatformInfoHob->PlatformGpioSetting_N = &mBenson_GpioInitData_N[0];
break;
}
@@ -67,7 +67,7 @@ MultiPlatformGpioTableInit (
**/
VOID
-SetGpioPadCfgLock (
+BensonSetGpioPadCfgLock (
VOID
)
{
@@ -146,7 +146,7 @@ SetGpioPadCfgLock (
**/
EFI_STATUS
-MultiPlatformGpioProgram (
+BensonMultiPlatformGpioProgram (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
@@ -175,7 +175,7 @@ MultiPlatformGpioProgram (
&SystemConfiguration
);
- DEBUG ((DEBUG_INFO, "MultiPlatformGpioProgram()...\n"));
+ DEBUG ((DEBUG_INFO, "BensonMultiPlatformGpioProgram()...\n"));
switch (PlatformInfoHob->BoardId) {
case BOARD_ID_LFH_CRB:
@@ -185,24 +185,24 @@ MultiPlatformGpioProgram (
// PAD programming
//
DEBUG ((DEBUG_INFO, "PAD programming, Board ID: 0x%X\n", PlatformInfoHob->BoardId));
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ GpioPadConfigTable (sizeof (mBenson_GpioInitData_N) / sizeof (mBenson_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ GpioPadConfigTable (sizeof (mBenson_GpioInitData_NW) / sizeof (mBenson_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ GpioPadConfigTable (sizeof (mBenson_GpioInitData_W) / sizeof (mBenson_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ GpioPadConfigTable (sizeof (mBenson_GpioInitData_SW) / sizeof (mBenson_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
if (SystemConfiguration.ScIshEnabled == 0) {
DEBUG ((DEBUG_INFO, "Switch ISH_I2C0 & ISH_I2C1 to LPSS_I2C5 and LPSS I2C6. \n" ));
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_LPSS_I2C) / sizeof (mBXT_GpioInitData_LPSS_I2C[0]), mBXT_GpioInitData_LPSS_I2C);
+ GpioPadConfigTable (sizeof (mBenson_GpioInitData_LPSS_I2C) / sizeof (mBenson_GpioInitData_LPSS_I2C[0]), mBenson_GpioInitData_LPSS_I2C);
}
break;
default:
//
// PAD programming
//
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ GpioPadConfigTable (sizeof (mBenson_GpioInitData_N) / sizeof (mBenson_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ GpioPadConfigTable (sizeof (mBenson_GpioInitData_NW) / sizeof (mBenson_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ GpioPadConfigTable (sizeof (mBenson_GpioInitData_W) / sizeof (mBenson_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ GpioPadConfigTable (sizeof (mBenson_GpioInitData_SW) / sizeof (mBenson_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
//
// Note1: This BXT BIOS WA needs to be applied after PAD programming to overwrite the GPIO setting to take effect.
@@ -211,7 +211,7 @@ MultiPlatformGpioProgram (
//
if (PlatformInfoHob->FABID == FAB2) {
DEBUG ((DEBUG_INFO, "FAB ID: FAB2\n"));
- GpioPadConfigTable(sizeof(mBXT_GpioInitData_FAB2)/sizeof(mBXT_GpioInitData_FAB2[0]), mBXT_GpioInitData_FAB2);
+ GpioPadConfigTable(sizeof(mBenson_GpioInitData_FAB2)/sizeof(mBenson_GpioInitData_FAB2[0]), mBenson_GpioInitData_FAB2);
}
if (SystemConfiguration.TDO == 2) { //Auto
@@ -224,20 +224,20 @@ MultiPlatformGpioProgram (
if (SystemConfiguration.ScHdAudioIoBufferOwnership == 3) {
DEBUG ((DEBUG_INFO, "HD Audio IO Buffer Ownership is I2S. Change GPIO pin settings for it. \n" ));
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_Audio_SSP6) / sizeof (mBXT_GpioInitData_Audio_SSP6[0]), mBXT_GpioInitData_Audio_SSP6);
+ GpioPadConfigTable (sizeof (mBenson_GpioInitData_Audio_SSP6) / sizeof (mBenson_GpioInitData_Audio_SSP6[0]), mBenson_GpioInitData_Audio_SSP6);
}
if (SystemConfiguration.PcieRootPortEn[4] == FALSE) {
DEBUG ((DEBUG_INFO, "Onboard LAN disable. \n" ));
- GpioPadConfigTable (sizeof (LomDisableGpio) / sizeof (LomDisableGpio[0]), LomDisableGpio);
+ GpioPadConfigTable (sizeof (BensonLomDisableGpio) / sizeof (BensonLomDisableGpio[0]), BensonLomDisableGpio);
}
if (SystemConfiguration.EPIEnable == 1) {
DEBUG ((DEBUG_INFO, "Overriding GPIO 191 for EPI\n"));
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_EPI_Override) / sizeof (mBXT_GpioInitData_EPI_Override[0]), mBXT_GpioInitData_EPI_Override);
+ GpioPadConfigTable (sizeof (mBenson_GpioInitData_EPI_Override) / sizeof (mBenson_GpioInitData_EPI_Override[0]), mBenson_GpioInitData_EPI_Override);
}
if (SystemConfiguration.GpioLock == TRUE) {
- SetGpioPadCfgLock ();
+ BensonSetGpioPadCfgLock ();
}
DEBUG ((DEBUG_INFO, "No board ID available for this board ....\n"));
break;
@@ -259,19 +259,19 @@ MultiPlatformGpioProgram (
// PAD programming
//
DEBUG ((DEBUG_INFO, "Dump Community pad registers, Board ID: 0x%X\n", PlatformInfoHob->BoardId));
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ DumpGpioPadTable (sizeof (mBenson_GpioInitData_N) / sizeof (mBenson_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ DumpGpioPadTable (sizeof (mBenson_GpioInitData_NW) / sizeof (mBenson_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ DumpGpioPadTable (sizeof (mBenson_GpioInitData_W) / sizeof (mBenson_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ DumpGpioPadTable (sizeof (mBenson_GpioInitData_SW) / sizeof (mBenson_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
break;
default:
//
// Dump Community pad registers
//
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ DumpGpioPadTable (sizeof (mBenson_GpioInitData_N) / sizeof (mBenson_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ DumpGpioPadTable (sizeof (mBenson_GpioInitData_NW) / sizeof (mBenson_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ DumpGpioPadTable (sizeof (mBenson_GpioInitData_W) / sizeof (mBenson_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ DumpGpioPadTable (sizeof (mBenson_GpioInitData_SW) / sizeof (mBenson_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
break;
}
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.h
index 92387e457..e0bdde873 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardGpios.h
@@ -13,8 +13,8 @@
**/
-#ifndef _BOARDGPIOS_H_
-#define _BOARDGPIOS_H_
+#ifndef _BENSON_BOARDGPIOS_H_
+#define _BENSON_BOARDGPIOS_H_
#include <PiPei.h>
#include"ChipsetAccess.h"
@@ -58,7 +58,7 @@ Wake_Enabled:
//
// North Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_N[] =
+BXT_GPIO_PAD_INIT mBenson_GpioInitData_N[] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset ,Community
@@ -145,7 +145,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_N[] =
//
// North West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_NW [] =
+BXT_GPIO_PAD_INIT mBenson_GpioInitData_NW [] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset , Community
@@ -237,7 +237,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_NW [] =
//
// West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_W [] =
+BXT_GPIO_PAD_INIT mBenson_GpioInitData_W [] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L, Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset , Community
@@ -290,7 +290,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_W [] =
//
// South West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_SW[]=
+BXT_GPIO_PAD_INIT mBenson_GpioInitData_SW[]=
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset , Community
@@ -331,7 +331,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_SW[]=
BXT_GPIO_PAD_CONF(L"LPC_AD1", M0, GPO , GPIO_D , LO , NA ,Wake_Disabled, P_20K_H, NA , NA ,IOS_Masked, SAME, GPIO_PADBAR+ 0x0130 , SOUTHWEST),
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_Audio_SSP6 []=
+BXT_GPIO_PAD_INIT mBenson_GpioInitData_Audio_SSP6 []=
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm,MMIO_Offset, Community
@@ -345,7 +345,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_Audio_SSP6 []=
BXT_GPIO_PAD_CONF(L"GPIO_192 DBI_SCL", M0 , HI_Z ,GPIO_D, HI , NA , Wake_Disabled, P_2K_H, NA , NA,NA , NA , GPIO_PADBAR+0x0028, NORTHWEST),//Feature: Codec Power Down PD Net in Sch: SOC_CODEC_PD_N
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_FAB2[] =
+BXT_GPIO_PAD_INIT mBenson_GpioInitData_FAB2[] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset ,Community
@@ -358,7 +358,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_FAB2[] =
//
// GPIO 191 is only used if EPI reworks are applied on the board. This GPIO switches between SD Card data (if set to 1) and EPI data (if set to 0).
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_EPI_Override[] =
+BXT_GPIO_PAD_INIT mBenson_GpioInitData_EPI_Override[] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset ,Community
@@ -366,7 +366,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_EPI_Override[] =
BXT_GPIO_PAD_CONF(L"GPIO_191 DBI_SDA", M0, GPO, GPIO_D,LO, NA, Wake_Disabled,P_20K_L, NA, NA, NA, NA, GPIO_PADBAR + 0x0020, NORTHWEST),//Feature: SD_I2C MUX SEL Net in Sch: INA_MUX_SEL
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_LPSS_I2C[] =
+BXT_GPIO_PAD_INIT mBenson_GpioInitData_LPSS_I2C[] =
{
BXT_GPIO_PAD_CONF(L"GPIO_134 LPSS_I2C5_SDA", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, HizRx0I, EnPd, GPIO_PADBAR+0x0050, WEST),
BXT_GPIO_PAD_CONF(L"GPIO_135 LPSS_I2C5_SCL", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, HizRx0I, EnPd, GPIO_PADBAR+0x0058, WEST),
@@ -375,7 +375,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_LPSS_I2C[] =
};
-BXT_GPIO_PAD_INIT LomDisableGpio[] =
+BXT_GPIO_PAD_INIT BensonLomDisableGpio[] =
{
//
// LAN
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c
index e33ce5aef..7c44a631a 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c
@@ -81,7 +81,7 @@ BensonGlacierPostMemInitCallback (
//
// Set init function PCD
//
- PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) MultiPlatformInfoInit);
+ PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) BensonMultiPlatformInfoInit);
//
// Add init steps here
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h
index fa3919e3c..0a549c2dd 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h
@@ -14,8 +14,8 @@
**/
-#ifndef _BOARDINIT_H_
-#define _BOARDINIT_H_
+#ifndef _BENSON_BOARDINIT_H_
+#define _BENSON_BOARDINIT_H_
#include <PiPei.h>
#include <Library/IoLib.h>
@@ -23,7 +23,7 @@
#include <Library/TimerLib.h>
#include <Guid/PlatformInfo_Aplk.h>
-VOID GpioTest (VOID);
+VOID BensonGpioTest (VOID);
#endif
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.c
index 0d40777b6..e10ab846c 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.c
@@ -1,7 +1,7 @@
/** @file
This file does Multiplatform initialization.
- Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 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
@@ -25,11 +25,11 @@
**/
VOID
-GpioGroupTierInit (
+BensonGpioGroupTierInit (
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
{
- DEBUG ((DEBUG_INFO, "GpioGroupTierInit Start\n"));
+ DEBUG ((DEBUG_INFO, "BensonGpioGroupTierInit Start\n"));
switch (PlatformInfoHob->BoardId) {
default:
GpioSetGroupToGpeDwX (GPIO_BXTP_GROUP_7, // map group 7 to GPE 0 ~ 31
@@ -38,13 +38,13 @@ GpioGroupTierInit (
break;
}
- DEBUG ((DEBUG_INFO, "GpioGroupTierInit End\n"));
+ DEBUG ((DEBUG_INFO, "BensonGpioGroupTierInit End\n"));
}
EFI_STATUS
EFIAPI
-MultiPlatformInfoInit (
+BensonMultiPlatformInfoInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN OUT EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
@@ -110,30 +110,30 @@ MultiPlatformInfoInit (
//
// Get GPIO table
//
- Status = MultiPlatformGpioTableInit (PeiServices, PlatformInfoHob);
+ Status = BensonMultiPlatformGpioTableInit (PeiServices, PlatformInfoHob);
ASSERT_EFI_ERROR (Status);
//
// Program GPIO
//
- Status = MultiPlatformGpioProgram (PeiServices, PlatformInfoHob);
+ Status = BensonMultiPlatformGpioProgram (PeiServices, PlatformInfoHob);
if (GetBxtSeries () == BxtP) {
- GpioGroupTierInit (PlatformInfoHob);
+ BensonGpioGroupTierInit (PlatformInfoHob);
}
//
// Update OemId
//
- Status = InitializeBoardOemId (PeiServices, PlatformInfoHob);
- Status = InitializeBoardSsidSvid (PeiServices, PlatformInfoHob);
+ Status = BensonInitializeBoardOemId (PeiServices, PlatformInfoHob);
+ Status = BensonInitializeBoardSsidSvid (PeiServices, PlatformInfoHob);
return EFI_SUCCESS;
}
EFI_STATUS
-InitializeBoardOemId (
+BensonInitializeBoardOemId (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
@@ -158,7 +158,7 @@ InitializeBoardOemId (
}
EFI_STATUS
-InitializeBoardSsidSvid (
+BensonInitializeBoardSsidSvid (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h
index 8ae5f7c3d..b9844efd4 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitMiscs.h
@@ -2,7 +2,7 @@
Multiplatform initialization header file.
This file includes package header files, library classes.
- Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 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
@@ -14,8 +14,8 @@
**/
-#ifndef _MULTIPLATFORM_LIB_H_
-#define _MULTIPLATFORM_LIB_H_
+#ifndef _BENSON_MULTIPLATFORM_LIB_H_
+#define _BENSON_MULTIPLATFORM_LIB_H_
#define LEN_64M 0x4000000
//
@@ -88,37 +88,37 @@
#define SUBSYSTEM_SVID_SSID (SUBSYSTEM_VENDOR_ID + (SUBSYSTEM_DEVICE_ID << 16))
EFI_STATUS
-GetPlatformInfoHob (
+BensonGetPlatformInfoHob (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT EFI_PLATFORM_INFO_HOB **PlatformInfoHob
);
EFI_STATUS
-MultiPlatformGpioTableInit (
+BensonMultiPlatformGpioTableInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-MultiPlatformGpioProgram (
+BensonMultiPlatformGpioProgram (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-MultiPlatformInfoInit (
+BensonMultiPlatformInfoInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN OUT EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-InitializeBoardOemId (
+BensonInitializeBoardOemId (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-InitializeBoardSsidSvid (
+BensonInitializeBoardSsidSvid (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/PlatformInfoHob.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/PlatformInfoHob.c
index 8dac0ba28..30700e007 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/PlatformInfoHob.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/PlatformInfoHob.c
@@ -1,7 +1,7 @@
/** @file
This file does Multiplatform initialization.
- Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 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,7 +26,7 @@
**/
EFI_STATUS
-GetPlatformInfoHob (
+BensonGetPlatformInfoHob (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT EFI_PLATFORM_INFO_HOB **PlatformInfoHob
)
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c
index cac4eb6e0..122ed9a89 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c
@@ -31,14 +31,14 @@ BensonGlacierPreMemInit (
IN PEI_BOARD_PRE_MEM_INIT_PPI *This
);
-static PEI_BOARD_PRE_MEM_INIT_PPI mPreMemInitPpiInstance = {
+static PEI_BOARD_PRE_MEM_INIT_PPI mBensonPreMemInitPpiInstance = {
BensonGlacierPreMemInit
};
static EFI_PEI_PPI_DESCRIPTOR mBensonGlacierPreMemInitPpi = {
(EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
&gBoardPreMemInitPpiGuid,
- &mPreMemInitPpiInstance
+ &mBensonPreMemInitPpiInstance
};
static EFI_PEI_PPI_DESCRIPTOR mBensonGlacierPreMemInitDonePpi = {
@@ -77,7 +77,7 @@ BensonGlacierPreMemInit (
//
// Pre Mem Board Init
//
- Status = GetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId);
+ Status = BensonGetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId);
if (BoardId != (UINT8) BOARD_ID_BENSON) {
DEBUG ((EFI_D_INFO, "Not a Benson Glacier - skip\n"));
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h
index fa3919e3c..0a549c2dd 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.h
@@ -14,8 +14,8 @@
**/
-#ifndef _BOARDINIT_H_
-#define _BOARDINIT_H_
+#ifndef _BENSON_BOARDINIT_H_
+#define _BENSON_BOARDINIT_H_
#include <PiPei.h>
#include <Library/IoLib.h>
@@ -23,7 +23,7 @@
#include <Library/TimerLib.h>
#include <Guid/PlatformInfo_Aplk.h>
-VOID GpioTest (VOID);
+VOID BensonGpioTest (VOID);
#endif
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInitMiscs.h
index 4223f115c..ab6194988 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInitMiscs.h
@@ -2,7 +2,7 @@
Multiplatform initialization header file.
This file includes package header files, library classes.
- Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 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
@@ -14,8 +14,8 @@
**/
-#ifndef _MULTIPLATFORM_LIB_H_
-#define _MULTIPLATFORM_LIB_H_
+#ifndef _BENSON_MULTIPLATFORM_LIB_H_
+#define _BENSON_MULTIPLATFORM_LIB_H_
#include <BoardFunctionsPei.h>
#include <Guid/SetupVariable.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c
index bacdab1f2..e164cfda7 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.c
@@ -22,7 +22,7 @@
EFI_STATUS
EFIAPI
-GetEmbeddedBoardIdFabId(
+BensonGetEmbeddedBoardIdFabId(
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -89,7 +89,7 @@ GetEmbeddedBoardIdFabId(
(((GpioPadRead (GetCommOffset (NORTHWEST, 0x00C8) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 2) | \
(((GpioPadRead (GetCommOffset (NORTH, 0x01E0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3));
- DEBUG ((DEBUG_INFO, "BoardId from PMIC strap: %02X\n", *BoardId));
+ DEBUG ((DEBUG_INFO, "BoardId: %02X\n", *BoardId));
//
// Fab_ID0: PMIC_I2C_SDA
@@ -147,7 +147,7 @@ GetEmbeddedBoardIdFabId(
(((GpioPadRead (GetCommOffset (NORTHWEST, 0x00D8) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 2) | \
(((GpioPadRead (GetCommOffset (NORTHWEST, 0x00E0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3));
- DEBUG ((EFI_D_INFO, "FabId from PMIC strap: %02X\n", *FabId));
+ DEBUG ((EFI_D_INFO, "FabId: %02X\n", *FabId));
return EFI_SUCCESS;
@@ -156,7 +156,7 @@ GetEmbeddedBoardIdFabId(
EFI_STATUS
EFIAPI
-GetIVIBoardIdFabId (
+BensonGetIVIBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.h
index 3999aaa72..7fc0cc3f9 100644
--- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.h
+++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/PlatformId.h
@@ -13,8 +13,8 @@
**/
-#ifndef __PLATFORM_ID_H__
-#define __PLATFORM_ID_H__
+#ifndef __BENSON_PLATFORM_ID_H__
+#define __BENSON_PLATFORM_ID_H__
//
// Strap Fw Cfg ID define
@@ -27,14 +27,14 @@
EFI_STATUS
EFIAPI
-GetFwCfgId (
+BensonGetFwCfgId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *FwCfgId
);
EFI_STATUS
EFIAPI
-GetBoardIdFabId (
+BensonGetBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -42,7 +42,7 @@ GetBoardIdFabId (
EFI_STATUS
EFIAPI
-GetEmbeddedBoardIdFabId (
+BensonGetEmbeddedBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -50,7 +50,7 @@ GetEmbeddedBoardIdFabId (
EFI_STATUS
EFIAPI
-GetIVIBoardIdFabId (
+BensonGetIVIBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -58,21 +58,21 @@ GetIVIBoardIdFabId (
EFI_STATUS
EFIAPI
-GetDockId (
+BensonGetDockId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *DockId
);
EFI_STATUS
EFIAPI
-GetOsSelPss (
+BensonGetOsSelPss (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *OsSelPss
);
EFI_STATUS
EFIAPI
-GetBomIdPss (
+BensonGetBomIdPss (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BomIdPss
);
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.h
index 275f7557b..119882e23 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.h
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.h
@@ -14,8 +14,8 @@
**/
-#ifndef __BOARD_INIT_DXE_H__
-#define __BOARD_INIT_DXE_H__
+#ifndef __LEAFHILL_BOARD_INIT_DXE_H__
+#define __LEAFHILL_BOARD_INIT_DXE_H__
#include <BoardFunctionsDxe.h>
#include <Library/UefiDriverEntryPoint.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.c
index 7523c0089..ad255ae98 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.c
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.c
@@ -13,7 +13,7 @@
**/
-#include <BoardGpios.h>
+#include "BoardGpios.h"
#include <Library/GpioLib.h>
#include <Library/SteppingLib.h>
@@ -29,12 +29,12 @@
**/
EFI_STATUS
-MultiPlatformGpioTableInit (
+LeafHillMultiPlatformGpioTableInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
{
- DEBUG ((DEBUG_INFO, "MultiPlatformGpioTableInit()...\n"));
+ DEBUG ((DEBUG_INFO, "LeafHillMultiPlatformGpioTableInit()...\n"));
DEBUG ((DEBUG_INFO, "PlatformInfoHob->BoardId: 0x%02X\n", PlatformInfoHob->BoardId));
//
@@ -43,17 +43,17 @@ MultiPlatformGpioTableInit (
switch (PlatformInfoHob->BoardId) {
case BOARD_ID_LFH_CRB:
case BOARD_ID_MINNOW:
- PlatformInfoHob->PlatformGpioSetting_SW = &mBXT_GpioInitData_SW[0];
- PlatformInfoHob->PlatformGpioSetting_W = &mBXT_GpioInitData_W[0];
- PlatformInfoHob->PlatformGpioSetting_NW = &mBXT_GpioInitData_NW[0];
- PlatformInfoHob->PlatformGpioSetting_N = &mBXT_GpioInitData_N[0];
+ PlatformInfoHob->PlatformGpioSetting_SW = &mLeafHill_GpioInitData_SW[0];
+ PlatformInfoHob->PlatformGpioSetting_W = &mLeafHill_GpioInitData_W[0];
+ PlatformInfoHob->PlatformGpioSetting_NW = &mLeafHill_GpioInitData_NW[0];
+ PlatformInfoHob->PlatformGpioSetting_N = &mLeafHill_GpioInitData_N[0];
break;
default:
- PlatformInfoHob->PlatformGpioSetting_SW = &mBXT_GpioInitData_SW[0];
- PlatformInfoHob->PlatformGpioSetting_W = &mBXT_GpioInitData_W[0];
- PlatformInfoHob->PlatformGpioSetting_NW = &mBXT_GpioInitData_NW[0];
- PlatformInfoHob->PlatformGpioSetting_N = &mBXT_GpioInitData_N[0];
+ PlatformInfoHob->PlatformGpioSetting_SW = &mLeafHill_GpioInitData_SW[0];
+ PlatformInfoHob->PlatformGpioSetting_W = &mLeafHill_GpioInitData_W[0];
+ PlatformInfoHob->PlatformGpioSetting_NW = &mLeafHill_GpioInitData_NW[0];
+ PlatformInfoHob->PlatformGpioSetting_N = &mLeafHill_GpioInitData_N[0];
break;
}
@@ -66,7 +66,7 @@ MultiPlatformGpioTableInit (
**/
VOID
-SetGpioPadCfgLock (
+LeafHillSetGpioPadCfgLock (
VOID
)
{
@@ -145,7 +145,7 @@ SetGpioPadCfgLock (
**/
EFI_STATUS
-MultiPlatformGpioProgram (
+LeafHillMultiPlatformGpioProgram (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
@@ -174,7 +174,7 @@ MultiPlatformGpioProgram (
&SystemConfiguration
);
- DEBUG ((DEBUG_INFO, "MultiPlatformGpioProgram()...\n"));
+ DEBUG ((DEBUG_INFO, "LeafHillMultiPlatformGpioProgram()...\n"));
switch (PlatformInfoHob->BoardId) {
case BOARD_ID_LFH_CRB:
@@ -184,18 +184,18 @@ MultiPlatformGpioProgram (
// PAD programming
//
DEBUG ((DEBUG_INFO, "PAD programming, Board ID: 0x%X\n", PlatformInfoHob->BoardId));
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_N_LH) / sizeof (mBXT_GpioInitData_N_LH[0]), mBXT_GpioInitData_N_LH);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_SW_LH) / sizeof (mBXT_GpioInitData_SW_LH[0]), mBXT_GpioInitData_SW_LH);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_W_LH) / sizeof (mBXT_GpioInitData_W_LH[0]), mBXT_GpioInitData_W_LH);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_NW_LH) / sizeof (mBXT_GpioInitData_NW_LH[0]), mBXT_GpioInitData_NW_LH);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_N) / sizeof (mLeafHill_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_NW) / sizeof (mLeafHill_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_W) / sizeof (mLeafHill_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_SW) / sizeof (mLeafHill_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_N_LH) / sizeof (mLeafHill_GpioInitData_N_LH[0]), mLeafHill_GpioInitData_N_LH);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_SW_LH) / sizeof (mLeafHill_GpioInitData_SW_LH[0]), mLeafHill_GpioInitData_SW_LH);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_W_LH) / sizeof (mLeafHill_GpioInitData_W_LH[0]), mLeafHill_GpioInitData_W_LH);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_NW_LH) / sizeof (mLeafHill_GpioInitData_NW_LH[0]), mLeafHill_GpioInitData_NW_LH);
if (SystemConfiguration.ScIshEnabled == 0) {
DEBUG ((DEBUG_INFO, "Switch ISH_I2C0 & ISH_I2C1 to LPSS_I2C5 and LPSS I2C6. \n" ));
- GpioPadConfigTable(sizeof(mBXT_GpioInitData_LPSS_I2C)/sizeof(mBXT_GpioInitData_LPSS_I2C[0]), mBXT_GpioInitData_LPSS_I2C);
+ GpioPadConfigTable(sizeof(mLeafHill_GpioInitData_LPSS_I2C)/sizeof(mLeafHill_GpioInitData_LPSS_I2C[0]), mLeafHill_GpioInitData_LPSS_I2C);
}
break;
default:
@@ -203,10 +203,10 @@ MultiPlatformGpioProgram (
//
// PAD programming
//
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_N) / sizeof (mLeafHill_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_NW) / sizeof (mLeafHill_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_W) / sizeof (mLeafHill_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_SW) / sizeof (mLeafHill_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
//
// Note1: This BXT BIOS WA needs to be applied after PAD programming to overwrite the GPIO setting to take effect.
@@ -215,7 +215,7 @@ MultiPlatformGpioProgram (
//
if (PlatformInfoHob->FABID == FAB2) {
DEBUG ((DEBUG_INFO, "FAB ID: FAB2\n"));
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_FAB2 )/ sizeof (mBXT_GpioInitData_FAB2[0]), mBXT_GpioInitData_FAB2);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_FAB2 )/ sizeof (mLeafHill_GpioInitData_FAB2[0]), mLeafHill_GpioInitData_FAB2);
}
if (SystemConfiguration.TDO == 2) { //Auto
@@ -228,20 +228,20 @@ MultiPlatformGpioProgram (
if (SystemConfiguration.ScHdAudioIoBufferOwnership == 3) {
DEBUG ((DEBUG_INFO, "HD Audio IO Buffer Ownership is I2S. Change GPIO pin settings for it. \n" ));
- GpioPadConfigTable ( sizeof (mBXT_GpioInitData_Audio_SSP6) / sizeof (mBXT_GpioInitData_Audio_SSP6[0]), mBXT_GpioInitData_Audio_SSP6);
+ GpioPadConfigTable ( sizeof (mLeafHill_GpioInitData_Audio_SSP6) / sizeof (mLeafHill_GpioInitData_Audio_SSP6[0]), mLeafHill_GpioInitData_Audio_SSP6);
}
if (SystemConfiguration.PcieRootPortEn[4] == FALSE) {
DEBUG ((DEBUG_INFO, "Onboard LAN disable. \n" ));
- GpioPadConfigTable ( sizeof (LomDisableGpio) / sizeof (LomDisableGpio[0]), LomDisableGpio);
+ GpioPadConfigTable ( sizeof (LeafHillLomDisableGpio) / sizeof (LeafHillLomDisableGpio[0]), LeafHillLomDisableGpio);
}
if (SystemConfiguration.EPIEnable == 1) {
DEBUG((DEBUG_INFO, "Overriding GPIO 191 for EPI\n"));
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_EPI_Override) / sizeof (mBXT_GpioInitData_EPI_Override[0]), mBXT_GpioInitData_EPI_Override);
+ GpioPadConfigTable (sizeof (mLeafHill_GpioInitData_EPI_Override) / sizeof (mLeafHill_GpioInitData_EPI_Override[0]), mLeafHill_GpioInitData_EPI_Override);
}
if (SystemConfiguration.GpioLock == TRUE) {
- SetGpioPadCfgLock ();
+ LeafHillSetGpioPadCfgLock ();
}
DEBUG ((DEBUG_INFO, "No board ID available for this board ....\n"));
break;
@@ -263,20 +263,20 @@ MultiPlatformGpioProgram (
// PAD programming
//
DEBUG ((DEBUG_INFO, "Dump Community pad registers, Board ID: 0x%X\n", PlatformInfoHob->BoardId));
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_NW_LH) / sizeof (mBXT_GpioInitData_NW_LH[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_W_LH) / sizeof (mBXT_GpioInitData_W_LH[0]), PlatformInfoHob->PlatformGpioSetting_W);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_SW_LH) / sizeof (mBXT_GpioInitData_SW_LH[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ DumpGpioPadTable (sizeof (mLeafHill_GpioInitData_N) / sizeof (mLeafHill_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ DumpGpioPadTable (sizeof (mLeafHill_GpioInitData_NW_LH) / sizeof (mLeafHill_GpioInitData_NW_LH[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ DumpGpioPadTable (sizeof (mLeafHill_GpioInitData_W_LH) / sizeof (mLeafHill_GpioInitData_W_LH[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ DumpGpioPadTable (sizeof (mLeafHill_GpioInitData_SW_LH) / sizeof (mLeafHill_GpioInitData_SW_LH[0]), PlatformInfoHob->PlatformGpioSetting_SW);
break;
default:
//
// Dump Community pad registers
//
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ DumpGpioPadTable (sizeof (mLeafHill_GpioInitData_N) / sizeof (mLeafHill_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ DumpGpioPadTable (sizeof (mLeafHill_GpioInitData_NW) / sizeof (mLeafHill_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ DumpGpioPadTable (sizeof (mLeafHill_GpioInitData_W) / sizeof (mLeafHill_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ DumpGpioPadTable (sizeof (mLeafHill_GpioInitData_SW) / sizeof (mLeafHill_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
break;
}
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.h
index 9777d7500..de1c47683 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.h
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.h
@@ -1,7 +1,7 @@
/** @file
GPIO setting for Broxton.
- Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2015 - 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
@@ -13,8 +13,8 @@
**/
-#ifndef _BOARDGPIOS_H_
-#define _BOARDGPIOS_H_
+#ifndef _LEAFHILL_BOARDGPIOS_H_
+#define _LEAFHILL_BOARDGPIOS_H_
#include <PiPei.h>
#include"ChipsetAccess.h"
@@ -59,7 +59,7 @@ Wake_Enabled:
//
// North Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_N[] =
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_N[] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset ,Community
@@ -139,7 +139,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_N[] =
//
// North West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_NW [] =
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_NW [] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset , Community
@@ -226,7 +226,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_NW [] =
//
// West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_W [] =
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_W [] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L, Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset , Community
@@ -275,7 +275,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_W [] =
//
// South West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_SW[]=
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_SW[]=
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset , Community
@@ -314,7 +314,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_SW[]=
BXT_GPIO_PAD_CONF(L"SMB_ALERTB", M0, GPI , GPIO_D , NA , NA ,Wake_Disabled, P_20K_H, NA , NA ,IOS_Masked,SAME ,GPIO_PADBAR+0x00F8 , SOUTHWEST),//not used on RVP
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_Audio_SSP6 []=
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_Audio_SSP6 []=
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm,MMIO_Offset, Community
@@ -328,7 +328,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_Audio_SSP6 []=
BXT_GPIO_PAD_CONF(L"GPIO_192 DBI_SCL", M0 , HI_Z ,GPIO_D, HI , NA , Wake_Disabled, P_2K_H, NA , NA,NA , NA , GPIO_PADBAR+0x0028, NORTHWEST),//Feature: Codec Power Down PD Net in Sch: SOC_CODEC_PD_N
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_FAB2[] =
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_FAB2[] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset ,Community
@@ -341,7 +341,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_FAB2[] =
//
// GPIO 191 is only used if EPI reworks are applied on the board. This GPIO switches between SD Card data (if set to 1) and EPI data (if set to 0).
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_EPI_Override[] =
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_EPI_Override[] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset ,Community
@@ -352,7 +352,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_EPI_Override[] =
//
// North West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_NW_LH []=
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_NW_LH []=
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset, Community
@@ -392,7 +392,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_NW_LH []=
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_N_LH[] =
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_N_LH[] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm,MMIO_Offset,Community
@@ -419,7 +419,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_N_LH[] =
//
// West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_W_LH [] =
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_W_LH [] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L, Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset, Community
@@ -439,7 +439,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_W_LH [] =
//
// South West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_SW_LH []=
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_SW_LH []=
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm,MMIO_Offset, Community
@@ -449,7 +449,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_SW_LH []=
BXT_GPIO_PAD_CONF(L"SMB_ALERTB", M1, NA , NA , NA , NA ,Wake_Disabled, P_20K_H, NA , NA ,IOS_Masked, SAME, GPIO_PADBAR+ 0x00F8 , SOUTHWEST),//Feature: SMB_ALERTB
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_LPSS_I2C[] =
+BXT_GPIO_PAD_INIT mLeafHill_GpioInitData_LPSS_I2C[] =
{
BXT_GPIO_PAD_CONF(L"GPIO_134 LPSS_I2C5_SDA", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, HizRx0I, EnPd, GPIO_PADBAR+0x0050, WEST),
BXT_GPIO_PAD_CONF(L"GPIO_135 LPSS_I2C5_SCL", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, HizRx0I, EnPd, GPIO_PADBAR+0x0058, WEST),
@@ -457,7 +457,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_LPSS_I2C[] =
BXT_GPIO_PAD_CONF(L"GPIO_137 LPSS_I2C6_SCL", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, HizRx0I, EnPd, GPIO_PADBAR+0x0068, WEST),
};
-BXT_GPIO_PAD_INIT LomDisableGpio[] =
+BXT_GPIO_PAD_INIT LeafHillLomDisableGpio[] =
{
//
// LAN
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c
index 9ae19e387..501e810af 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c
@@ -81,7 +81,7 @@ LeafHillPostMemInitCallback (
//
// Set init function PCD
//
- PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) MultiPlatformInfoInit);
+ PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) LeafHillMultiPlatformInfoInit);
//
// Add init steps here
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h
index fa3919e3c..298613ae6 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h
@@ -14,8 +14,8 @@
**/
-#ifndef _BOARDINIT_H_
-#define _BOARDINIT_H_
+#ifndef _LEAFHILL_BOARDINIT_H_
+#define _LEAFHILL_BOARDINIT_H_
#include <PiPei.h>
#include <Library/IoLib.h>
@@ -23,7 +23,7 @@
#include <Library/TimerLib.h>
#include <Guid/PlatformInfo_Aplk.h>
-VOID GpioTest (VOID);
+VOID LeafHillGpioTest (VOID);
#endif
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitMiscs.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitMiscs.c
index 5b626a894..b7718e813 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitMiscs.c
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitMiscs.c
@@ -24,11 +24,11 @@
**/
VOID
-GpioGroupTierInit (
+LeafHillGpioGroupTierInit (
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
{
- DEBUG ((DEBUG_INFO, "GpioGroupTierInit Start\n"));
+ DEBUG ((DEBUG_INFO, "LeafHillGpioGroupTierInit Start\n"));
switch (PlatformInfoHob->BoardId) {
default:
GpioSetGroupToGpeDwX (GPIO_BXTP_GROUP_7, // map group 7 to GPE 0 ~ 31
@@ -37,13 +37,13 @@ GpioGroupTierInit (
break;
}
- DEBUG ((DEBUG_INFO, "GpioGroupTierInit End\n"));
+ DEBUG ((DEBUG_INFO, "LeafHillGpioGroupTierInit End\n"));
}
EFI_STATUS
EFIAPI
-MultiPlatformInfoInit (
+LeafHillMultiPlatformInfoInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN OUT EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
@@ -108,30 +108,30 @@ MultiPlatformInfoInit (
//
// Get GPIO table
//
- Status = MultiPlatformGpioTableInit (PeiServices, PlatformInfoHob);
+ Status = LeafHillMultiPlatformGpioTableInit (PeiServices, PlatformInfoHob);
ASSERT_EFI_ERROR (Status);
//
// Program GPIO
//
- Status = MultiPlatformGpioProgram (PeiServices, PlatformInfoHob);
+ Status = LeafHillMultiPlatformGpioProgram (PeiServices, PlatformInfoHob);
if (GetBxtSeries () == BxtP) {
- GpioGroupTierInit (PlatformInfoHob);
+ LeafHillGpioGroupTierInit (PlatformInfoHob);
}
//
// Update OemId
//
- Status = InitializeBoardOemId (PeiServices, PlatformInfoHob);
- Status = InitializeBoardSsidSvid (PeiServices, PlatformInfoHob);
+ Status = LeafHillInitializeBoardOemId (PeiServices, PlatformInfoHob);
+ Status = LeafHillInitializeBoardSsidSvid (PeiServices, PlatformInfoHob);
return EFI_SUCCESS;
}
EFI_STATUS
-InitializeBoardOemId (
+LeafHillInitializeBoardOemId (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
@@ -157,7 +157,7 @@ InitializeBoardOemId (
EFI_STATUS
-InitializeBoardSsidSvid (
+LeafHillInitializeBoardSsidSvid (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitMiscs.h
index 598fc9aef..98100c218 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitMiscs.h
@@ -14,8 +14,8 @@
**/
-#ifndef _MULTIPLATFORM_LIB_H_
-#define _MULTIPLATFORM_LIB_H_
+#ifndef _LEAFHILL_MULTIPLATFORM_LIB_H_
+#define _LEAFHILL_MULTIPLATFORM_LIB_H_
#define LEN_64M 0x4000000
//
@@ -87,37 +87,37 @@
#define SUBSYSTEM_SVID_SSID (SUBSYSTEM_VENDOR_ID + (SUBSYSTEM_DEVICE_ID << 16))
EFI_STATUS
-GetPlatformInfoHob (
+LeafHillGetPlatformInfoHob (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT EFI_PLATFORM_INFO_HOB **PlatformInfoHob
);
EFI_STATUS
-MultiPlatformGpioTableInit (
+LeafHillMultiPlatformGpioTableInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-MultiPlatformGpioProgram (
+LeafHillMultiPlatformGpioProgram (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-MultiPlatformInfoInit (
+LeafHillMultiPlatformInfoInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN OUT EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-InitializeBoardOemId (
+LeafHillInitializeBoardOemId (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-InitializeBoardSsidSvid (
+LeafHillInitializeBoardSsidSvid (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/PlatformInfoHob.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/PlatformInfoHob.c
index f84b32f21..bb1e6672c 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/PlatformInfoHob.c
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/PlatformInfoHob.c
@@ -27,7 +27,7 @@
**/
EFI_STATUS
-GetPlatformInfoHob (
+LeafHillGetPlatformInfoHob (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT EFI_PLATFORM_INFO_HOB **PlatformInfoHob
)
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.c
index 5dab22514..aa22e5622 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.c
@@ -31,14 +31,14 @@ LeafHillPreMemInit (
IN PEI_BOARD_PRE_MEM_INIT_PPI *This
);
-static PEI_BOARD_PRE_MEM_INIT_PPI mPreMemInitPpiInstance = {
+static PEI_BOARD_PRE_MEM_INIT_PPI mLeafHillPreMemInitPpiInstance = {
LeafHillPreMemInit
};
static EFI_PEI_PPI_DESCRIPTOR mLeafHillPreMemInitPpi = {
(EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
&gBoardPreMemInitPpiGuid,
- &mPreMemInitPpiInstance
+ &mLeafHillPreMemInitPpiInstance
};
static EFI_PEI_PPI_DESCRIPTOR mLeafHillPreMemInitDonePpi = {
@@ -76,7 +76,7 @@ LeafHillPreMemInit (
//
// Pre Mem Board Init
//
- Status = GetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId);
+ Status = LeafHillGetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId);
if (BoardId != (UINT8) BOARD_ID_LFH_CRB) {
DEBUG ((EFI_D_INFO, "Not a Leaf Hill Board - skip\n"));
return EFI_SUCCESS;
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.h
index fa3919e3c..298613ae6 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.h
@@ -14,8 +14,8 @@
**/
-#ifndef _BOARDINIT_H_
-#define _BOARDINIT_H_
+#ifndef _LEAFHILL_BOARDINIT_H_
+#define _LEAFHILL_BOARDINIT_H_
#include <PiPei.h>
#include <Library/IoLib.h>
@@ -23,7 +23,7 @@
#include <Library/TimerLib.h>
#include <Guid/PlatformInfo_Aplk.h>
-VOID GpioTest (VOID);
+VOID LeafHillGpioTest (VOID);
#endif
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitMiscs.h
index 57296b225..10132aa73 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInitMiscs.h
@@ -14,8 +14,8 @@
**/
-#ifndef _MULTIPLATFORM_LIB_H_
-#define _MULTIPLATFORM_LIB_H_
+#ifndef _LEAFHILL_MULTIPLATFORM_LIB_H_
+#define _LEAFHILL_MULTIPLATFORM_LIB_H_
#include <BoardFunctionsPei.h>
#include <Guid/SetupVariable.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c
index 40554b95e..d5fc5185b 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.c
@@ -22,7 +22,7 @@
EFI_STATUS
EFIAPI
-GetEmbeddedBoardIdFabId(
+LeafHillGetEmbeddedBoardIdFabId(
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -156,7 +156,7 @@ GetEmbeddedBoardIdFabId(
EFI_STATUS
EFIAPI
-GetIVIBoardIdFabId (
+LeafHillGetIVIBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.h
index 3999aaa72..d7491fdc8 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.h
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/PlatformId.h
@@ -13,8 +13,8 @@
**/
-#ifndef __PLATFORM_ID_H__
-#define __PLATFORM_ID_H__
+#ifndef __LEAFHILL_PLATFORM_ID_H__
+#define __LEAFHILL_PLATFORM_ID_H__
//
// Strap Fw Cfg ID define
@@ -27,14 +27,14 @@
EFI_STATUS
EFIAPI
-GetFwCfgId (
+LeafHillGetFwCfgId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *FwCfgId
);
EFI_STATUS
EFIAPI
-GetBoardIdFabId (
+LeafHillGetBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -42,7 +42,7 @@ GetBoardIdFabId (
EFI_STATUS
EFIAPI
-GetEmbeddedBoardIdFabId (
+LeafHillGetEmbeddedBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -50,7 +50,7 @@ GetEmbeddedBoardIdFabId (
EFI_STATUS
EFIAPI
-GetIVIBoardIdFabId (
+LeafHillGetIVIBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -58,21 +58,21 @@ GetIVIBoardIdFabId (
EFI_STATUS
EFIAPI
-GetDockId (
+LeafHillGetDockId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *DockId
);
EFI_STATUS
EFIAPI
-GetOsSelPss (
+LeafHillGetOsSelPss (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *OsSelPss
);
EFI_STATUS
EFIAPI
-GetBomIdPss (
+LeafHillGetBomIdPss (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BomIdPss
);
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.h
index 518974801..2dd980e31 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.h
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.h
@@ -14,8 +14,8 @@
**/
-#ifndef __BOARD_INIT_DXE_H__
-#define __BOARD_INIT_DXE_H__
+#ifndef __MINNOW3_BOARD_INIT_DXE_H__
+#define __MINNOW3_BOARD_INIT_DXE_H__
#include <BoardFunctionsDxe.h>
#include <Library/UefiDriverEntryPoint.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c
index eef62d9fa..096d0e862 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c
@@ -13,7 +13,7 @@
**/
-#include <BoardGpios.h>
+#include "BoardGpios.h"
#include <Library/GpioLib.h>
#include <Library/SteppingLib.h>
@@ -30,12 +30,12 @@
**/
EFI_STATUS
-MultiPlatformGpioTableInit (
+Minnow3MultiPlatformGpioTableInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
{
- DEBUG ((DEBUG_INFO, "MultiPlatformGpioTableInit()...\n"));
+ DEBUG ((DEBUG_INFO, "Minnow3MultiPlatformGpioTableInit()...\n"));
DEBUG ((DEBUG_INFO, "PlatformInfoHob->BoardId: 0x%02X\n", PlatformInfoHob->BoardId));
//
@@ -45,16 +45,16 @@ MultiPlatformGpioTableInit (
case BOARD_ID_LFH_CRB:
case BOARD_ID_MINNOW:
case BOARD_ID_BENSON:
- PlatformInfoHob->PlatformGpioSetting_SW = &mBXT_GpioInitData_SW[0];
- PlatformInfoHob->PlatformGpioSetting_W = &mBXT_GpioInitData_W[0];
- PlatformInfoHob->PlatformGpioSetting_NW = &mBXT_GpioInitData_NW[0];
- PlatformInfoHob->PlatformGpioSetting_N = &mBXT_GpioInitData_N[0];
+ PlatformInfoHob->PlatformGpioSetting_SW = &mMinnow3_GpioInitData_SW[0];
+ PlatformInfoHob->PlatformGpioSetting_W = &mMinnow3_GpioInitData_W[0];
+ PlatformInfoHob->PlatformGpioSetting_NW = &mMinnow3_GpioInitData_NW[0];
+ PlatformInfoHob->PlatformGpioSetting_N = &mMinnow3_GpioInitData_N[0];
break;
default:
- PlatformInfoHob->PlatformGpioSetting_SW = &mBXT_GpioInitData_SW[0];
- PlatformInfoHob->PlatformGpioSetting_W = &mBXT_GpioInitData_W[0];
- PlatformInfoHob->PlatformGpioSetting_NW = &mBXT_GpioInitData_NW[0];
- PlatformInfoHob->PlatformGpioSetting_N = &mBXT_GpioInitData_N[0];
+ PlatformInfoHob->PlatformGpioSetting_SW = &mMinnow3_GpioInitData_SW[0];
+ PlatformInfoHob->PlatformGpioSetting_W = &mMinnow3_GpioInitData_W[0];
+ PlatformInfoHob->PlatformGpioSetting_NW = &mMinnow3_GpioInitData_NW[0];
+ PlatformInfoHob->PlatformGpioSetting_N = &mMinnow3_GpioInitData_N[0];
break;
}
@@ -67,7 +67,7 @@ MultiPlatformGpioTableInit (
**/
VOID
-SetGpioPadCfgLock (
+Minnow3SetGpioPadCfgLock (
VOID
)
{
@@ -146,7 +146,7 @@ SetGpioPadCfgLock (
**/
EFI_STATUS
-MultiPlatformGpioProgram (
+Minnow3MultiPlatformGpioProgram (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
@@ -185,24 +185,24 @@ MultiPlatformGpioProgram (
// PAD programming
//
DEBUG ((DEBUG_INFO, "PAD programming, Board ID: 0x%X\n", PlatformInfoHob->BoardId));
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_N) / sizeof (mMinnow3_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_NW) / sizeof (mMinnow3_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_W) / sizeof (mMinnow3_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_SW) / sizeof (mMinnow3_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
if (SystemConfiguration.ScIshEnabled == 0) {
DEBUG ((DEBUG_INFO, "Switch ISH_I2C0 & ISH_I2C1 to LPSS_I2C5 and LPSS I2C6. \n" ));
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_LPSS_I2C) / sizeof (mBXT_GpioInitData_LPSS_I2C[0]), mBXT_GpioInitData_LPSS_I2C);
+ GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_LPSS_I2C) / sizeof (mMinnow3_GpioInitData_LPSS_I2C[0]), mMinnow3_GpioInitData_LPSS_I2C);
}
break;
default:
//
// PAD programming
//
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_N) / sizeof (mMinnow3_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_NW) / sizeof (mMinnow3_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_W) / sizeof (mMinnow3_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_SW) / sizeof (mMinnow3_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
//
// Note1: This BXT BIOS WA needs to be applied after PAD programming to overwrite the GPIO setting to take effect.
@@ -211,7 +211,7 @@ MultiPlatformGpioProgram (
//
if (PlatformInfoHob->FABID == FAB2) {
DEBUG ((DEBUG_INFO, "FAB ID: FAB2\n"));
- GpioPadConfigTable(sizeof(mBXT_GpioInitData_FAB2)/sizeof(mBXT_GpioInitData_FAB2[0]), mBXT_GpioInitData_FAB2);
+ GpioPadConfigTable(sizeof(mMinnow3_GpioInitData_FAB2)/sizeof(mMinnow3_GpioInitData_FAB2[0]), mMinnow3_GpioInitData_FAB2);
}
if (SystemConfiguration.TDO == 2) { //Auto
@@ -224,20 +224,20 @@ MultiPlatformGpioProgram (
if (SystemConfiguration.ScHdAudioIoBufferOwnership == 3) {
DEBUG ((DEBUG_INFO, "HD Audio IO Buffer Ownership is I2S. Change GPIO pin settings for it. \n" ));
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_Audio_SSP6) / sizeof (mBXT_GpioInitData_Audio_SSP6[0]), mBXT_GpioInitData_Audio_SSP6);
+ GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_Audio_SSP6) / sizeof (mMinnow3_GpioInitData_Audio_SSP6[0]), mMinnow3_GpioInitData_Audio_SSP6);
}
if (SystemConfiguration.PcieRootPortEn[4] == FALSE) {
DEBUG ((DEBUG_INFO, "Onboard LAN disable. \n" ));
- GpioPadConfigTable (sizeof (LomDisableGpio) / sizeof (LomDisableGpio[0]), LomDisableGpio);
+ GpioPadConfigTable (sizeof (Minnow3LomDisableGpio) / sizeof (Minnow3LomDisableGpio[0]), Minnow3LomDisableGpio);
}
if (SystemConfiguration.EPIEnable == 1) {
DEBUG ((DEBUG_INFO, "Overriding GPIO 191 for EPI\n"));
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_EPI_Override) / sizeof (mBXT_GpioInitData_EPI_Override[0]), mBXT_GpioInitData_EPI_Override);
+ GpioPadConfigTable (sizeof (mMinnow3_GpioInitData_EPI_Override) / sizeof (mMinnow3_GpioInitData_EPI_Override[0]), mMinnow3_GpioInitData_EPI_Override);
}
if (SystemConfiguration.GpioLock == TRUE) {
- SetGpioPadCfgLock ();
+ Minnow3SetGpioPadCfgLock ();
}
DEBUG ((DEBUG_INFO, "No board ID available for this board ....\n"));
break;
@@ -259,19 +259,19 @@ MultiPlatformGpioProgram (
// PAD programming
//
DEBUG ((DEBUG_INFO, "Dump Community pad registers, Board ID: 0x%X\n", PlatformInfoHob->BoardId));
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ DumpGpioPadTable (sizeof (mMinnow3_GpioInitData_N) / sizeof (mMinnow3_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ DumpGpioPadTable (sizeof (mMinnow3_GpioInitData_NW) / sizeof (mMinnow3_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ DumpGpioPadTable (sizeof (mMinnow3_GpioInitData_W) / sizeof (mMinnow3_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ DumpGpioPadTable (sizeof (mMinnow3_GpioInitData_SW) / sizeof (mMinnow3_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
break;
default:
//
// Dump Community pad registers
//
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_N) / sizeof (mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_NW) / sizeof (mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_W) / sizeof (mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_SW) / sizeof (mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ DumpGpioPadTable (sizeof (mMinnow3_GpioInitData_N) / sizeof (mMinnow3_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
+ DumpGpioPadTable (sizeof (mMinnow3_GpioInitData_NW) / sizeof (mMinnow3_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ DumpGpioPadTable (sizeof (mMinnow3_GpioInitData_W) / sizeof (mMinnow3_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ DumpGpioPadTable (sizeof (mMinnow3_GpioInitData_SW) / sizeof (mMinnow3_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
break;
}
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
index 193f347ec..1bf848995 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
@@ -13,8 +13,8 @@
**/
-#ifndef _BOARDGPIOS_H_
-#define _BOARDGPIOS_H_
+#ifndef _MINNOW3_BOARDGPIOS_H_
+#define _MINNOW3_BOARDGPIOS_H_
#include <PiPei.h>
#include"ChipsetAccess.h"
@@ -58,7 +58,7 @@ Wake_Enabled:
//
// North Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_N[] =
+BXT_GPIO_PAD_INIT mMinnow3_GpioInitData_N[] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset ,Community
@@ -142,7 +142,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_N[] =
//
// North West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_NW [] =
+BXT_GPIO_PAD_INIT mMinnow3_GpioInitData_NW [] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset , Community
@@ -234,7 +234,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_NW [] =
//
// West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_W [] =
+BXT_GPIO_PAD_INIT mMinnow3_GpioInitData_W [] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L, Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset , Community
@@ -287,7 +287,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_W [] =
//
// South West Community
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_SW[]=
+BXT_GPIO_PAD_INIT mMinnow3_GpioInitData_SW[]=
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm, MMIO_Offset , Community
@@ -326,7 +326,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_SW[]=
BXT_GPIO_PAD_CONF(L"SMB_ALERTB", M1, NA , NA , NA , NA ,Wake_Disabled, P_20K_H, NA , NA ,IOS_Masked, SAME, GPIO_PADBAR+ 0x00F8 , SOUTHWEST),//Feature: SMB_ALERTB
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_Audio_SSP6 []=
+BXT_GPIO_PAD_INIT mMinnow3_GpioInitData_Audio_SSP6 []=
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger,Wake_Enabled, Term_H_L,Inverted,GPI_ROUT,IOSstae, IOSTerm,MMIO_Offset, Community
@@ -340,7 +340,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_Audio_SSP6 []=
BXT_GPIO_PAD_CONF(L"GPIO_192 DBI_SCL", M0 , HI_Z ,GPIO_D, HI , NA , Wake_Disabled, P_2K_H, NA , NA,NA , NA , GPIO_PADBAR+0x0028, NORTHWEST),//Feature: Codec Power Down PD Net in Sch: SOC_CODEC_PD_N
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_FAB2[] =
+BXT_GPIO_PAD_INIT mMinnow3_GpioInitData_FAB2[] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset ,Community
@@ -353,7 +353,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_FAB2[] =
//
// GPIO 191 is only used if EPI reworks are applied on the board. This GPIO switches between SD Card data (if set to 1) and EPI data (if set to 0).
//
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_EPI_Override[] =
+BXT_GPIO_PAD_INIT mMinnow3_GpioInitData_EPI_Override[] =
{
//
// Group Pin#: pad_name, PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled ,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset ,Community
@@ -361,7 +361,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_EPI_Override[] =
BXT_GPIO_PAD_CONF(L"GPIO_191 DBI_SDA", M0, GPO, GPIO_D,LO, NA, Wake_Disabled,P_20K_L, NA, NA, NA, NA, GPIO_PADBAR + 0x0020, NORTHWEST),//Feature: SD_I2C MUX SEL Net in Sch: INA_MUX_SEL
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_LPSS_I2C[] =
+BXT_GPIO_PAD_INIT mMinnow3_GpioInitData_LPSS_I2C[] =
{
BXT_GPIO_PAD_CONF(L"GPIO_134 LPSS_I2C5_SDA", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, HizRx0I, EnPd, GPIO_PADBAR+0x0050, WEST),
BXT_GPIO_PAD_CONF(L"GPIO_135 LPSS_I2C5_SCL", M1 , NA , NA , NA , NA , Wake_Disabled, P_20K_H, NA , NA, HizRx0I, EnPd, GPIO_PADBAR+0x0058, WEST),
@@ -370,7 +370,7 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_LPSS_I2C[] =
};
-BXT_GPIO_PAD_INIT LomDisableGpio[] =
+BXT_GPIO_PAD_INIT Minnow3LomDisableGpio[] =
{
//
// LAN
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c
index 114c3c9ac..ac6bf58c1 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c
@@ -81,7 +81,7 @@ MinnowBoard3PostMemInitCallback (
//
// Set init function PCD
//
- PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) MultiPlatformInfoInit);
+ PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) Minnow3MultiPlatformInfoInit);
//
// Add init steps here
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.h
index fa3919e3c..b00f53e5f 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.h
@@ -14,8 +14,8 @@
**/
-#ifndef _BOARDINIT_H_
-#define _BOARDINIT_H_
+#ifndef _MINNOW3_BOARDINIT_H_
+#define _MINNOW3_BOARDINIT_H_
#include <PiPei.h>
#include <Library/IoLib.h>
@@ -23,7 +23,7 @@
#include <Library/TimerLib.h>
#include <Guid/PlatformInfo_Aplk.h>
-VOID GpioTest (VOID);
+VOID Minnow3GpioTest (VOID);
#endif
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.c
index 0d40777b6..dc63725f6 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.c
@@ -25,11 +25,11 @@
**/
VOID
-GpioGroupTierInit (
+Minnow3GpioGroupTierInit (
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
{
- DEBUG ((DEBUG_INFO, "GpioGroupTierInit Start\n"));
+ DEBUG ((DEBUG_INFO, "Minnow3GpioGroupTierInit Start\n"));
switch (PlatformInfoHob->BoardId) {
default:
GpioSetGroupToGpeDwX (GPIO_BXTP_GROUP_7, // map group 7 to GPE 0 ~ 31
@@ -38,13 +38,13 @@ GpioGroupTierInit (
break;
}
- DEBUG ((DEBUG_INFO, "GpioGroupTierInit End\n"));
+ DEBUG ((DEBUG_INFO, "Minnow3GpioGroupTierInit End\n"));
}
EFI_STATUS
EFIAPI
-MultiPlatformInfoInit (
+Minnow3MultiPlatformInfoInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN OUT EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
@@ -110,30 +110,30 @@ MultiPlatformInfoInit (
//
// Get GPIO table
//
- Status = MultiPlatformGpioTableInit (PeiServices, PlatformInfoHob);
+ Status = Minnow3MultiPlatformGpioTableInit (PeiServices, PlatformInfoHob);
ASSERT_EFI_ERROR (Status);
//
// Program GPIO
//
- Status = MultiPlatformGpioProgram (PeiServices, PlatformInfoHob);
+ Status = Minnow3MultiPlatformGpioProgram (PeiServices, PlatformInfoHob);
if (GetBxtSeries () == BxtP) {
- GpioGroupTierInit (PlatformInfoHob);
+ Minnow3GpioGroupTierInit (PlatformInfoHob);
}
//
// Update OemId
//
- Status = InitializeBoardOemId (PeiServices, PlatformInfoHob);
- Status = InitializeBoardSsidSvid (PeiServices, PlatformInfoHob);
+ Status = Minnow3InitializeBoardOemId (PeiServices, PlatformInfoHob);
+ Status = Minnow3InitializeBoardSsidSvid (PeiServices, PlatformInfoHob);
return EFI_SUCCESS;
}
EFI_STATUS
-InitializeBoardOemId (
+Minnow3InitializeBoardOemId (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
@@ -158,7 +158,7 @@ InitializeBoardOemId (
}
EFI_STATUS
-InitializeBoardSsidSvid (
+Minnow3InitializeBoardSsidSvid (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
)
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h
index 8ae5f7c3d..2c8c7eb80 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h
@@ -2,7 +2,7 @@
Multiplatform initialization header file.
This file includes package header files, library classes.
- Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 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
@@ -14,8 +14,8 @@
**/
-#ifndef _MULTIPLATFORM_LIB_H_
-#define _MULTIPLATFORM_LIB_H_
+#ifndef _MINNOW_MULTIPLATFORM_LIB_H_
+#define _MINNOW_MULTIPLATFORM_LIB_H_
#define LEN_64M 0x4000000
//
@@ -88,37 +88,37 @@
#define SUBSYSTEM_SVID_SSID (SUBSYSTEM_VENDOR_ID + (SUBSYSTEM_DEVICE_ID << 16))
EFI_STATUS
-GetPlatformInfoHob (
+Minnow3GetPlatformInfoHob (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT EFI_PLATFORM_INFO_HOB **PlatformInfoHob
);
EFI_STATUS
-MultiPlatformGpioTableInit (
+Minnow3MultiPlatformGpioTableInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-MultiPlatformGpioProgram (
+Minnow3MultiPlatformGpioProgram (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-MultiPlatformInfoInit (
+Minnow3MultiPlatformInfoInit (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN OUT EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-InitializeBoardOemId (
+Minnow3InitializeBoardOemId (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
EFI_STATUS
-InitializeBoardSsidSvid (
+Minnow3InitializeBoardSsidSvid (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PLATFORM_INFO_HOB *PlatformInfoHob
);
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/PlatformInfoHob.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/PlatformInfoHob.c
index 8dac0ba28..871e2206d 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/PlatformInfoHob.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/PlatformInfoHob.c
@@ -1,7 +1,7 @@
/** @file
This file does Multiplatform initialization.
- Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 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,7 +26,7 @@
**/
EFI_STATUS
-GetPlatformInfoHob (
+Minnow3GetPlatformInfoHob (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT EFI_PLATFORM_INFO_HOB **PlatformInfoHob
)
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.c
index bb82d4e2d..720d11add 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.c
@@ -1,7 +1,7 @@
/** @file
Board Init driver.
- Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 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
@@ -31,14 +31,14 @@ MinnowBoard3PreMemInit (
IN PEI_BOARD_PRE_MEM_INIT_PPI *This
);
-static PEI_BOARD_PRE_MEM_INIT_PPI mPreMemInitPpiInstance = {
+static PEI_BOARD_PRE_MEM_INIT_PPI mMinnow3PreMemInitPpiInstance = {
MinnowBoard3PreMemInit
};
static EFI_PEI_PPI_DESCRIPTOR mMinnowBoard3PreMemInitPpi = {
(EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
&gBoardPreMemInitPpiGuid,
- &mPreMemInitPpiInstance
+ &mMinnow3PreMemInitPpiInstance
};
static EFI_PEI_PPI_DESCRIPTOR mMinnowBoard3PreMemInitDonePpi = {
@@ -77,7 +77,7 @@ MinnowBoard3PreMemInit (
//
// Pre Mem Board Init
//
- Status = GetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId);
+ Status = Minnow3GetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId);
if (BoardId != (UINT8) BOARD_ID_MINNOW) {
DEBUG ((EFI_D_INFO, "Not a Minnow Board - skip\n"));
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.h
index fa3919e3c..59c2d7f1f 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.h
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.h
@@ -14,8 +14,8 @@
**/
-#ifndef _BOARDINIT_H_
-#define _BOARDINIT_H_
+#ifndef _MINNOW_BOARDINIT_H_
+#define _MINNOW_BOARDINIT_H_
#include <PiPei.h>
#include <Library/IoLib.h>
@@ -23,7 +23,7 @@
#include <Library/TimerLib.h>
#include <Guid/PlatformInfo_Aplk.h>
-VOID GpioTest (VOID);
+VOID MinnowGpioTest (VOID);
#endif
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitMiscs.h
index bb8c4aa96..813b023c9 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitMiscs.h
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInitMiscs.h
@@ -2,7 +2,7 @@
Multiplatform initialization header file.
This file includes package header files, library classes.
- Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 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
@@ -14,8 +14,8 @@
**/
-#ifndef _MULTIPLATFORM_LIB_H_
-#define _MULTIPLATFORM_LIB_H_
+#ifndef _MINNOW_MULTIPLATFORM_LIB_H_
+#define _MINNOW_MULTIPLATFORM_LIB_H_
#include <BoardFunctionsPei.h>
#include <Guid/SetupVariable.h>
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c
index bacdab1f2..5b9da16d5 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c
@@ -22,7 +22,7 @@
EFI_STATUS
EFIAPI
-GetEmbeddedBoardIdFabId(
+Minnow3GetEmbeddedBoardIdFabId(
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -89,7 +89,7 @@ GetEmbeddedBoardIdFabId(
(((GpioPadRead (GetCommOffset (NORTHWEST, 0x00C8) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 2) | \
(((GpioPadRead (GetCommOffset (NORTH, 0x01E0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3));
- DEBUG ((DEBUG_INFO, "BoardId from PMIC strap: %02X\n", *BoardId));
+ DEBUG ((DEBUG_INFO, "BoardId: %02X\n", *BoardId));
//
// Fab_ID0: PMIC_I2C_SDA
@@ -147,7 +147,7 @@ GetEmbeddedBoardIdFabId(
(((GpioPadRead (GetCommOffset (NORTHWEST, 0x00D8) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 2) | \
(((GpioPadRead (GetCommOffset (NORTHWEST, 0x00E0) + BXT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3));
- DEBUG ((EFI_D_INFO, "FabId from PMIC strap: %02X\n", *FabId));
+ DEBUG ((EFI_D_INFO, "FabId: %02X\n", *FabId));
return EFI_SUCCESS;
@@ -156,7 +156,7 @@ GetEmbeddedBoardIdFabId(
EFI_STATUS
EFIAPI
-GetIVIBoardIdFabId (
+MinnowGetIVIBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.h
index 3999aaa72..fa6570be0 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.h
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.h
@@ -1,7 +1,7 @@
/** @file
Header file for the Platform ID code.
- Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2015 - 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
@@ -13,8 +13,8 @@
**/
-#ifndef __PLATFORM_ID_H__
-#define __PLATFORM_ID_H__
+#ifndef __MINNOWBOARD_PLATFORM_ID_H__
+#define __MINNOWBOARD_PLATFORM_ID_H__
//
// Strap Fw Cfg ID define
@@ -27,14 +27,14 @@
EFI_STATUS
EFIAPI
-GetFwCfgId (
+Minnow3GetFwCfgId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *FwCfgId
);
EFI_STATUS
EFIAPI
-GetBoardIdFabId (
+Minnow3GetBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -42,7 +42,7 @@ GetBoardIdFabId (
EFI_STATUS
EFIAPI
-GetEmbeddedBoardIdFabId (
+Minnow3GetEmbeddedBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -50,7 +50,7 @@ GetEmbeddedBoardIdFabId (
EFI_STATUS
EFIAPI
-GetIVIBoardIdFabId (
+Minnow3GetIVIBoardIdFabId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BoardId,
OUT UINT8 *FabId
@@ -58,21 +58,21 @@ GetIVIBoardIdFabId (
EFI_STATUS
EFIAPI
-GetDockId (
+Minnow3GetDockId (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *DockId
);
EFI_STATUS
EFIAPI
-GetOsSelPss (
+Minnow3GetOsSelPss (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *OsSelPss
);
EFI_STATUS
EFIAPI
-GetBomIdPss (
+Minnow3GetBomIdPss (
IN CONST EFI_PEI_SERVICES **PeiServices,
OUT UINT8 *BomIdPss
);
--
2.11.0.windows.1
reply other threads:[~2017-07-13 14:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170713144222.15908-1-david.wei@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox