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>

3 files changed, 1 insertions, 39 deletions

diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index 0bed2736c8..a7e1270852 100644
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -57,9 +57,6 @@
   gFdtHobGuid   = { 0x16958446, 0x19B7, 0x480B, { 0xB0, 0x47, 0x74, 0x85, 0xAD, 0x3F, 0x71, 0x6D } }

   gFdtVariableGuid = { 0x25a4fd4a, 0x9703, 0x4ba9, { 0xa1, 0x90, 0xb7, 0xc8, 0x4e, 0xfb, 0x3e, 0x57 } }

 

-  ## Include/Guid/PlatformHasAcpi.h

-  gEdkiiPlatformHasAcpiGuid = { 0xf0966b41, 0xc23f, 0x41b9, { 0x96, 0x04, 0x0f, 0xf7, 0xe1, 0x11, 0x96, 0x5a } }

-

   ## Include/Guid/PlatformHasDeviceTree.h

   gEdkiiPlatformHasDeviceTreeGuid = { 0x7ebb920d, 0x1aaf, 0x46d9, { 0xb2, 0xaf, 0x54, 0x1e, 0x1d, 0xce, 0x14, 0x8b } }

 

diff --git a/EmbeddedPkg/Include/Guid/PlatformHasAcpi.h b/EmbeddedPkg/Include/Guid/PlatformHasAcpi.h
deleted file mode 100644
index ad51782137..0000000000
--- a/EmbeddedPkg/Include/Guid/PlatformHasAcpi.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/** @file

-  EDKII Platform Has ACPI GUID

-

-  A NULL protocol instance with this GUID in the DXE protocol database, and/or

-  a NULL PPI with this GUID in the PPI database, implies that the platform

-  provides the operating system with an ACPI-based hardware description. Note

-  that this is not necessarily exclusive with different kinds of hardware

-  description (for example, a Device Tree-based one). A platform driver and/or

-  PEIM is supposed to produce a single instance of the protocol and/or PPI

-  (with NULL contents), if appropriate.

-

-  Copyright (C) 2017, Red Hat, Inc.

-

-  This program and the accompanying materials are licensed and made available

-  under the terms and conditions of the BSD License that accompanies this

-  distribution. The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php.

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT

-  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-**/

-

-

-#ifndef __EDKII_PLATFORM_HAS_ACPI_H__

-#define __EDKII_PLATFORM_HAS_ACPI_H__

-

-#define EDKII_PLATFORM_HAS_ACPI_GUID \

-  { \

-    0xf0966b41, 0xc23f, 0x41b9, \

-    { 0x96, 0x04, 0x0f, 0xf7, 0xe1, 0x11, 0x96, 0x5a } \

-  }

-

-extern EFI_GUID gEdkiiPlatformHasAcpiGuid;

-

-#endif

diff --git a/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
index 6268293ca9..0613b0e999 100644
--- a/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
+++ b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
@@ -33,7 +33,7 @@
   PlatformHasAcpiLib.c

 

 [Packages]

-  EmbeddedPkg/EmbeddedPkg.dec

+  MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

 

 [Depex]