1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] MdeModulePkg: move PlatformHasAcpiGuid from EmbeddedPkg

Ard Biesheuvel posted 1 patch 7 years, 7 months ago
Failed in applying to current master (apply log)
ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf       | 1 +
ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf | 1 +
EmbeddedPkg/EmbeddedPkg.dec                                    | 3 ---
EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf  | 1 +
{EmbeddedPkg => MdeModulePkg}/Include/Guid/PlatformHasAcpi.h   | 0
MdeModulePkg/MdeModulePkg.dec                                  | 3 +++
6 files changed, 6 insertions(+), 3 deletions(-)
[edk2] [PATCH] MdeModulePkg: move PlatformHasAcpiGuid from EmbeddedPkg
Posted by Ard Biesheuvel 7 years, 7 months ago 
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>
---
 ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf       | 1 +
 ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf | 1 +
 EmbeddedPkg/EmbeddedPkg.dec                                    | 3 ---
 EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf  | 1 +
 {EmbeddedPkg => MdeModulePkg}/Include/Guid/PlatformHasAcpi.h   | 0
 MdeModulePkg/MdeModulePkg.dec                                  | 3 +++
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
index 08025f0c3722..5351e741aa41 100644
--- a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
+++ b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
@@ -27,6 +27,7 @@ [Sources]
 [Packages]
   ArmVirtPkg/ArmVirtPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
 
diff --git a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
index 2833075f65c9..26965c50c12b 100644
--- a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
+++ b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
@@ -26,6 +26,7 @@ [Sources]
 
 [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index 0bed2736c8c3..a7e127085236 100644
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -57,9 +57,6 @@ [Guids.common]
   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/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
index 6268293ca97b..be298ba67c40 100644
--- a/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
+++ b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
@@ -34,6 +34,7 @@ [Sources]
 
 [Packages]
   EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
 
 [Depex]
diff --git a/EmbeddedPkg/Include/Guid/PlatformHasAcpi.h b/MdeModulePkg/Include/Guid/PlatformHasAcpi.h
similarity index 100%
rename from EmbeddedPkg/Include/Guid/PlatformHasAcpi.h
rename to MdeModulePkg/Include/Guid/PlatformHasAcpi.h
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 4f69c24c4d1d..ca09cbc10923 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -385,6 +385,9 @@ [Guids]
   gEdkiiNonDiscoverableUhciDeviceGuid = { 0xA8CDA0A2, 0x4F37, 0x4A1B, {0x8E, 0x10, 0x8E, 0xF3, 0xCC, 0x3B, 0xF3, 0xA8 } }
   gEdkiiNonDiscoverableXhciDeviceGuid = { 0xB1BE0BC5, 0x6C28, 0x442D, {0xAA, 0x37, 0x15, 0x1B, 0x42, 0x57, 0xBD, 0x78 } }
 
+  ## Include/Guid/PlatformHasAcpi.h
+  gEdkiiPlatformHasAcpiGuid = { 0xf0966b41, 0xc23f, 0x41b9, { 0x96, 0x04, 0x0f, 0xf7, 0xe1, 0x11, 0x96, 0x5a } }
+
 [Ppis]
   ## Include/Ppi/AtaController.h
   gPeiAtaControllerPpiGuid       = { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }}
-- 
2.9.3

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg: move PlatformHasAcpiGuid from EmbeddedPkg
Posted by Laszlo Ersek 7 years, 7 months ago 
On 04/05/17 11:38, Ard Biesheuvel wrote:
> 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>
> ---
>  ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf       | 1 +
>  ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf | 1 +
>  EmbeddedPkg/EmbeddedPkg.dec                                    | 3 ---
>  EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf  | 1 +
>  {EmbeddedPkg => MdeModulePkg}/Include/Guid/PlatformHasAcpi.h   | 0
>  MdeModulePkg/MdeModulePkg.dec                                  | 3 +++
>  6 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
> index 08025f0c3722..5351e741aa41 100644
> --- a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
> +++ b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
> @@ -27,6 +27,7 @@ [Sources]
>  [Packages]
>    ArmVirtPkg/ArmVirtPkg.dec
>    EmbeddedPkg/EmbeddedPkg.dec
> +  MdeModulePkg/MdeModulePkg.dec
>    MdePkg/MdePkg.dec
>    OvmfPkg/OvmfPkg.dec
>  
> diff --git a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
> index 2833075f65c9..26965c50c12b 100644
> --- a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
> +++ b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
> @@ -26,6 +26,7 @@ [Sources]
>  
>  [Packages]
>    EmbeddedPkg/EmbeddedPkg.dec
> +  MdeModulePkg/MdeModulePkg.dec
>    MdePkg/MdePkg.dec
>  
>  [LibraryClasses]
> diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
> index 0bed2736c8c3..a7e127085236 100644
> --- a/EmbeddedPkg/EmbeddedPkg.dec
> +++ b/EmbeddedPkg/EmbeddedPkg.dec
> @@ -57,9 +57,6 @@ [Guids.common]
>    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/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
> index 6268293ca97b..be298ba67c40 100644
> --- a/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
> +++ b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
> @@ -34,6 +34,7 @@ [Sources]
>  
>  [Packages]
>    EmbeddedPkg/EmbeddedPkg.dec

I think you can remove "EmbeddedPkg/EmbeddedPkg.dec" here.

(

I checked all the other INF files being modified as well; it seems that
"EmbeddedPkg/EmbeddedPkg.dec" remains necessary in all other places.

I also grepped all INF files for the GUID -- DtPlatformDxe.inf is
another user, but it needs no modification.

)

With that update (if it indeed works),

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Thanks
Laszlo

> +  MdeModulePkg/MdeModulePkg.dec
>    MdePkg/MdePkg.dec
>  
>  [Depex]
> diff --git a/EmbeddedPkg/Include/Guid/PlatformHasAcpi.h b/MdeModulePkg/Include/Guid/PlatformHasAcpi.h
> similarity index 100%
> rename from EmbeddedPkg/Include/Guid/PlatformHasAcpi.h
> rename to MdeModulePkg/Include/Guid/PlatformHasAcpi.h
> diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
> index 4f69c24c4d1d..ca09cbc10923 100644
> --- a/MdeModulePkg/MdeModulePkg.dec
> +++ b/MdeModulePkg/MdeModulePkg.dec
> @@ -385,6 +385,9 @@ [Guids]
>    gEdkiiNonDiscoverableUhciDeviceGuid = { 0xA8CDA0A2, 0x4F37, 0x4A1B, {0x8E, 0x10, 0x8E, 0xF3, 0xCC, 0x3B, 0xF3, 0xA8 } }
>    gEdkiiNonDiscoverableXhciDeviceGuid = { 0xB1BE0BC5, 0x6C28, 0x442D, {0xAA, 0x37, 0x15, 0x1B, 0x42, 0x57, 0xBD, 0x78 } }
>  
> +  ## Include/Guid/PlatformHasAcpi.h
> +  gEdkiiPlatformHasAcpiGuid = { 0xf0966b41, 0xc23f, 0x41b9, { 0x96, 0x04, 0x0f, 0xf7, 0xe1, 0x11, 0x96, 0x5a } }
> +
>  [Ppis]
>    ## Include/Ppi/AtaController.h
>    gPeiAtaControllerPpiGuid       = { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }}
> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg: move PlatformHasAcpiGuid from EmbeddedPkg
Posted by Ard Biesheuvel 7 years, 7 months ago 
On 5 April 2017 at 10:49, Laszlo Ersek <lersek@redhat.com> wrote:
> On 04/05/17 11:38, Ard Biesheuvel wrote:
>> 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>
>> ---
>>  ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf       | 1 +
>>  ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf | 1 +
>>  EmbeddedPkg/EmbeddedPkg.dec                                    | 3 ---
>>  EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf  | 1 +
>>  {EmbeddedPkg => MdeModulePkg}/Include/Guid/PlatformHasAcpi.h   | 0
>>  MdeModulePkg/MdeModulePkg.dec                                  | 3 +++
>>  6 files changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
>> index 08025f0c3722..5351e741aa41 100644
>> --- a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
>> +++ b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
>> @@ -27,6 +27,7 @@ [Sources]
>>  [Packages]
>>    ArmVirtPkg/ArmVirtPkg.dec
>>    EmbeddedPkg/EmbeddedPkg.dec
>> +  MdeModulePkg/MdeModulePkg.dec
>>    MdePkg/MdePkg.dec
>>    OvmfPkg/OvmfPkg.dec
>>
>> diff --git a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
>> index 2833075f65c9..26965c50c12b 100644
>> --- a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
>> +++ b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
>> @@ -26,6 +26,7 @@ [Sources]
>>
>>  [Packages]
>>    EmbeddedPkg/EmbeddedPkg.dec
>> +  MdeModulePkg/MdeModulePkg.dec
>>    MdePkg/MdePkg.dec
>>
>>  [LibraryClasses]
>> diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
>> index 0bed2736c8c3..a7e127085236 100644
>> --- a/EmbeddedPkg/EmbeddedPkg.dec
>> +++ b/EmbeddedPkg/EmbeddedPkg.dec
>> @@ -57,9 +57,6 @@ [Guids.common]
>>    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/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
>> index 6268293ca97b..be298ba67c40 100644
>> --- a/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
>> +++ b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
>> @@ -34,6 +34,7 @@ [Sources]
>>
>>  [Packages]
>>    EmbeddedPkg/EmbeddedPkg.dec
>
> I think you can remove "EmbeddedPkg/EmbeddedPkg.dec" here.
>

