Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc | 2 +- Silicon/Intel/{CoffeelakeSiliconPkg => IntelSiliconPkg}/Include/Library/ConfigBlockLib.h | 0 Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h | 64 ---------------------------------------------------------------- 3 files changed, 1 insertion(+), 65 deletions(-)
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2318
Create header for BaseConfigBlockLib in InstelSiliconPkg and remove all other ConfigBlock.h
Signed-off-by: Ethan Tsao <ethan.tsao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
---
Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc | 2 +-
Silicon/Intel/{CoffeelakeSiliconPkg => IntelSiliconPkg}/Include/Library/ConfigBlockLib.h | 0
Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h | 64 ----------------------------------------------------------------
3 files changed, 1 insertion(+), 65 deletions(-)
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc b/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc
index 37c77d8f63..702a833cc4 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc
@@ -147,7 +147,7 @@ gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate|0
# Silicon Init Common Library
#
!include $(PLATFORM_SI_PACKAGE)/SiPkgCommonLib.dsc
-ConfigBlockLib|ClientSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf
+ConfigBlockLib|IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf
PchTraceHubInitLib|ClientSiliconPkg/Library/BasePchTraceHubInitLib/BasePchTraceHubInitLib.inf
[LibraryClasses.IA32]
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h b/Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h
similarity index 100%
rename from Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h
rename to Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
deleted file mode 100644
index 04c8ec5cca..0000000000
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/** @file
- Header file for Config Block Lib implementation
-
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef _CONFIG_BLOCK_LIB_H_
-#define _CONFIG_BLOCK_LIB_H_
-
-/**
- Create config block table
-
- @param[in] TotalSize - Max size to be allocated for the Config Block Table
- @param[out] ConfigBlockTableAddress - On return, points to a pointer to the beginning of Config Block Table Address
-
- @retval EFI_INVALID_PARAMETER - Invalid Parameter
- @retval EFI_OUT_OF_RESOURCES - Out of resources
- @retval EFI_SUCCESS - Successfully created Config Block Table at ConfigBlockTableAddress
-**/
-EFI_STATUS
-EFIAPI
-CreateConfigBlockTable (
- IN UINT16 TotalSize,
- OUT VOID **ConfigBlockTableAddress
- );
-
-/**
- Add config block into config block table structure
-
- @param[in] ConfigBlockTableAddress - A pointer to the beginning of Config Block Table Address
- @param[out] ConfigBlockAddress - On return, points to a pointer to the beginning of Config Block Address
-
- @retval EFI_OUT_OF_RESOURCES - Config Block Table is full and cannot add new Config Block or
- Config Block Offset Table is full and cannot add new Config Block.
- @retval EFI_SUCCESS - Successfully added Config Block
-**/
-EFI_STATUS
-EFIAPI
-AddConfigBlock (
- IN VOID *ConfigBlockTableAddress,
- OUT VOID **ConfigBlockAddress
- );
-
-/**
- Retrieve a specific Config Block data by GUID
-
- @param[in] ConfigBlockTableAddress - A pointer to the beginning of Config Block Table Address
- @param[in] ConfigBlockGuid - A pointer to the GUID uses to search specific Config Block
- @param[out] ConfigBlockAddress - On return, points to a pointer to the beginning of Config Block Address
-
- @retval EFI_NOT_FOUND - Could not find the Config Block
- @retval EFI_SUCCESS - Config Block found and return
-**/
-EFI_STATUS
-EFIAPI
-GetConfigBlock (
- IN VOID *ConfigBlockTableAddress,
- IN EFI_GUID *ConfigBlockGuid,
- OUT VOID **ConfigBlockAddress
- );
-
-#endif // _CONFIG_BLOCK_LIB_H_
--
2.16.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#52506): https://edk2.groups.io/g/devel/message/52506
Mute This Topic: https://groups.io/mt/69227841/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Ray Ni <ray.ni@intel.com> > -----Original Message----- > From: Tsao, Ethan <ethan.tsao@intel.com> > Sent: Monday, December 23, 2019 4:25 PM > To: devel@edk2.groups.io > Cc: Ni, Ray <ray.ni@intel.com>; Chaganty, Rangasai V > <rangasai.v.chaganty@intel.com> > Subject: [Patch v2] IntelSiliconPkg/Include/Library:Add ConfigBlockLib.h > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2318 > > Create header for BaseConfigBlockLib in InstelSiliconPkg and remove all other > ConfigBlock.h > > Signed-off-by: Ethan Tsao <ethan.tsao@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com> > --- > Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc | > 2 +- > Silicon/Intel/{CoffeelakeSiliconPkg => > IntelSiliconPkg}/Include/Library/ConfigBlockLib.h | 0 > Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h > | 64 ---------------------------------------------------------------- > 3 files changed, 1 insertion(+), 65 deletions(-) > > diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc > b/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc > index 37c77d8f63..702a833cc4 100644 > --- a/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc > +++ b/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc > @@ -147,7 +147,7 @@ > gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate|0 > # Silicon Init Common Library > # > !include $(PLATFORM_SI_PACKAGE)/SiPkgCommonLib.dsc > - > ConfigBlockLib|ClientSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlock > Lib.inf > +ConfigBlockLib|IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlock > Lib.inf > > PchTraceHubInitLib|ClientSiliconPkg/Library/BasePchTraceHubInitLib/BasePc > hTraceHubInitLib.inf > > [LibraryClasses.IA32] > diff --git > a/Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h > b/Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h > similarity index 100% > rename from > Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h > rename to Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h > diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h > b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h > deleted file mode 100644 > index 04c8ec5cca..0000000000 > --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h > +++ /dev/null > @@ -1,64 +0,0 @@ > -/** @file > - Header file for Config Block Lib implementation > - > -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR> > -SPDX-License-Identifier: BSD-2-Clause-Patent > - > -**/ > - > -#ifndef _CONFIG_BLOCK_LIB_H_ > -#define _CONFIG_BLOCK_LIB_H_ > - > -/** > - Create config block table > - > - @param[in] TotalSize - Max size to be allocated for the Config > Block Table > - @param[out] ConfigBlockTableAddress - On return, points to a pointer > to the beginning of Config Block Table Address > - > - @retval EFI_INVALID_PARAMETER - Invalid Parameter > - @retval EFI_OUT_OF_RESOURCES - Out of resources > - @retval EFI_SUCCESS - Successfully created Config Block Table at > ConfigBlockTableAddress > -**/ > -EFI_STATUS > -EFIAPI > -CreateConfigBlockTable ( > - IN UINT16 TotalSize, > - OUT VOID **ConfigBlockTableAddress > - ); > - > -/** > - Add config block into config block table structure > - > - @param[in] ConfigBlockTableAddress - A pointer to the beginning of > Config Block Table Address > - @param[out] ConfigBlockAddress - On return, points to a pointer to > the beginning of Config Block Address > - > - @retval EFI_OUT_OF_RESOURCES - Config Block Table is full and cannot > add new Config Block or > - Config Block Offset Table is full and cannot add new Config > Block. > - @retval EFI_SUCCESS - Successfully added Config Block > -**/ > -EFI_STATUS > -EFIAPI > -AddConfigBlock ( > - IN VOID *ConfigBlockTableAddress, > - OUT VOID **ConfigBlockAddress > - ); > - > -/** > - Retrieve a specific Config Block data by GUID > - > - @param[in] ConfigBlockTableAddress - A pointer to the beginning of > Config Block Table Address > - @param[in] ConfigBlockGuid - A pointer to the GUID uses to > search specific Config Block > - @param[out] ConfigBlockAddress - On return, points to a pointer to > the beginning of Config Block Address > - > - @retval EFI_NOT_FOUND - Could not find the Config Block > - @retval EFI_SUCCESS - Config Block found and return > -**/ > -EFI_STATUS > -EFIAPI > -GetConfigBlock ( > - IN VOID *ConfigBlockTableAddress, > - IN EFI_GUID *ConfigBlockGuid, > - OUT VOID **ConfigBlockAddress > - ); > - > -#endif // _CONFIG_BLOCK_LIB_H_ > -- > 2.16.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#52514): https://edk2.groups.io/g/devel/message/52514 Mute This Topic: https://groups.io/mt/69227841/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
Hi Ray, ConfigBlockLib consume the data structure from ConfigBlock.h. Which is located in KabylakeSiliconPkg and CoffeelakeSiliconPkg. Should we copy them to IntelSiliconPkg as well and delete? Best Regards, Ethan > -----Original Message----- > From: Ni, Ray <ray.ni@intel.com> > Sent: Tuesday, December 24, 2019 10:04 AM > To: Tsao, Ethan <ethan.tsao@intel.com>; devel@edk2.groups.io > Cc: Chaganty, Rangasai V <rangasai.v.chaganty@intel.com> > Subject: RE: [Patch v2] IntelSiliconPkg/Include/Library:Add ConfigBlockLib.h > > Reviewed-by: Ray Ni <ray.ni@intel.com> > > > -----Original Message----- > > From: Tsao, Ethan <ethan.tsao@intel.com> > > Sent: Monday, December 23, 2019 4:25 PM > > To: devel@edk2.groups.io > > Cc: Ni, Ray <ray.ni@intel.com>; Chaganty, Rangasai V > > <rangasai.v.chaganty@intel.com> > > Subject: [Patch v2] IntelSiliconPkg/Include/Library:Add > > ConfigBlockLib.h > > > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2318 > > > > Create header for BaseConfigBlockLib in InstelSiliconPkg and remove > > all other ConfigBlock.h > > > > Signed-off-by: Ethan Tsao <ethan.tsao@intel.com> > > Cc: Ray Ni <ray.ni@intel.com> > > Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com> > > --- > > Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc | > > 2 +- > > Silicon/Intel/{CoffeelakeSiliconPkg => > > IntelSiliconPkg}/Include/Library/ConfigBlockLib.h | 0 > > Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h > > | 64 ---------------------------------------------------------------- > > 3 files changed, 1 insertion(+), 65 deletions(-) > > > > diff --git > > a/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc > > b/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc > > index 37c77d8f63..702a833cc4 100644 > > --- a/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc > > +++ b/Silicon/Intel/CoffeelakeSiliconPkg/CoffeelakeSiliconPkg.dsc > > @@ -147,7 +147,7 @@ > > gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate|0 > > # Silicon Init Common Library > > # > > !include $(PLATFORM_SI_PACKAGE)/SiPkgCommonLib.dsc > > - > > ConfigBlockLib|ClientSiliconPkg/Library/BaseConfigBlockLib/BaseConfigB > > ConfigBlockLib|lock > > Lib.inf > > +ConfigBlockLib|IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigB > > +ConfigBlockLib|lock > > Lib.inf > > > > PchTraceHubInitLib|ClientSiliconPkg/Library/BasePchTraceHubInitLib/Bas > > PchTraceHubInitLib|ePc > > hTraceHubInitLib.inf > > > > [LibraryClasses.IA32] > > diff --git > > a/Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h > > b/Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h > > similarity index 100% > > rename from > > Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h > > rename to > > Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h > > diff --git > > a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h > > b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h > > deleted file mode 100644 > > index 04c8ec5cca..0000000000 > > --- > > a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h > > +++ /dev/null > > @@ -1,64 +0,0 @@ > > -/** @file > > - Header file for Config Block Lib implementation > > - > > -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR> > > -SPDX-License-Identifier: BSD-2-Clause-Patent > > - > > -**/ > > - > > -#ifndef _CONFIG_BLOCK_LIB_H_ > > -#define _CONFIG_BLOCK_LIB_H_ > > - > > -/** > > - Create config block table > > - > > - @param[in] TotalSize - Max size to be allocated for the Config > > Block Table > > - @param[out] ConfigBlockTableAddress - On return, points to a pointer > > to the beginning of Config Block Table Address > > - > > - @retval EFI_INVALID_PARAMETER - Invalid Parameter > > - @retval EFI_OUT_OF_RESOURCES - Out of resources > > - @retval EFI_SUCCESS - Successfully created Config Block Table at > > ConfigBlockTableAddress > > -**/ > > -EFI_STATUS > > -EFIAPI > > -CreateConfigBlockTable ( > > - IN UINT16 TotalSize, > > - OUT VOID **ConfigBlockTableAddress > > - ); > > - > > -/** > > - Add config block into config block table structure > > - > > - @param[in] ConfigBlockTableAddress - A pointer to the beginning of > > Config Block Table Address > > - @param[out] ConfigBlockAddress - On return, points to a pointer to > > the beginning of Config Block Address > > - > > - @retval EFI_OUT_OF_RESOURCES - Config Block Table is full and > > cannot add new Config Block or > > - Config Block Offset Table is full and cannot add new Config > > Block. > > - @retval EFI_SUCCESS - Successfully added Config Block > > -**/ > > -EFI_STATUS > > -EFIAPI > > -AddConfigBlock ( > > - IN VOID *ConfigBlockTableAddress, > > - OUT VOID **ConfigBlockAddress > > - ); > > - > > -/** > > - Retrieve a specific Config Block data by GUID > > - > > - @param[in] ConfigBlockTableAddress - A pointer to the beginning of > > Config Block Table Address > > - @param[in] ConfigBlockGuid - A pointer to the GUID uses to > > search specific Config Block > > - @param[out] ConfigBlockAddress - On return, points to a pointer to > > the beginning of Config Block Address > > - > > - @retval EFI_NOT_FOUND - Could not find the Config Block > > - @retval EFI_SUCCESS - Config Block found and return > > -**/ > > -EFI_STATUS > > -EFIAPI > > -GetConfigBlock ( > > - IN VOID *ConfigBlockTableAddress, > > - IN EFI_GUID *ConfigBlockGuid, > > - OUT VOID **ConfigBlockAddress > > - ); > > - > > -#endif // _CONFIG_BLOCK_LIB_H_ > > -- > > 2.16.2.windows.1 > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#52542): https://edk2.groups.io/g/devel/message/52542 Mute This Topic: https://groups.io/mt/69227841/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.