[edk2-devel][edk2-platforms][PATCH V1 1/1] IpmiFeaturePkg/Build: Fix DSC organization issues

[edk2-devel][edk2-platforms][PATCH V1 1/1] IpmiFeaturePkg/Build: Fix DSC organization issues

[Isaac Oram]

Move libraries from [Components] to [LibraryClasses]
Match build to library supported build types
Add missing SmmGenericIpmi.inf driver
Move common library include to package build as this feature
should not choose common libraries for board use

Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
 .../IpmiFeaturePkg/Include/IpmiFeature.dsc    | 24 +++++++------------
 .../IpmiFeaturePkg/IpmiFeaturePkg.dsc         |  1 +
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature.dsc b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature.dsc
index 237a4fc006..958ed1420d 100644
--- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature.dsc
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature.dsc
@@ -31,20 +31,23 @@
 #
 ################################################################################
 
-!include MdePkg/MdeLibs.dsc.inc
-
 [LibraryClasses]
   IpmiLib|MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf
 
   IpmiCommandLib|IpmiFeaturePkg/Library/IpmiCommandLib/IpmiCommandLib.inf
   IpmiPlatformHookLib|IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf
 
-[LibraryClasses.common.PEI_CORE,LibraryClasses.common.PEIM]
+[LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]
   IpmiBaseLib|IpmiFeaturePkg/Library/PeiIpmiBaseLib/PeiIpmiBaseLib.inf
 
-[LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.UEFI_DRIVER]
+[LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION]
   IpmiBaseLib|IpmiFeaturePkg/Library/IpmiBaseLib/IpmiBaseLib.inf
 
+[LibraryClasses.common.SMM_CORE, LibraryClasses.common.DXE_SMM_DRIVER]
+  IpmiBaseLib|IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf
+
+
+
 ################################################################################
 #
 # Component section - list of all components that need built for this feature.
@@ -70,11 +73,6 @@
   # IPMI Feature Package
   #####################################
 
-  # Add library instances here that are not included in package components and should be tested
-  # in the package build.
-
-  IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf
-
   #
   # Add components here that should be included in the package build.
   #
@@ -93,16 +91,10 @@
   # IPMI Feature Package
   #####################################
 
-  # Add library instances here that are not included in package components and should be tested
-  # in the package build.
-
-  IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.inf
-
   #
   # Add components here that should be included in the package build.
   #
   IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf
-  IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf
   IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf
   IpmiFeaturePkg/BmcElog/BmcElog.inf
   IpmiFeaturePkg/Frb/FrbDxe.inf
@@ -110,3 +102,5 @@
   IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
   IpmiFeaturePkg/OsWdt/OsWdt.inf
   IpmiFeaturePkg/SolStatus/SolStatus.inf
+
+  IpmiFeaturePkg/GenericIpmi/Smm/SmmGenericIpmi.inf
diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc
index 76d2c45a73..cee7c7e065 100644
--- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc
@@ -38,6 +38,7 @@
 #
 # Include common libraries
 #
+!include MdePkg/MdeLibs.dsc.inc
 !include MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
 !include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
 !include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
-- 
2.39.0.windows.1