Ah yes. It didn't occur to me to remove the 'home' package here, but I
suppose this library doesn't depend on anything it provides.

> (
>
> I checked all the other INF files being modified as well; it seems that
> "EmbeddedPkg/EmbeddedPkg.dec" remains necessary in all other places.
>
> I also grepped all INF files for the GUID -- DtPlatformDxe.inf is
> another user, but it needs no modification.
>
> )
>
> With that update (if it indeed works),
>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>

Thanks,
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg: move PlatformHasAcpiGuid from EmbeddedPkg
Posted by Leif Lindholm 7 years, 7 months ago 
On Wed, Apr 05, 2017 at 11:01:05AM +0100, Ard Biesheuvel wrote:
> On 5 April 2017 at 10:49, Laszlo Ersek <lersek@redhat.com> wrote:
> > On 04/05/17 11:38, Ard Biesheuvel wrote:
> >> 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>
> >> ---
> >>  ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf       | 1 +
> >>  ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf | 1 +
> >>  EmbeddedPkg/EmbeddedPkg.dec                                    | 3 ---
> >>  EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf  | 1 +
> >>  {EmbeddedPkg => MdeModulePkg}/Include/Guid/PlatformHasAcpi.h   | 0
> >>  MdeModulePkg/MdeModulePkg.dec                                  | 3 +++
> >>  6 files changed, 6 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
> >> index 08025f0c3722..5351e741aa41 100644
> >> --- a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
> >> +++ b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
> >> @@ -27,6 +27,7 @@ [Sources]
> >>  [Packages]
> >>    ArmVirtPkg/ArmVirtPkg.dec
> >>    EmbeddedPkg/EmbeddedPkg.dec
> >> +  MdeModulePkg/MdeModulePkg.dec
> >>    MdePkg/MdePkg.dec
> >>    OvmfPkg/OvmfPkg.dec
> >>
> >> diff --git a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
> >> index 2833075f65c9..26965c50c12b 100644
> >> --- a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
> >> +++ b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
> >> @@ -26,6 +26,7 @@ [Sources]
> >>
> >>  [Packages]
> >>    EmbeddedPkg/EmbeddedPkg.dec
> >> +  MdeModulePkg/MdeModulePkg.dec
> >>    MdePkg/MdePkg.dec
> >>
> >>  [LibraryClasses]
> >> diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
> >> index 0bed2736c8c3..a7e127085236 100644
> >> --- a/EmbeddedPkg/EmbeddedPkg.dec
> >> +++ b/EmbeddedPkg/EmbeddedPkg.dec
> >> @@ -57,9 +57,6 @@ [Guids.common]
> >>    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/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
> >> index 6268293ca97b..be298ba67c40 100644
> >> --- a/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
> >> +++ b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
> >> @@ -34,6 +34,7 @@ [Sources]
> >>
> >>  [Packages]
> >>    EmbeddedPkg/EmbeddedPkg.dec
> >
> > I think you can remove "EmbeddedPkg/EmbeddedPkg.dec" here.
> >
> 
> Ah yes. It didn't occur to me to remove the 'home' package here, but I
> suppose this library doesn't depend on anything it provides.
> 
> > (
> >
> > I checked all the other INF files being modified as well; it seems that
> > "EmbeddedPkg/EmbeddedPkg.dec" remains necessary in all other places.
> >
> > I also grepped all INF files for the GUID -- DtPlatformDxe.inf is
> > another user, but it needs no modification.
> >
> > )
> >
> > With that update (if it indeed works),
> >
> > Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Seconded.
(Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>)

