[edk2] [platforms: PATCH 3/8] Marvell/Armada: Remove custom reset library residues

Marcin Wojtas posted 8 patches 7 years, 2 months ago
There is a newer version of this series
[edk2] [platforms: PATCH 3/8] Marvell/Armada: Remove custom reset library residues
Posted by Marcin Wojtas 7 years, 2 months ago
When switching to generic PSCI reset library, obsolete parts
of previous custom reset library (PCDs, documentation) remained.
Remove them.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Platform/Marvell/Armada/Armada70x0.dsc         | 4 ----
 Platform/Marvell/Marvell.dec                   | 4 ----
 Silicon/Marvell/Documentation/PortingGuide.txt | 9 ---------
 3 files changed, 17 deletions(-)

diff --git a/Platform/Marvell/Armada/Armada70x0.dsc b/Platform/Marvell/Armada/Armada70x0.dsc
index 430803c..946c93e 100644
--- a/Platform/Marvell/Armada/Armada70x0.dsc
+++ b/Platform/Marvell/Armada/Armada70x0.dsc
@@ -138,9 +138,5 @@
   gMarvellTokenSpaceGuid.PcdPciEAhci|{ 0x1, 0x0 }
   gMarvellTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1 }
 
-  #ResetLib
-  gMarvellTokenSpaceGuid.PcdResetRegAddress|0xf06f0084
-  gMarvellTokenSpaceGuid.PcdResetRegMask|0x1
-
   #RTC
   gMarvellTokenSpaceGuid.PcdRtcEnabled|{ 0x1 }
diff --git a/Platform/Marvell/Marvell.dec b/Platform/Marvell/Marvell.dec
index 78f5e53..434d6cb 100644
--- a/Platform/Marvell/Marvell.dec
+++ b/Platform/Marvell/Marvell.dec
@@ -188,10 +188,6 @@
   gMarvellTokenSpaceGuid.PcdPciEAhci|{ 0x0 }|VOID*|0x3000034
   gMarvellTokenSpaceGuid.PcdPciESdhci|{ 0x0 }|VOID*|0x3000035
 
-#ResetLib
-  gMarvellTokenSpaceGuid.PcdResetRegAddress|0|UINT64|0x40000050
-  gMarvellTokenSpaceGuid.PcdResetRegMask|0|UINT32|0x4000051
-
 #RTC
   gMarvellTokenSpaceGuid.PcdRtcEnabled|{ 0x0 }|VOID*|0x40000052
 
diff --git a/Silicon/Marvell/Documentation/PortingGuide.txt b/Silicon/Marvell/Documentation/PortingGuide.txt
index 66ec918..cbe3bed 100644
--- a/Silicon/Marvell/Documentation/PortingGuide.txt
+++ b/Silicon/Marvell/Documentation/PortingGuide.txt
@@ -383,15 +383,6 @@ Set pin 6 and 7 to 0xa function:
                  gMarvellTokenSpaceGuid.PcdChip0MppSel0|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xa, 0x0, 0x0 }
 
 
-MarvellResetSystemLib configuration
-===================================
-This simple library allows to mask given bits in given reg at UEFI 'reset'
-command call. These variables are configurable through PCDs:
-
-  - gMarvellTokenSpaceGuid.PcdResetRegAddress
-  - gMarvellTokenSpaceGuid.PcdResetRegMask
-
-
 Ramdisk configuration
 =====================
 There is one PCD available for Ramdisk configuration
-- 
2.7.4

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [platforms: PATCH 3/8] Marvell/Armada: Remove custom reset library residues
Posted by Leif Lindholm 7 years, 2 months ago
On Wed, Oct 11, 2017 at 05:40:44PM +0200, Marcin Wojtas wrote:
> When switching to generic PSCI reset library, obsolete parts
> of previous custom reset library (PCDs, documentation) remained.
> Remove them.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>

Yes, please.
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---
>  Platform/Marvell/Armada/Armada70x0.dsc         | 4 ----
>  Platform/Marvell/Marvell.dec                   | 4 ----
>  Silicon/Marvell/Documentation/PortingGuide.txt | 9 ---------
>  3 files changed, 17 deletions(-)
> 
> diff --git a/Platform/Marvell/Armada/Armada70x0.dsc b/Platform/Marvell/Armada/Armada70x0.dsc
> index 430803c..946c93e 100644
> --- a/Platform/Marvell/Armada/Armada70x0.dsc
> +++ b/Platform/Marvell/Armada/Armada70x0.dsc
> @@ -138,9 +138,5 @@
>    gMarvellTokenSpaceGuid.PcdPciEAhci|{ 0x1, 0x0 }
>    gMarvellTokenSpaceGuid.PcdPciESdhci|{ 0x1, 0x1 }
>  
> -  #ResetLib
> -  gMarvellTokenSpaceGuid.PcdResetRegAddress|0xf06f0084
> -  gMarvellTokenSpaceGuid.PcdResetRegMask|0x1
> -
>    #RTC
>    gMarvellTokenSpaceGuid.PcdRtcEnabled|{ 0x1 }
> diff --git a/Platform/Marvell/Marvell.dec b/Platform/Marvell/Marvell.dec
> index 78f5e53..434d6cb 100644
> --- a/Platform/Marvell/Marvell.dec
> +++ b/Platform/Marvell/Marvell.dec
> @@ -188,10 +188,6 @@
>    gMarvellTokenSpaceGuid.PcdPciEAhci|{ 0x0 }|VOID*|0x3000034
>    gMarvellTokenSpaceGuid.PcdPciESdhci|{ 0x0 }|VOID*|0x3000035
>  
> -#ResetLib
> -  gMarvellTokenSpaceGuid.PcdResetRegAddress|0|UINT64|0x40000050
> -  gMarvellTokenSpaceGuid.PcdResetRegMask|0|UINT32|0x4000051
> -
>  #RTC
>    gMarvellTokenSpaceGuid.PcdRtcEnabled|{ 0x0 }|VOID*|0x40000052
>  
> diff --git a/Silicon/Marvell/Documentation/PortingGuide.txt b/Silicon/Marvell/Documentation/PortingGuide.txt
> index 66ec918..cbe3bed 100644
> --- a/Silicon/Marvell/Documentation/PortingGuide.txt
> +++ b/Silicon/Marvell/Documentation/PortingGuide.txt
> @@ -383,15 +383,6 @@ Set pin 6 and 7 to 0xa function:
>                   gMarvellTokenSpaceGuid.PcdChip0MppSel0|{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa, 0xa, 0x0, 0x0 }
>  
>  
> -MarvellResetSystemLib configuration
> -===================================
> -This simple library allows to mask given bits in given reg at UEFI 'reset'
> -command call. These variables are configurable through PCDs:
> -
> -  - gMarvellTokenSpaceGuid.PcdResetRegAddress
> -  - gMarvellTokenSpaceGuid.PcdResetRegMask
> -
> -
>  Ramdisk configuration
>  =====================
>  There is one PCD available for Ramdisk configuration
> -- 
> 2.7.4
> 
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel