[edk2-platforms][PATCH V1 1/1] Revert "Platform/Sgi: Fix missing FdtLib instance issue"

[edk2-platforms][PATCH V1 1/1] Revert "Platform/Sgi: Fix missing FdtLib instance issue"

[Vivek Kumar Gautam]

This reverts commit eb3950b842d3f335671600fdfa9b58c482886c79.

This commit referenced the change (9ad168c9e0 StandaloneMmPkg:
Include libfdt in the StMM) in edk2 as the dependency to add FdtLib
instance. However, as this change is not yet upstreamed, it was
incorrect to introduce this dependency and refer to the change in
the commit message. So reverting this patch.

Signed-off-by: Vivek Gautam <vivek.gautam@arm.com>
---
 Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 1 -
 1 file changed, 1 deletion(-)

Apologies, this was a mistake on my part. I used a bunch of commits
on edk2 that were not upstreamed and based the patch on them. This
led me to believe that there is a build break and so posted the
commit eb3950b842d3f335671600fdfa9b58c482886c79 for review.

diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
index 01f0a7657c51..ae0ff7247a6a 100644
--- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
@@ -38,7 +38,6 @@
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
   StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
   ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
-  FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
   CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
   PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf
 
-- 
2.25.1

Re: [edk2-platforms][PATCH V1 1/1] Revert "Platform/Sgi: Fix missing FdtLib instance issue"

[Sami Mujawar]

Hi Vivek,

Thank you for this fix.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

On 11/01/2023, 10:13, "Vivek Gautam" <vivek.gautam@arm.com> wrote:

    This reverts commit eb3950b842d3f335671600fdfa9b58c482886c79.

    This commit referenced the change (9ad168c9e0 StandaloneMmPkg:
    Include libfdt in the StMM) in edk2 as the dependency to add FdtLib
    instance. However, as this change is not yet upstreamed, it was
    incorrect to introduce this dependency and refer to the change in
    the commit message. So reverting this patch.

    Signed-off-by: Vivek Gautam <vivek.gautam@arm.com>
    ---
     Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 1 -
     1 file changed, 1 deletion(-)

    Apologies, this was a mistake on my part. I used a bunch of commits
    on edk2 that were not upstreamed and based the patch on them. This
    led me to believe that there is a build break and so posted the
    commit eb3950b842d3f335671600fdfa9b58c482886c79 for review.

    diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
    index 01f0a7657c51..ae0ff7247a6a 100644
    --- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
    +++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
    @@ -38,7 +38,6 @@
       ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

       StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf

       ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf

    -  FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf

       CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf

       PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf



    -- 
    2.25.1

Re: [edk2-platforms][PATCH V1 1/1] Revert "Platform/Sgi: Fix missing FdtLib instance issue"

[Vivek Kumar Gautam]

Hi Sami,


On 1/11/23 16:03, Sami Mujawar wrote:
> Hi Vivek,
> 
> Thank you for this fix.
> 
> Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Thanks for the review and apologies again for the mixup.

Best regards
Vivek

> 
> Regards,
> 
> Sami Mujawar
> 
> On 11/01/2023, 10:13, "Vivek Gautam" <vivek.gautam@arm.com> wrote:
> 
>      This reverts commit eb3950b842d3f335671600fdfa9b58c482886c79.
> 
>      This commit referenced the change (9ad168c9e0 StandaloneMmPkg:
>      Include libfdt in the StMM) in edk2 as the dependency to add FdtLib
>      instance. However, as this change is not yet upstreamed, it was
>      incorrect to introduce this dependency and refer to the change in
>      the commit message. So reverting this patch.
> 
>      Signed-off-by: Vivek Gautam <vivek.gautam@arm.com>
>      ---
>       Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 1 -
>       1 file changed, 1 deletion(-)
> 
>      Apologies, this was a mistake on my part. I used a bunch of commits
>      on edk2 that were not upstreamed and based the patch on them. This
>      led me to believe that there is a build break and so posted the
>      commit eb3950b842d3f335671600fdfa9b58c482886c79 for review.
> 
>      diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
>      index 01f0a7657c51..ae0ff7247a6a 100644
>      --- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
>      +++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
>      @@ -38,7 +38,6 @@
>         ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
> 
>         StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
> 
>         ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
> 
>      -  FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
> 
>         CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
> 
>         PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf
> 
> 
> 
>      --
>      2.25.1
> 
> 

Re: [edk2-devel] [edk2-platforms][PATCH V1 1/1] Revert "Platform/Sgi: Fix missing FdtLib instance issue"

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 77 bytes --]

Merged as 24d22fe163c4..64b06a4d19ad

Thanks.

Regards,

Sami Mujawar

[-- Attachment #2: Type: text/html, Size: 101 bytes --]