Move AcpiDebug module from AdvancedFeaturePkg to DebugFeaturePkg.
Signed-off-by: Eric Dong <eric.d...@intel.com>
Cc: Liming Gao <liming....@intel.com>
---
.../AdvancedFeaturePkg/AdvancedFeaturePkg.dec | 6 ------
.../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 3 ---
.../AcpiDebug/AcpiDebug.asl | 0
.../AcpiDebug/AcpiDebug.c | 0
.../AcpiDebug/AcpiDebugDxe.inf | 8 ++++----
.../AcpiDebug/AcpiDebugSmm.inf | 8 ++++----
.../AcpiDebug/Readme.txt | 0
.../Intel/DebugFeaturePkg/DebugFeaturePkg.dec | 15 +++++++++++++--
.../Intel/DebugFeaturePkg/DebugFeaturePkg.dsc | 12 ++++++++++++
9 files changed, 33 insertions(+), 19 deletions(-)
rename Platform/Intel/{AdvancedFeaturePkg =>
DebugFeaturePkg}/AcpiDebug/AcpiDebug.asl (100%)
rename Platform/Intel/{AdvancedFeaturePkg =>
DebugFeaturePkg}/AcpiDebug/AcpiDebug.c (100%)
rename Platform/Intel/{AdvancedFeaturePkg =>
DebugFeaturePkg}/AcpiDebug/AcpiDebugDxe.inf (79%)
rename Platform/Intel/{AdvancedFeaturePkg =>
DebugFeaturePkg}/AcpiDebug/AcpiDebugSmm.inf (80%)
rename Platform/Intel/{AdvancedFeaturePkg =>
DebugFeaturePkg}/AcpiDebug/Readme.txt (100%)
diff --git a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
index b18f81ba39..44e5de64db 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
+++ b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dec
@@ -140,17 +140,11 @@ gAdvancedFeaturePkgTokenSpaceGuid = {0xa8514688,
0x6693, 0x4ab5, {0xaa,
[PcdsFixedAtBuild]
gAdvancedFeaturePkgTokenSpaceGuid.PcdMaxSOLChannels|0x3|UINT8|0x40000009
- ## This PCD specifies AcpiDebug feature is enable/disable.
- gAdvancedFeaturePkgTokenSpaceGuid.PcdAcpiDebugEnable|FALSE|BOOLEAN|0x00000012
- ## This PCD specifies AcpiDebug buffer size.
-
gAdvancedFeaturePkgTokenSpaceGuid.PcdAcpiDebugBufferSize|0x10000|UINT32|0x00000013
[PcdsDynamic, PcdsDynamicEx]
gAdvancedFeaturePkgTokenSpaceGuid.PcdIpmiIoBaseAddress|0xCA2|UINT16|0x90000022
gAdvancedFeaturePkgTokenSpaceGuid.PcdFRB2EnabledFlag|TRUE|BOOLEAN|0x10000030
gAdvancedFeaturePkgTokenSpaceGuid.PcdFRBTimeoutValue|360|UINT16|0x10000040
- ## This PCD specifies AcpiDebug buffer address
- gAdvancedFeaturePkgTokenSpaceGuid.PcdAcpiDebugAddress|0|UINT32|0x00000014
[PcdsFeatureFlag]
gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable
|FALSE|BOOLEAN|0xF00000A1
diff --git a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
index 909e566445..ea1a00725d 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
+++ b/Platform/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
@@ -148,6 +148,3 @@
AdvancedFeaturePkg/Ipmi/IpmiFru/IpmiFru.inf
AdvancedFeaturePkg/Ipmi/BmcElog/BmcElog.inf
AdvancedFeaturePkg/Ipmi/BmcAcpi/BmcAcpi.inf
-
- AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
- AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
\ No newline at end of file
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
b/Platform/Intel/DebugFeaturePkg/AcpiDebug/AcpiDebug.asl
similarity index 100%
rename from Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.asl
rename to Platform/Intel/DebugFeaturePkg/AcpiDebug/AcpiDebug.asl
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
b/Platform/Intel/DebugFeaturePkg/AcpiDebug/AcpiDebug.c
similarity index 100%
rename from Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebug.c
rename to Platform/Intel/DebugFeaturePkg/AcpiDebug/AcpiDebug.c
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
b/Platform/Intel/DebugFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
similarity index 79%
rename from Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
rename to Platform/Intel/DebugFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
index fd701df3af..7473126b11 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
+++ b/Platform/Intel/DebugFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
@@ -32,12 +32,12 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- AdvancedFeaturePkg/AdvancedFeaturePkg.dec
+ DebugFeaturePkg/DebugFeaturePkg.dec
[Pcd]
- gAdvancedFeaturePkgTokenSpaceGuid.PcdAcpiDebugEnable ## CONSUMES
- gAdvancedFeaturePkgTokenSpaceGuid.PcdAcpiDebugBufferSize ## CONSUMES
- gAdvancedFeaturePkgTokenSpaceGuid.PcdAcpiDebugAddress ## PRODUCES
+ gDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugEnable ## CONSUMES
+ gDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugBufferSize ## CONSUMES
+ gDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugAddress ## PRODUCES
[Sources]
AcpiDebug.c
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
b/Platform/Intel/DebugFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
similarity index 80%
rename from Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
rename to Platform/Intel/DebugFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
index 26122abc6c..679f9eb014 100644
--- a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
+++ b/Platform/Intel/DebugFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
@@ -33,12 +33,12 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- AdvancedFeaturePkg/AdvancedFeaturePkg.dec
+ DebugFeaturePkg/DebugFeaturePkg.dec
[Pcd]
- gAdvancedFeaturePkgTokenSpaceGuid.PcdAcpiDebugEnable ## CONSUMES
- gAdvancedFeaturePkgTokenSpaceGuid.PcdAcpiDebugBufferSize ## CONSUMES
- gAdvancedFeaturePkgTokenSpaceGuid.PcdAcpiDebugAddress ## PRODUCES
+ gDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugEnable ## CONSUMES
+ gDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugBufferSize ## CONSUMES
+ gDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugAddress ## PRODUCES
[Sources]
AcpiDebug.c
diff --git a/Platform/Intel/AdvancedFeaturePkg/AcpiDebug/Readme.txt
b/Platform/Intel/DebugFeaturePkg/AcpiDebug/Readme.txt
similarity index 100%
rename from Platform/Intel/AdvancedFeaturePkg/AcpiDebug/Readme.txt
rename to Platform/Intel/DebugFeaturePkg/AcpiDebug/Readme.txt
diff --git a/Platform/Intel/DebugFeaturePkg/DebugFeaturePkg.dec
b/Platform/Intel/DebugFeaturePkg/DebugFeaturePkg.dec
index 63a6ed03b7..5bcbc0ef6b 100644
--- a/Platform/Intel/DebugFeaturePkg/DebugFeaturePkg.dec
+++ b/Platform/Intel/DebugFeaturePkg/DebugFeaturePkg.dec
@@ -26,7 +26,8 @@
Usb3DebugPortParameterLib|Include/Library/Usb3DebugPortParameterLib.h
[Guids]
- gEfiUsb3DebugPortTokenSpaceGuid = { 0x87e7378b, 0xc59d, 0x4a16, { 0xa4,
0x21, 0x2c, 0xdb, 0x78, 0x26, 0xb1, 0xca } }
+ gEfiUsb3DebugPortTokenSpaceGuid = { 0x87e7378b, 0xc59d, 0x4a16, { 0xa4,
0x21, 0x2c, 0xdb, 0x78, 0x26, 0xb1, 0xca } }
+ gDebugFeaturePkgTokenSpaceGuid = { 0xdbf3ac70, 0x3f73, 0x40aa, { 0xbd,
0xd6, 0xac, 0xf2, 0x1a, 0x1b, 0x2f, 0xe2 } }
[PcdsFeatureFlag]
## This PCD specifies whether StatusCode is reported via USB3 Serial port.
@@ -50,4 +51,14 @@
## This PCD sepcifies the start index in CMOS, it will occupy 1 bytes space.
gEfiUsb3DebugPortTokenSpaceGuid.PcdUsb3DebugPortDeviceIndex|0x5A|UINT8|0x10000025
## This PCD sepcifies the start index in CMOS, it will occupy 1 bytes space.
-
gEfiUsb3DebugPortTokenSpaceGuid.PcdUsb3DebugPortFunctionIndex|0x5B|UINT8|0x10000026
\ No newline at end of file
+
gEfiUsb3DebugPortTokenSpaceGuid.PcdUsb3DebugPortFunctionIndex|0x5B|UINT8|0x10000026
+
+ ## This PCD specifies AcpiDebug feature is enable/disable.
+ gDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugEnable|FALSE|BOOLEAN|0x00000012
+ ## This PCD specifies AcpiDebug buffer size.
+
gDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugBufferSize|0x10000|UINT32|0x00000013
+
+[PcdsDynamic, PcdsDynamicEx]
+ ## This PCD specifies AcpiDebug buffer address
+ gDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugAddress|0|UINT32|0x00000014
+
diff --git a/Platform/Intel/DebugFeaturePkg/DebugFeaturePkg.dsc
b/Platform/Intel/DebugFeaturePkg/DebugFeaturePkg.dsc
index aeca73a8c8..8b077167db 100644
--- a/Platform/Intel/DebugFeaturePkg/DebugFeaturePkg.dsc
+++ b/Platform/Intel/DebugFeaturePkg/DebugFeaturePkg.dsc
@@ -23,6 +23,10 @@
SKUID_IDENTIFIER = DEFAULT
[LibraryClasses]
+ #
+ # Entry point
+ #
+
UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
@@ -32,6 +36,10 @@
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+ DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
+ DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+ UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
+
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
[LibraryClasses.common.PEIM]
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
@@ -57,6 +65,7 @@
[LibraryClasses.common.DXE_SMM_DRIVER]
HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
+
SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
###################################################################################################
#
@@ -84,3 +93,6 @@
DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibDxeIoMmu.inf
DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibPei.inf
DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibDxe.inf
+
+ DebugFeaturePkg/AcpiDebug/AcpiDebugDxe.inf
+ DebugFeaturePkg/AcpiDebug/AcpiDebugSmm.inf
\ No newline at end of file
--
2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#41557): https://edk2.groups.io/g/devel/message/41557
Mute This Topic: https://groups.io/mt/31828872/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
