diff options
| author | Sami Mujawar <sami.mujawar@arm.com> | 2019-02-16 12:10:02 +0000 |
|---|---|---|
| committer | Sami Mujawar <sami.mujawar@arm.com> | 2019-03-20 11:00:44 +0000 |
| commit | 1018bd4c79a69bb5dfa3b466de50404c487624c6 (patch) | |
| tree | ee4b67b3c6e975bca8513429376bd481ca3fb4d5 /DynamicTablesPkg | |
| parent | e12bdeb1c2ad6e3354e16309284aae6313a1fb43 (diff) | |
| download | edk2-1018bd4c79a69bb5dfa3b466de50404c487624c6.tar.gz edk2-1018bd4c79a69bb5dfa3b466de50404c487624c6.tar.bz2 edk2-1018bd4c79a69bb5dfa3b466de50404c487624c6.zip | |
DynamicTablesPkg: DGB2: Update DBG2_DEBUG_PORT_DDI
This patch was originally merged in edk2 master at
6814256083a90ef218e7ae240e51922045175df1. However, this was
later reverted at db8382ef5e44bd07654fb4726b77f3c329210561
as it was merged during the Soft Feature Freeze for
edk2-stable201903.
Resubmitting this patch as the edk2 merge window is now open.
The DBG2_DEBUG_PORT_DDI() macro supports adding only one
Generic Base Address Register. Therefore, removed the
superfluous parameter NumReg and updated the macro to
use DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS which has
a value 1.
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Alexei Fedorov <alexei.fedorov@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Alexei Fedorov <alexei.fedorov@arm.com>
Diffstat (limited to 'DynamicTablesPkg')
| -rw-r--r-- | DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c index 697cfc46ab..90380f48da 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c @@ -97,14 +97,12 @@ typedef struct { /** A helper macro used for initializing the debug port device
information structure.
- @param [in] NumReg The number of generic address registers.
@param [in] SubType The DBG Port SubType.
@param [in] UartBase The UART port base address.
@param [in] UartAddrLen The UART port address range length.
@param [in] UartNameStr The UART port name string.
**/
#define DBG2_DEBUG_PORT_DDI( \
- NumReg, \
SubType, \
UartBase, \
UartAddrLen, \
@@ -116,7 +114,7 @@ typedef struct { /* UINT16 Length */ \
sizeof (DBG2_DEBUG_DEVICE_INFORMATION), \
/* UINT8 NumberofGenericAddressRegisters */ \
- NumReg, \
+ DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS, \
/* UINT16 NameSpaceStringLength */ \
DBG2_NAMESPACESTRING_FIELD_SIZE, \
/* UINT16 NameSpaceStringOffset */ \
@@ -164,7 +162,6 @@ DBG2_TABLE AcpiDbg2 = { * Debug port 1
*/
DBG2_DEBUG_PORT_DDI (
- DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS,
0, // {Template}: Serial Port Subtype
0, // {Template}: Serial Port Base Address
PL011_UART_LENGTH,
|