OvmfPkg: fold macros of unsupported PM2 control reg. block into Facp.aslc

Soon we're going to specify Extended Addresses of register blocks in
Generic Address Structure format. The GAS is easy to fill if we want to
posit either "unsupported" (all zero) or a given address in a specific
address space. However deriving "unsupported" just from a macro expanding
to zero is unwieldy, so let's avoid the need.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14153 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/AcpiTables/Facp.aslc b/OvmfPkg/AcpiTables/Facp.aslc
index 45bb50768f8a2eb273d71309964f43780027141e..3f09f928b60d3c147d22e04e893ef6c0f2631d29 100644 (file)
--- a/OvmfPkg/AcpiTables/Facp.aslc
+++ b/OvmfPkg/AcpiTables/Facp.aslc
@@ -41,13 +41,13 @@ EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
   0,                // Power Mgt 1b Event Reg Blk unsupported\r
   PM1a_CNT_BLK,     // Port address of Power Mgt 1a Ctrl Reg Blk\r
   0,                // Power Mgt 1b Ctrl Reg Blk unsupported\r
-  PM2_CNT_BLK,      // Port address of Power Mgt 2  Ctrl Reg Blk\r
+  0,                // Power Mgt 2  Ctrl Reg Blk unsupported\r
   PM_TMR_BLK,       // Port address of Power Mgt Timer Ctrl Reg Blk\r
   GPE0_BLK,         // Port addr of General Purpose Event 0 Reg Blk\r
   GPE1_BLK,         // Port addr of General Purpose Event 1 Reg Blk\r
   PM1_EVT_LEN,      // Byte Length of ports at pm1X_evt_blk\r
   PM1_CNT_LEN,      // Byte Length of ports at pm1X_cnt_blk\r
-  PM2_CNT_LEN,      // Byte Length of ports at pm2_cnt_blk\r
+  0,                // Power Mgt 2 Ctrl Reg Blk unsupported\r
   PM_TM_LEN,        // Byte Length of ports at pm_tm_blk\r
   GPE0_BLK_LEN,     // Byte Length of ports at gpe0_blk\r
   GPE1_BLK_LEN,     // Byte Length of ports at gpe1_blk\r

diff --git a/OvmfPkg/AcpiTables/Platform.h b/OvmfPkg/AcpiTables/Platform.h
index 684156a4758c3cd71024960f7bf3ca5bda89802b..3f0269bf08de576a0c8ab9976982632292610f99 100644 (file)
--- a/OvmfPkg/AcpiTables/Platform.h
+++ b/OvmfPkg/AcpiTables/Platform.h
@@ -36,13 +36,11 @@
 #define S4BIOS_REQ      0x00\r
 #define PM1a_EVT_BLK    0x0000b000\r
 #define PM1a_CNT_BLK    0x0000b004\r
-#define PM2_CNT_BLK     0x00000000\r
 #define PM_TMR_BLK      0x0000b008\r
 #define GPE0_BLK        0x0000afe0\r
 #define GPE1_BLK        0x00000000\r
 #define PM1_EVT_LEN     0x04\r
 #define PM1_CNT_LEN     0x02\r
-#define PM2_CNT_LEN     0x00\r
 #define PM_TM_LEN       0x04\r
 #define GPE0_BLK_LEN    0x04\r
 #define GPE1_BLK_LEN    0x00\r