[edk2,edk2-platforms,1/3] Platform/(AMD|LeMaker|SoftIron), Silicon/AMD: drop unused PcdCacheEnabled

Message ID 20180208193021.24524-1-leif.lindholm@linaro.org
State New
Headers show
Series
  • [edk2,edk2-platforms,1/3] Platform/(AMD|LeMaker|SoftIron), Silicon/AMD: drop unused PcdCacheEnabled
Related show

Commit Message

Leif Lindholm Feb. 8, 2018, 7:30 p.m.
PcdCacheEnabled	was never useful for these platforms, but they copied it
over from other platforms used as templates.
Delete it here to keep the platforms building once the Pcd is removed
from EmbeddedPkg.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

---
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc              | 3 ---
 Platform/LeMaker/CelloBoard/CelloBoard.dsc                  | 3 ---
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 3 ---
 Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf          | 3 ---
 Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf       | 3 ---
 Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c               | 6 +-----
 6 files changed, 1 insertion(+), 20 deletions(-)

-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ard Biesheuvel Feb. 8, 2018, 7:46 p.m. | #1
On 8 February 2018 at 19:30, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> PcdCacheEnabled was never useful for these platforms, but they copied it

> over from other platforms used as templates.

> Delete it here to keep the platforms building once the Pcd is removed

> from EmbeddedPkg.

>

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>


For the series:
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


> ---

>  Platform/AMD/OverdriveBoard/OverdriveBoard.dsc              | 3 ---

>  Platform/LeMaker/CelloBoard/CelloBoard.dsc                  | 3 ---

>  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 3 ---

>  Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf          | 3 ---

>  Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf       | 3 ---

>  Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c               | 6 +-----

>  6 files changed, 1 insertion(+), 20 deletions(-)

>

> diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> index 21edcc8798..48018abc69 100644

