MdeModulePkg: move PlatformHasAcpiGuid from EmbeddedPkg

Given the agreement on the edk2-devel regarding the fact that the
notion whether or not a 'platform has ACPI' is a universal one, move
the PlatformHasAcpi GUID to MdeModulePkg.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: "Zeng, Star" <star.zeng@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
index 08025f0c3722d0dc3e8610002720f54f7e5317e6..5351e741aa416898fb8d6918f34d7cf2c9a08501 100644 (file)
--- a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
+++ b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
@@ -27,6 +27,7 @@
 [Packages]\r
   ArmVirtPkg/ArmVirtPkg.dec\r
   EmbeddedPkg/EmbeddedPkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
   MdePkg/MdePkg.dec\r
   OvmfPkg/OvmfPkg.dec\r
 \r

diff --git a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
index 2833075f65c9a151ce1cd84b7fe688c83a6f79ac..26965c50c12bc440186feec826e2f08e8596aeaf 100644 (file)
--- a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
+++ b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
@@ -26,6 +26,7 @@
 \r
 [Packages]\r
   EmbeddedPkg/EmbeddedPkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
   MdePkg/MdePkg.dec\r
 \r
 [LibraryClasses]\r

diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index 0bed2736c8c30b7b7dd23d052dc46b6e832617ee..a7e127085236446a5e158fa56136a479bd974e8b 100644 (file)
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -57,9 +57,6 @@
   gFdtHobGuid   = { 0x16958446, 0x19B7, 0x480B, { 0xB0, 0x47, 0x74, 0x85, 0xAD, 0x3F, 0x71, 0x6D } }\r
   gFdtVariableGuid = { 0x25a4fd4a, 0x9703, 0x4ba9, { 0xa1, 0x90, 0xb7, 0xc8, 0x4e, 0xfb, 0x3e, 0x57 } }\r
 \r
-  ## Include/Guid/PlatformHasAcpi.h\r
-  gEdkiiPlatformHasAcpiGuid = { 0xf0966b41, 0xc23f, 0x41b9, { 0x96, 0x04, 0x0f, 0xf7, 0xe1, 0x11, 0x96, 0x5a } }\r
-\r
   ## Include/Guid/PlatformHasDeviceTree.h\r
   gEdkiiPlatformHasDeviceTreeGuid = { 0x7ebb920d, 0x1aaf, 0x46d9, { 0xb2, 0xaf, 0x54, 0x1e, 0x1d, 0xce, 0x14, 0x8b } }\r
 \r

diff --git a/EmbeddedPkg/Include/Guid/PlatformHasAcpi.h b/EmbeddedPkg/Include/Guid/PlatformHasAcpi.h
deleted file mode 100644 (file)
index ad51782..0000000
--- a/EmbeddedPkg/Include/Guid/PlatformHasAcpi.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/** @file\r
-  EDKII Platform Has ACPI GUID\r
-\r
-  A NULL protocol instance with this GUID in the DXE protocol database, and/or\r
-  a NULL PPI with this GUID in the PPI database, implies that the platform\r
-  provides the operating system with an ACPI-based hardware description. Note\r
-  that this is not necessarily exclusive with different kinds of hardware\r
-  description (for example, a Device Tree-based one). A platform driver and/or\r
-  PEIM is supposed to produce a single instance of the protocol and/or PPI\r
-  (with NULL contents), if appropriate.\r
-\r
-  Copyright (C) 2017, Red Hat, Inc.\r
-\r
-  This program and the accompanying materials are licensed and made available\r
-  under the terms and conditions of the BSD License that accompanies this\r
-  distribution. The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php.\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT\r
-  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-\r
-#ifndef __EDKII_PLATFORM_HAS_ACPI_H__\r
-#define __EDKII_PLATFORM_HAS_ACPI_H__\r
-\r
-#define EDKII_PLATFORM_HAS_ACPI_GUID \\r
-  { \\r
-    0xf0966b41, 0xc23f, 0x41b9, \\r
-    { 0x96, 0x04, 0x0f, 0xf7, 0xe1, 0x11, 0x96, 0x5a } \\r
-  }\r
-\r
-extern EFI_GUID gEdkiiPlatformHasAcpiGuid;\r
-\r
-#endif\r

diff --git a/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
index 6268293ca97b1995a105ce3b8f2eab81cecab58f..0613b0e999d23d4c00fc68bbc73b53915b8b1bcd 100644 (file)
--- a/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
+++ b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
@@ -33,7 +33,7 @@
   PlatformHasAcpiLib.c\r
 \r
 [Packages]\r
-  EmbeddedPkg/EmbeddedPkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
   MdePkg/MdePkg.dec\r
 \r
 [Depex]\r

diff --git a/MdeModulePkg/Include/Guid/PlatformHasAcpi.h b/MdeModulePkg/Include/Guid/PlatformHasAcpi.h
new file mode 100644 (file)
index 0000000..ad51782
--- /dev/null
+++ b/MdeModulePkg/Include/Guid/PlatformHasAcpi.h
@@ -0,0 +1,35 @@
+/** @file\r
+  EDKII Platform Has ACPI GUID\r
+\r
+  A NULL protocol instance with this GUID in the DXE protocol database, and/or\r
+  a NULL PPI with this GUID in the PPI database, implies that the platform\r
+  provides the operating system with an ACPI-based hardware description. Note\r
+  that this is not necessarily exclusive with different kinds of hardware\r
+  description (for example, a Device Tree-based one). A platform driver and/or\r
+  PEIM is supposed to produce a single instance of the protocol and/or PPI\r
+  (with NULL contents), if appropriate.\r
+\r
+  Copyright (C) 2017, Red Hat, Inc.\r
+\r
+  This program and the accompanying materials are licensed and made available\r
+  under the terms and conditions of the BSD License that accompanies this\r
+  distribution. The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php.\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT\r
+  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+**/\r
+\r
+\r
+#ifndef __EDKII_PLATFORM_HAS_ACPI_H__\r
+#define __EDKII_PLATFORM_HAS_ACPI_H__\r
+\r
+#define EDKII_PLATFORM_HAS_ACPI_GUID \\r
+  { \\r
+    0xf0966b41, 0xc23f, 0x41b9, \\r
+    { 0x96, 0x04, 0x0f, 0xf7, 0xe1, 0x11, 0x96, 0x5a } \\r
+  }\r
+\r
+extern EFI_GUID gEdkiiPlatformHasAcpiGuid;\r
+\r
+#endif\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 4f69c24c4d1d8be9049d26084667acba42d517ea..ca09cbc10923c446a68bde012b7bcc8413ba608d 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -385,6 +385,9 @@
   gEdkiiNonDiscoverableUhciDeviceGuid = { 0xA8CDA0A2, 0x4F37, 0x4A1B, {0x8E, 0x10, 0x8E, 0xF3, 0xCC, 0x3B, 0xF3, 0xA8 } }\r
   gEdkiiNonDiscoverableXhciDeviceGuid = { 0xB1BE0BC5, 0x6C28, 0x442D, {0xAA, 0x37, 0x15, 0x1B, 0x42, 0x57, 0xBD, 0x78 } }\r
 \r
+  ## Include/Guid/PlatformHasAcpi.h\r
+  gEdkiiPlatformHasAcpiGuid = { 0xf0966b41, 0xc23f, 0x41b9, { 0x96, 0x04, 0x0f, 0xf7, 0xe1, 0x11, 0x96, 0x5a } }\r
+\r
 [Ppis]\r
   ## Include/Ppi/AtaController.h\r
   gPeiAtaControllerPpiGuid       = { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }}\r