From 3bfaf23e95c68881bcbbfedececdece4cdff95f8 Mon Sep 17 00:00:00 2001 From: zwei4 Date: Thu, 13 Jul 2017 22:41:16 +0800 Subject: Multi board support. Cleanup libraries for multi boards. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: zwei4 --- .../Board/MinnowBoard3/BoardInitPreMem/BoardInit.c | 8 ++++---- .../Board/MinnowBoard3/BoardInitPreMem/BoardInit.h | 6 +++--- .../MinnowBoard3/BoardInitPreMem/BoardInitMiscs.h | 6 +++--- .../Board/MinnowBoard3/BoardInitPreMem/PlatformId.c | 8 ++++---- .../Board/MinnowBoard3/BoardInitPreMem/PlatformId.h | 20 ++++++++++---------- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem') diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardInit.c index bb82d4e2dc..720d11add1 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.
+ Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
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 fa3919e3c0..59c2d7f1f5 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 #include @@ -23,7 +23,7 @@ #include #include -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 bb8c4aa967..813b023c93 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.
+ Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
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 #include diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/PlatformId.c index bacdab1f22..5b9da16d55 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 3999aaa726..fa6570be0e 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.
+ Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
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 ); -- cgit v1.2.3