> --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> @@ -282,9 +282,6 @@ [BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,Buil

>  ################################################################################

>

>  [PcdsFeatureFlag.common]

> -  # All pages are cached by default

> -  gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE

> -

>    # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress

>    gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE

>

> diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc

> index cf3df86514..2468583c0d 100644

> --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc

> +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc

> @@ -270,9 +270,6 @@ [BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,Buil

>  ################################################################################

>

>  [PcdsFeatureFlag.common]

> -  # All pages are cached by default

> -  gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE

> -

>    # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress

>    gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE

>

> diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc

> index 0abec8120a..f0a7e97941 100644

> --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc

> +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc

> @@ -272,9 +272,6 @@ [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]

>  ################################################################################

>

>  [PcdsFeatureFlag.common]

> -  # All pages are cached by default

> -  gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE

> -

>    # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress

>    gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE

>

> diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf

> index 6b7481ec6d..3a38f294eb 100644

> --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf

> +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf

> @@ -53,9 +53,6 @@ [Guids]

>  [Ppis]

>    gArmMpCoreInfoPpiGuid

>

> -[FeaturePcd]

> -  gEmbeddedTokenSpaceGuid.PcdCacheEnable

> -

>  [Pcd]

>    gArmTokenSpaceGuid.PcdSystemMemoryBase

>    gArmTokenSpaceGuid.PcdSystemMemorySize

> diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf

> index b313d4baad..b24ffd469a 100644

> --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf

> +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf

> @@ -49,9 +49,6 @@ [Sources.AARCH64]

>  [Guids]

>    gAmdStyxMpCoreInfoGuid               ## CONSUMER

>

> -[FeaturePcd]

> -  gEmbeddedTokenSpaceGuid.PcdCacheEnable

> -

>  [Ppis]

>    gArmMpCoreInfoPpiGuid

>

> diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c b/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c

> index 3b82132d08..479a40627d 100644

> --- a/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c

> +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c

> @@ -78,11 +78,7 @@ ArmPlatformGetVirtualMemoryMap (

>        return;

>    }

>

> -  if (FeaturePcdGet(PcdCacheEnable) == TRUE) {

> -      CacheAttributes = DDR_ATTRIBUTES_CACHED;

> -  } else {

> -      CacheAttributes = DDR_ATTRIBUTES_UNCACHED;

> -  }

> +  CacheAttributes = DDR_ATTRIBUTES_CACHED;

>

>    DEBUG ((EFI_D_ERROR, " Memory Map\n------------------------------------------------------------------------\n"));

>    DEBUG ((EFI_D_ERROR, "Description                    :        START       -        END         [        SIZE        ]    {              ATTR             }\n"));

> --

> 2.11.0

>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Leif Lindholm Feb. 9, 2018, 9:41 a.m. | #2
On Thu, Feb 08, 2018 at 07:46:49PM +0000, Ard Biesheuvel wrote:
> On 8 February 2018 at 19:30, Leif Lindholm <leif.lindholm@linaro.org> wrote:

> > PcdCacheEnabled was never useful for these platforms, but they copied it

> > over from other platforms used as templates.

> > Delete it here to keep the platforms building once the Pcd is removed

> > from EmbeddedPkg.

> >

> > Contributed-under: TianoCore Contribution Agreement 1.1

> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

> 

> For the series:

> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Thanks!
Pushed as 69f992e854..ebe08785ae.

> > ---

> >  Platform/AMD/OverdriveBoard/OverdriveBoard.dsc              | 3 ---

> >  Platform/LeMaker/CelloBoard/CelloBoard.dsc                  | 3 ---

> >  Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 3 ---

> >  Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf          | 3 ---

> >  Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf       | 3 ---

> >  Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c               | 6 +-----

> >  6 files changed, 1 insertion(+), 20 deletions(-)

> >

> > diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> > index 21edcc8798..48018abc69 100644

> > --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> > +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> > @@ -282,9 +282,6 @@ [BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,Buil

> >  ################################################################################

> >

> >  [PcdsFeatureFlag.common]

> > -  # All pages are cached by default

> > -  gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE

> > -

> >    # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress

> >    gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE

> >

> > diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc

> > index cf3df86514..2468583c0d 100644

> > --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc

> > +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc

> > @@ -270,9 +270,6 @@ [BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,Buil

> >  ################################################################################

> >

> >  [PcdsFeatureFlag.common]

> > -  # All pages are cached by default

> > -  gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE

> > -

> >    # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress

> >    gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE

> >

> > diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc

> > index 0abec8120a..f0a7e97941 100644

> > --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc

> > +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc

> > @@ -272,9 +272,6 @@ [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]

> >  ################################################################################

> >

> >  [PcdsFeatureFlag.common]

> > -  # All pages are cached by default

> > -  gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE

> > -

> >    # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress

> >    gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE

> >

> > diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf

> > index 6b7481ec6d..3a38f294eb 100644

> > --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf

> > +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf

> > @@ -53,9 +53,6 @@ [Guids]

> >  [Ppis]

> >    gArmMpCoreInfoPpiGuid

> >

> > -[FeaturePcd]

> > -  gEmbeddedTokenSpaceGuid.PcdCacheEnable

> > -

> >  [Pcd]

> >    gArmTokenSpaceGuid.PcdSystemMemoryBase

> >    gArmTokenSpaceGuid.PcdSystemMemorySize

> > diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf

> > index b313d4baad..b24ffd469a 100644

> > --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf

> > +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf

> > @@ -49,9 +49,6 @@ [Sources.AARCH64]

> >  [Guids]

> >    gAmdStyxMpCoreInfoGuid               ## CONSUMER

> >

> > -[FeaturePcd]

> > -  gEmbeddedTokenSpaceGuid.PcdCacheEnable

> > -

> >  [Ppis]

> >    gArmMpCoreInfoPpiGuid

> >

> > diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c b/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c

> > index 3b82132d08..479a40627d 100644

> > --- a/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c

> > +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c

> > @@ -78,11 +78,7 @@ ArmPlatformGetVirtualMemoryMap (

> >        return;

> >    }

> >

> > -  if (FeaturePcdGet(PcdCacheEnable) == TRUE) {

> > -      CacheAttributes = DDR_ATTRIBUTES_CACHED;

> > -  } else {

> > -      CacheAttributes = DDR_ATTRIBUTES_UNCACHED;

> > -  }

> > +  CacheAttributes = DDR_ATTRIBUTES_CACHED;

> >

> >    DEBUG ((EFI_D_ERROR, " Memory Map\n------------------------------------------------------------------------\n"));

> >    DEBUG ((EFI_D_ERROR, "Description                    :        START       -        END         [        SIZE        ]    {              ATTR             }\n"));

> > --

> > 2.11.0

> >

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 21edcc8798..48018abc69 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -282,9 +282,6 @@  [BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,Buil
 ################################################################################
 
 [PcdsFeatureFlag.common]
-  # All pages are cached by default
-  gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE
-
   # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress
   gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE
 
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index cf3df86514..2468583c0d 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -270,9 +270,6 @@  [BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,Buil
 ################################################################################
 
 [PcdsFeatureFlag.common]
-  # All pages are cached by default
-  gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE
-
   # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress
   gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE
 
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index 0abec8120a..f0a7e97941 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -272,9 +272,6 @@  [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
 ################################################################################
 
 [PcdsFeatureFlag.common]
-  # All pages are cached by default
-  gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE
-
   # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress
   gArmTokenSpaceGuid.PcdRelocateVectorTable|FALSE
 
diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
index 6b7481ec6d..3a38f294eb 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLib.inf
@@ -53,9 +53,6 @@  [Guids]
 [Ppis]
   gArmMpCoreInfoPpiGuid
 
-[FeaturePcd]
-  gEmbeddedTokenSpaceGuid.PcdCacheEnable
-
 [Pcd]
   gArmTokenSpaceGuid.PcdSystemMemoryBase
   gArmTokenSpaceGuid.PcdSystemMemorySize
diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
index b313d4baad..b24ffd469a 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AmdStyxLibSec.inf
@@ -49,9 +49,6 @@  [Sources.AARCH64]
 [Guids]
   gAmdStyxMpCoreInfoGuid               ## CONSUMER
 
-[FeaturePcd]
-  gEmbeddedTokenSpaceGuid.PcdCacheEnable
-
 [Ppis]
   gArmMpCoreInfoPpiGuid
 
diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c b/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c
index 3b82132d08..479a40627d 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/StyxMem.c
@@ -78,11 +78,7 @@  ArmPlatformGetVirtualMemoryMap (
       return;
   }
 
-  if (FeaturePcdGet(PcdCacheEnable) == TRUE) {
-      CacheAttributes = DDR_ATTRIBUTES_CACHED;
-  } else {
-      CacheAttributes = DDR_ATTRIBUTES_UNCACHED;
-  }
+  CacheAttributes = DDR_ATTRIBUTES_CACHED;
 
   DEBUG ((EFI_D_ERROR, " Memory Map\n------------------------------------------------------------------------\n"));
   DEBUG ((EFI_D_ERROR, "Description                    :        START       -        END         [        SIZE        ]    {              ATTR             }\n"));