diff options
author | zwei4 <david.wei@intel.com> | 2017-07-13 22:41:16 +0800 |
---|---|---|
committer | zwei4 <david.wei@intel.com> | 2017-07-13 22:41:16 +0800 |
commit | 3bfaf23e95c68881bcbbfedececdece4cdff95f8 (patch) | |
tree | a2fa529e7180bb207fde8f2cca3ba89adaa33184 /Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem | |
parent | 77de52c8dadec9e995590902dfd55b28ab2465e4 (diff) | |
download | edk2-platforms-3bfaf23e95c68881bcbbfedececdece4cdff95f8.tar.xz |
Multi board support.
Cleanup libraries for multi boards.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>
Diffstat (limited to 'Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem')
5 files changed, 22 insertions, 22 deletions
diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/BoardInit.c index cac4eb6e08..122ed9a89a 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 fa3919e3c0..0a549c2ddd 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 4223f115c8..ab61949885 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 bacdab1f22..e164cfda77 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 3999aaa726..7fc0cc3f92 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
);
|