/
    Leif
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg: move PlatformHasAcpiGuid from EmbeddedPkg
Posted by Ard Biesheuvel 7 years, 7 months ago 
On 5 April 2017 at 16:38, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Wed, Apr 05, 2017 at 11:01:05AM +0100, Ard Biesheuvel wrote:
>> On 5 April 2017 at 10:49, Laszlo Ersek <lersek@redhat.com> wrote:
>> > On 04/05/17 11:38, Ard Biesheuvel wrote:
>> >> 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>
>> >> ---
>> >>  ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf       | 1 +
>> >>  ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf | 1 +
>> >>  EmbeddedPkg/EmbeddedPkg.dec                                    | 3 ---
>> >>  EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf  | 1 +
>> >>  {EmbeddedPkg => MdeModulePkg}/Include/Guid/PlatformHasAcpi.h   | 0
>> >>  MdeModulePkg/MdeModulePkg.dec                                  | 3 +++
>> >>  6 files changed, 6 insertions(+), 3 deletions(-)
>> >>
>> >> diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
>> >> index 08025f0c3722..5351e741aa41 100644
>> >> --- a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
>> >> +++ b/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf
>> >> @@ -27,6 +27,7 @@ [Sources]
>> >>  [Packages]
>> >>    ArmVirtPkg/ArmVirtPkg.dec
>> >>    EmbeddedPkg/EmbeddedPkg.dec
>> >> +  MdeModulePkg/MdeModulePkg.dec
>> >>    MdePkg/MdePkg.dec
>> >>    OvmfPkg/OvmfPkg.dec
>> >>
>> >> diff --git a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
>> >> index 2833075f65c9..26965c50c12b 100644
>> >> --- a/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
>> >> +++ b/ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf
>> >> @@ -26,6 +26,7 @@ [Sources]
>> >>
>> >>  [Packages]
>> >>    EmbeddedPkg/EmbeddedPkg.dec
>> >> +  MdeModulePkg/MdeModulePkg.dec
>> >>    MdePkg/MdePkg.dec
>> >>
>> >>  [LibraryClasses]
>> >> diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
>> >> index 0bed2736c8c3..a7e127085236 100644
>> >> --- a/EmbeddedPkg/EmbeddedPkg.dec
>> >> +++ b/EmbeddedPkg/EmbeddedPkg.dec
>> >> @@ -57,9 +57,6 @@ [Guids.common]
>> >>    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/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
>> >> index 6268293ca97b..be298ba67c40 100644
>> >> --- a/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
>> >> +++ b/EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf
>> >> @@ -34,6 +34,7 @@ [Sources]
>> >>
>> >>  [Packages]
>> >>    EmbeddedPkg/EmbeddedPkg.dec
>> >
>> > I think you can remove "EmbeddedPkg/EmbeddedPkg.dec" here.
>> >
>>
>> Ah yes. It didn't occur to me to remove the 'home' package here, but I
>> suppose this library doesn't depend on anything it provides.
>>
>> > (
>> >
>> > I checked all the other INF files being modified as well; it seems that
>> > "EmbeddedPkg/EmbeddedPkg.dec" remains necessary in all other places.
>> >
>> > I also grepped all INF files for the GUID -- DtPlatformDxe.inf is
>> > another user, but it needs no modification.
>> >
>> > )
>> >
>> > With that update (if it indeed works),
>> >
>> > Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>
> Seconded.
> (Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>)
>

Thanks. Pushed as a391e5925dc3 (with the suggestion incorporated)
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.