Removes BoardFuncInit related functionality in WhiskeylakeURvp.
Co-authored-by: Michael Kubacki <michael.a.kuba...@intel.com>
Cc: Chasel Chiu <chasel.c...@intel.com>
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
Signed-off-by: Prince Agyeman <prince.agye...@intel.com>
---
.../Library/BoardInitLib/BoardFunc.c | 19 ------------
.../Library/BoardInitLib/BoardFunc.h | 20 -------------
.../Library/BoardInitLib/BoardFuncInit.c | 26 -----------------
.../BoardInitLib/BoardFuncInitPreMem.c | 29 +++++--------------
.../BoardInitLib/BoardPchInitPreMemLib.c | 3 +-
.../PeiMultiBoardInitPostMemLib.inf | 4 ---
.../PeiWhiskeylakeURvpInitPostMemLib.c | 8 -----
.../PeiWhiskeylakeURvpInitPreMemLib.c | 10 +------
8 files changed, 9 insertions(+), 110 deletions(-)
delete mode 100644
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFunc.c
delete mode 100644
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFunc.h
delete mode 100644
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFuncInit.c
diff --git
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFunc.c
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFunc.c
deleted file mode 100644
index 7a2fed9904..0000000000
---
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFunc.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/** @file
- Board's PCD function hook.
-
-
- Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
- SPDX-License-Identifier: BSD-2-Clause-Patent
-**/
-
-#include <PiPei.h>
-
-EFI_STATUS
-PeiBoardSpecificInitPostMemNull (
- VOID
- )
-{
- return EFI_SUCCESS;
-}
-
-
diff --git
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFunc.h
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFunc.h
deleted file mode 100644
index 9e0ff8d033..0000000000
---
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFunc.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/** @file
- Header file for Board Hook function intance.
-
-
- Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
- SPDX-License-Identifier: BSD-2-Clause-Patent
-**/
-
-#ifndef _BOARD_FUNC_H_
-#define _BOARD_FUNC_H_
-
-#include <Uefi.h>
-
-EFI_STATUS
-PeiBoardSpecificInitPostMemNull (
- VOID
- );
-
-#endif // _BOARD_FUNC_H_
-
diff --git
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFuncInit.c
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFuncInit.c
deleted file mode 100644
index b8c69166ed..0000000000
---
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFuncInit.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/** @file
- Source code for the board configuration init function in Post Memory init
phase.
-
-
- Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
- SPDX-License-Identifier: BSD-2-Clause-Patent
-**/
-
-#include "BoardFunc.h"
-
-/**
- Board's PCD function hook init function for PEI post memory phase.
-
- @param[in] BoardId An unsigned integrer represent the board id.
-
- @retval EFI_SUCCESS The function completed successfully.
-**/
-EFI_STATUS
-BoardFunctionInit (
- IN UINT16 BoardId
-)
-{
-
- return EFI_SUCCESS;
-}
-
diff --git
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFuncInitPreMem.c
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFuncInitPreMem.c
index 1944a02bf1..06ff64da8d 100644
---
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFuncInitPreMem.c
+++
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardFuncInitPreMem.c
@@ -2,39 +2,24 @@
Source code for the board configuration init function in Post Memory init
phase.
- Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <GopConfigLib.h>
+
//
// Null function for nothing GOP VBT update.
//
VOID
-GopVbtSpecificUpdateNull(
+GopVbtSpecificUpdateNull (
IN CHILD_STRUCT **ChildStructPtr
-);
+ );
+
//
// for CFL U DDR4
//
VOID
-CflUDdr4GopVbtSpecificUpdate(
+CflUDdr4GopVbtSpecificUpdate (
IN CHILD_STRUCT **ChildStructPtr
-);
-/**
- Board's PCD function hook init function for PEI post memory phase.
-
- @param[in] BoardId An unsigned integrer represent the board id.
-
- @retval EFI_SUCCESS The function completed successfully.
-**/
-EFI_STATUS
-BoardFunctionInitPreMem (
- IN UINT16 BoardId
- )
-{
-
- return EFI_SUCCESS;
-}
-
-
+ );
diff --git
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardPchInitPreMemLib.c
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardPchInitPreMemLib.c
index 5305ec7f7c..1f778c4f7e 100644
---
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardPchInitPreMemLib.c
+++
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/BoardPchInitPreMemLib.c
@@ -2,7 +2,7 @@
Source code for the board PCH configuration Pcd init functions for Pre-Memory
Init phase.
- Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -310,7 +310,6 @@ GpioGroupTierInit (
//
// GPIO Group Tier
//
-
switch (BoardId) {
case BoardIdWhiskeyLakeRvp:
PcdSet32S (PcdGpioGroupToGpeDw0, GPIO_CNL_LP_GROUP_GPP_G);
diff --git
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
index 436314a6a3..845790209f 100644
---
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
+++
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
@@ -44,13 +44,9 @@
[Sources]
PeiWhiskeylakeURvpInitPostMemLib.c
PeiMultiBoardInitPostMemLib.c
- BoardFunc.c
- BoardFuncInit.c
GpioTableDefault.c
GpioTableWhiskeylakeUDdr4Rvp.c
-[FixedPcd]
-
[Pcd]
gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable
gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize
diff --git
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
index f704c42f2d..c61743acdc 100644
---
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
+++
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
@@ -33,11 +33,6 @@
#include "WhiskeylakeURvpInit.h"
#include <Library/ConfigBlockLib.h>
-EFI_STATUS
-BoardFunctionInit (
- IN UINT16 BoardId
- );
-
/**
GPIO init function for PEI post memory phase.
@@ -168,9 +163,6 @@ BoardConfigInit (
Status = BoardMiscInit (BoardId);
ASSERT_EFI_ERROR (Status);
- Status = BoardFunctionInit (BoardId);
- ASSERT_EFI_ERROR (Status);
-
Status = BoardSecurityInit (BoardId);
ASSERT_EFI_ERROR (Status);
}
diff --git
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPreMemLib.c
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPreMemLib.c
index 75813ff351..69fed14c06 100644
---
a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPreMemLib.c
+++
b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPreMemLib.c
@@ -1,6 +1,6 @@
/** @file
- Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -120,11 +120,6 @@ SaDisplayConfigInit (
IN UINT16 BoardId
);
-EFI_STATUS
-BoardFunctionInitPreMem (
- IN UINT16 BoardId
- );
-
EFI_STATUS
EFIAPI
PlatformInitPreMemCallBack (
@@ -273,9 +268,6 @@ BoardConfigInitPreMem (
Status = SaDisplayConfigInit (BoardId);
ASSERT_EFI_ERROR (Status);
-
- Status = BoardFunctionInitPreMem (BoardId);
- ASSERT_EFI_ERROR (Status);
}
/**
--
2.19.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#54816): https://edk2.groups.io/g/devel/message/54816
Mute This Topic: https://groups.io/mt/71545527/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
