summaryrefslogtreecommitdiff
path: root/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem
diff options
context:
space:
mode:
Diffstat (limited to 'Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem')
-rw-r--r--Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.c80
-rw-r--r--Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.h32
-rw-r--r--Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c2
-rw-r--r--Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h6
-rw-r--r--Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitMiscs.c22
-rw-r--r--Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitMiscs.h16
-rw-r--r--Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/PlatformInfoHob.c2
7 files changed, 80 insertions, 80 deletions
diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.c
index 7523c00891..ad255ae98c 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 9777d75003..de1c47683a 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 9ae19e3871..501e810af6 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 fa3919e3c0..298613ae63 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 5b626a8942..b7718e8138 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 598fc9aef2..98100c2186 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 f84b32f21f..bb1e6672c1 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
)