[edk2] ArmPkg: remove unused PcdArmUncachedMemoryMask PCD

Message ID 1487961625-16786-1-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel Feb. 24, 2017, 6:40 p.m.
This removes the PCD PcdArmUncachedMemoryMask from ArmPkg, along with
any remaining references to it in various platform .DSC files. It is
no longer used now that we removed the virtual uncached pages protocol
and the associated DebugUncachedMemoryAllocationLib library instance.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 ArmPkg/ArmPkg.dec                 | 1 -
 ArmVirtPkg/ArmVirtQemu.dsc        | 5 -----
 ArmVirtPkg/ArmVirtQemuKernel.dsc  | 5 -----
 BeagleBoardPkg/BeagleBoardPkg.dsc | 5 -----
 Omap35xxPkg/Omap35xxPkg.dsc       | 5 -----
 5 files changed, 21 deletions(-)

-- 
2.7.4

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

Comments

Laszlo Ersek Feb. 24, 2017, 11:18 p.m. | #1
On 02/24/17 19:40, Ard Biesheuvel wrote:
> This removes the PCD PcdArmUncachedMemoryMask from ArmPkg, along with

> any remaining references to it in various platform .DSC files. It is

> no longer used now that we removed the virtual uncached pages protocol

> and the associated DebugUncachedMemoryAllocationLib library instance.

> 

> Contributed-under: TianoCore Contribution Agreement 1.0

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

> ---

>  ArmPkg/ArmPkg.dec                 | 1 -

>  ArmVirtPkg/ArmVirtQemu.dsc        | 5 -----

>  ArmVirtPkg/ArmVirtQemuKernel.dsc  | 5 -----

>  BeagleBoardPkg/BeagleBoardPkg.dsc | 5 -----

>  Omap35xxPkg/Omap35xxPkg.dsc       | 5 -----

>  5 files changed, 21 deletions(-)

> 

> diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec

> index 4fd7a5be5158..c4b4da2f95bb 100644

> --- a/ArmPkg/ArmPkg.dec

> +++ b/ArmPkg/ArmPkg.dec

> @@ -84,7 +84,6 @@ [PcdsFixedAtBuild.common]

>    # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor.

>    gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024

>  

> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000080000000|UINT64|0x00000002

>    # This PCD will free the unallocated buffers if their size reach this threshold.

>    # We set the default value to 512MB.

>    gArmTokenSpaceGuid.PcdArmFreeUncachedMemorySizeThreshold|0x20000000|UINT64|0x00000003

> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc

> index 8fe3c3816961..00cdd7c20201 100644

> --- a/ArmVirtPkg/ArmVirtQemu.dsc

> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

> @@ -113,11 +113,6 @@ [PcdsFixedAtBuild.common]

>    # Size of the region used by UEFI in permanent memory (Reserved 64MB)

>    gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

>  

> -  #

> -  # ARM Pcds

> -  #

> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

> -

>    ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)

>    gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE

>  

> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> index aa40374745af..8354b13ddb1a 100644

> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> @@ -113,11 +113,6 @@ [PcdsFixedAtBuild.common]

>    # Size of the region used by UEFI in permanent memory (Reserved 64MB)

>    gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

>  

> -  #

> -  # ARM Pcds

> -  #

> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

> -

>    ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)

>    gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE

>  

> diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc

> index a71a01ac7723..87879c33fcd9 100644

> --- a/BeagleBoardPkg/BeagleBoardPkg.dsc

> +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc

> @@ -368,11 +368,6 @@ [PcdsFixedAtBuild.common]

>    # Shell.

>    gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

>  

> -  #

> -  # ARM Pcds

> -  #

> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

> -

>    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10

>  

>    # GUID of the UEFI Shell

> diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc

> index ad7d9898c330..fc94ca7ed129 100644

> --- a/Omap35xxPkg/Omap35xxPkg.dsc

> +++ b/Omap35xxPkg/Omap35xxPkg.dsc

> @@ -162,11 +162,6 @@ [PcdsFixedAtBuild.common]

>    # OMAP Interrupt Controller

>    gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000

>  

> -  #

> -  # ARM Pcds

> -  #

> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

> -

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

>  #

>  # Components Section - list of all EDK II Modules needed by this Platform

> 


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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Leif Lindholm Feb. 27, 2017, 3:44 p.m. | #2
On Fri, Feb 24, 2017 at 06:40:25PM +0000, Ard Biesheuvel wrote:
> This removes the PCD PcdArmUncachedMemoryMask from ArmPkg, along with

> any remaining references to it in various platform .DSC files. It is

> no longer used now that we removed the virtual uncached pages protocol

> and the associated DebugUncachedMemoryAllocationLib library instance.

> 

> Contributed-under: TianoCore Contribution Agreement 1.0

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


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


> ---

>  ArmPkg/ArmPkg.dec                 | 1 -

>  ArmVirtPkg/ArmVirtQemu.dsc        | 5 -----

>  ArmVirtPkg/ArmVirtQemuKernel.dsc  | 5 -----

>  BeagleBoardPkg/BeagleBoardPkg.dsc | 5 -----

>  Omap35xxPkg/Omap35xxPkg.dsc       | 5 -----

>  5 files changed, 21 deletions(-)

> 

> diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec

> index 4fd7a5be5158..c4b4da2f95bb 100644

> --- a/ArmPkg/ArmPkg.dec

> +++ b/ArmPkg/ArmPkg.dec

> @@ -84,7 +84,6 @@ [PcdsFixedAtBuild.common]

>    # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor.

>    gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024

>  

> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000080000000|UINT64|0x00000002

>    # This PCD will free the unallocated buffers if their size reach this threshold.

>    # We set the default value to 512MB.

>    gArmTokenSpaceGuid.PcdArmFreeUncachedMemorySizeThreshold|0x20000000|UINT64|0x00000003

> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc

> index 8fe3c3816961..00cdd7c20201 100644

> --- a/ArmVirtPkg/ArmVirtQemu.dsc

> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

> @@ -113,11 +113,6 @@ [PcdsFixedAtBuild.common]

>    # Size of the region used by UEFI in permanent memory (Reserved 64MB)

>    gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

>  

> -  #

> -  # ARM Pcds

> -  #

> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

> -

>    ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)

>    gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE

>  

> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> index aa40374745af..8354b13ddb1a 100644

> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> @@ -113,11 +113,6 @@ [PcdsFixedAtBuild.common]

>    # Size of the region used by UEFI in permanent memory (Reserved 64MB)

>    gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

>  

> -  #

> -  # ARM Pcds

> -  #

> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

> -

>    ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)

>    gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE

>  

> diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc

> index a71a01ac7723..87879c33fcd9 100644

> --- a/BeagleBoardPkg/BeagleBoardPkg.dsc

> +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc

> @@ -368,11 +368,6 @@ [PcdsFixedAtBuild.common]

>    # Shell.

>    gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

>  

> -  #

> -  # ARM Pcds

> -  #

> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

> -

>    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10

>  

>    # GUID of the UEFI Shell

> diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc

> index ad7d9898c330..fc94ca7ed129 100644

> --- a/Omap35xxPkg/Omap35xxPkg.dsc

> +++ b/Omap35xxPkg/Omap35xxPkg.dsc

> @@ -162,11 +162,6 @@ [PcdsFixedAtBuild.common]

>    # OMAP Interrupt Controller

>    gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000

>  

> -  #

> -  # ARM Pcds

> -  #

> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

> -

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

>  #

>  # Components Section - list of all EDK II Modules needed by this Platform

> -- 

> 2.7.4

> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Feb. 27, 2017, 4:18 p.m. | #3
On 27 February 2017 at 15:44, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Fri, Feb 24, 2017 at 06:40:25PM +0000, Ard Biesheuvel wrote:

>> This removes the PCD PcdArmUncachedMemoryMask from ArmPkg, along with

>> any remaining references to it in various platform .DSC files. It is

>> no longer used now that we removed the virtual uncached pages protocol

>> and the associated DebugUncachedMemoryAllocationLib library instance.

>>

>> Contributed-under: TianoCore Contribution Agreement 1.0

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

>

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

>


Thank you both

I missed this one

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04

so I will fold that in, if there are no objections.

Thanks,
Ard.




>> ---

>>  ArmPkg/ArmPkg.dec                 | 1 -

>>  ArmVirtPkg/ArmVirtQemu.dsc        | 5 -----

>>  ArmVirtPkg/ArmVirtQemuKernel.dsc  | 5 -----

>>  BeagleBoardPkg/BeagleBoardPkg.dsc | 5 -----

>>  Omap35xxPkg/Omap35xxPkg.dsc       | 5 -----

>>  5 files changed, 21 deletions(-)

>>

>> diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec

>> index 4fd7a5be5158..c4b4da2f95bb 100644

>> --- a/ArmPkg/ArmPkg.dec

>> +++ b/ArmPkg/ArmPkg.dec

>> @@ -84,7 +84,6 @@ [PcdsFixedAtBuild.common]

>>    # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor.

>>    gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024

>>

>> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000080000000|UINT64|0x00000002

>>    # This PCD will free the unallocated buffers if their size reach this threshold.

>>    # We set the default value to 512MB.

>>    gArmTokenSpaceGuid.PcdArmFreeUncachedMemorySizeThreshold|0x20000000|UINT64|0x00000003

>> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc

>> index 8fe3c3816961..00cdd7c20201 100644

>> --- a/ArmVirtPkg/ArmVirtQemu.dsc

>> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

>> @@ -113,11 +113,6 @@ [PcdsFixedAtBuild.common]

>>    # Size of the region used by UEFI in permanent memory (Reserved 64MB)

>>    gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

>>

>> -  #

>> -  # ARM Pcds

>> -  #

>> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

>> -

>>    ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)

>>    gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE

>>

>> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc

>> index aa40374745af..8354b13ddb1a 100644

>> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

>> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

>> @@ -113,11 +113,6 @@ [PcdsFixedAtBuild.common]

>>    # Size of the region used by UEFI in permanent memory (Reserved 64MB)

>>    gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

>>

>> -  #

>> -  # ARM Pcds

>> -  #

>> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

>> -

>>    ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)

>>    gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE

>>

>> diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc

>> index a71a01ac7723..87879c33fcd9 100644

>> --- a/BeagleBoardPkg/BeagleBoardPkg.dsc

>> +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc

>> @@ -368,11 +368,6 @@ [PcdsFixedAtBuild.common]

>>    # Shell.

>>    gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

>>

>> -  #

>> -  # ARM Pcds

>> -  #

>> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

>> -

>>    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10

>>

>>    # GUID of the UEFI Shell

>> diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc

>> index ad7d9898c330..fc94ca7ed129 100644

>> --- a/Omap35xxPkg/Omap35xxPkg.dsc

>> +++ b/Omap35xxPkg/Omap35xxPkg.dsc

>> @@ -162,11 +162,6 @@ [PcdsFixedAtBuild.common]

>>    # OMAP Interrupt Controller

>>    gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000

>>

>> -  #

>> -  # ARM Pcds

>> -  #

>> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

>> -

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

>>  #

>>  # Components Section - list of all EDK II Modules needed by this Platform

>> --

>> 2.7.4

>>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-develdiff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index cc09d38910a2..d40ea69b072d 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -360,11 +360,6 @@ [PcdsFixedAtBuild.common]
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0

-  #
-  # ARM Pcds
-  #
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000
-
 !if $(SECURE_BOOT_ENABLE) == TRUE
   # override the default values from SecurityPkg to ensure images
from all sources are verified in secure boot

Laszlo Ersek Feb. 27, 2017, 4:25 p.m. | #4
On 02/27/17 17:18, Ard Biesheuvel wrote:
> On 27 February 2017 at 15:44, Leif Lindholm <leif.lindholm@linaro.org> wrote:

>> On Fri, Feb 24, 2017 at 06:40:25PM +0000, Ard Biesheuvel wrote:

>>> This removes the PCD PcdArmUncachedMemoryMask from ArmPkg, along with

>>> any remaining references to it in various platform .DSC files. It is

>>> no longer used now that we removed the virtual uncached pages protocol

>>> and the associated DebugUncachedMemoryAllocationLib library instance.

>>>

>>> Contributed-under: TianoCore Contribution Agreement 1.0

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

>>

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

>>

> 

> Thank you both

> 

> I missed this one

> 

> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc

> index cc09d38910a2..d40ea69b072d 100644

> --- a/ArmVirtPkg/ArmVirt.dsc.inc

> +++ b/ArmVirtPkg/ArmVirt.dsc.inc

> @@ -360,11 +360,6 @@ [PcdsFixedAtBuild.common]

>    gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20

>    gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0

> 

> -  #

> -  # ARM Pcds

> -  #

> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000

> -

>  !if $(SECURE_BOOT_ENABLE) == TRUE

>    # override the default values from SecurityPkg to ensure images

> from all sources are verified in secure boot

>    gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04

> 

> so I will fold that in, if there are no objections.


sure, go ahead

> 

> Thanks,

> Ard.

> 

> 

> 

> 

>>> ---

>>>  ArmPkg/ArmPkg.dec                 | 1 -

>>>  ArmVirtPkg/ArmVirtQemu.dsc        | 5 -----

>>>  ArmVirtPkg/ArmVirtQemuKernel.dsc  | 5 -----

>>>  BeagleBoardPkg/BeagleBoardPkg.dsc | 5 -----

>>>  Omap35xxPkg/Omap35xxPkg.dsc       | 5 -----

>>>  5 files changed, 21 deletions(-)

>>>

>>> diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec

>>> index 4fd7a5be5158..c4b4da2f95bb 100644

>>> --- a/ArmPkg/ArmPkg.dec

>>> +++ b/ArmPkg/ArmPkg.dec

>>> @@ -84,7 +84,6 @@ [PcdsFixedAtBuild.common]

>>>    # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor.

>>>    gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024

>>>

>>> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000080000000|UINT64|0x00000002

>>>    # This PCD will free the unallocated buffers if their size reach this threshold.

>>>    # We set the default value to 512MB.

>>>    gArmTokenSpaceGuid.PcdArmFreeUncachedMemorySizeThreshold|0x20000000|UINT64|0x00000003

>>> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc

>>> index 8fe3c3816961..00cdd7c20201 100644

>>> --- a/ArmVirtPkg/ArmVirtQemu.dsc

>>> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

>>> @@ -113,11 +113,6 @@ [PcdsFixedAtBuild.common]

>>>    # Size of the region used by UEFI in permanent memory (Reserved 64MB)

>>>    gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

>>>

>>> -  #

>>> -  # ARM Pcds

>>> -  #

>>> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

>>> -

>>>    ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)

>>>    gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE

>>>

>>> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc

>>> index aa40374745af..8354b13ddb1a 100644

>>> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

>>> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

>>> @@ -113,11 +113,6 @@ [PcdsFixedAtBuild.common]

>>>    # Size of the region used by UEFI in permanent memory (Reserved 64MB)

>>>    gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

>>>

>>> -  #

>>> -  # ARM Pcds

>>> -  #

>>> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

>>> -

>>>    ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)

>>>    gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE

>>>

>>> diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc

>>> index a71a01ac7723..87879c33fcd9 100644

>>> --- a/BeagleBoardPkg/BeagleBoardPkg.dsc

>>> +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc

>>> @@ -368,11 +368,6 @@ [PcdsFixedAtBuild.common]

>>>    # Shell.

>>>    gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

>>>

>>> -  #

>>> -  # ARM Pcds

>>> -  #

>>> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

>>> -

>>>    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10

>>>

>>>    # GUID of the UEFI Shell

>>> diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc

>>> index ad7d9898c330..fc94ca7ed129 100644

>>> --- a/Omap35xxPkg/Omap35xxPkg.dsc

>>> +++ b/Omap35xxPkg/Omap35xxPkg.dsc

>>> @@ -162,11 +162,6 @@ [PcdsFixedAtBuild.common]

>>>    # OMAP Interrupt Controller

>>>    gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000

>>>

>>> -  #

>>> -  # ARM Pcds

>>> -  #

>>> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000

>>> -

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

>>>  #

>>>  # Components Section - list of all EDK II Modules needed by this Platform

>>> --

>>> 2.7.4

>>>


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Feb. 27, 2017, 4:39 p.m. | #5
On 27 February 2017 at 16:25, Laszlo Ersek <lersek@redhat.com> wrote:
> On 02/27/17 17:18, Ard Biesheuvel wrote:

>> On 27 February 2017 at 15:44, Leif Lindholm <leif.lindholm@linaro.org> wrote:

>>> On Fri, Feb 24, 2017 at 06:40:25PM +0000, Ard Biesheuvel wrote:

>>>> This removes the PCD PcdArmUncachedMemoryMask from ArmPkg, along with

>>>> any remaining references to it in various platform .DSC files. It is

>>>> no longer used now that we removed the virtual uncached pages protocol

>>>> and the associated DebugUncachedMemoryAllocationLib library instance.

>>>>

>>>> Contributed-under: TianoCore Contribution Agreement 1.0

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

>>>

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

>>>

>>

>> Thank you both

>>

>> I missed this one

>>

>> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc

>> index cc09d38910a2..d40ea69b072d 100644

>> --- a/ArmVirtPkg/ArmVirt.dsc.inc

>> +++ b/ArmVirtPkg/ArmVirt.dsc.inc

>> @@ -360,11 +360,6 @@ [PcdsFixedAtBuild.common]

>>    gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20

>>    gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0

>>

>> -  #

>> -  # ARM Pcds

>> -  #

>> -  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000

>> -

>>  !if $(SECURE_BOOT_ENABLE) == TRUE

>>    # override the default values from SecurityPkg to ensure images

>> from all sources are verified in secure boot

>>    gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04

>>

>> so I will fold that in, if there are no objections.

>

> sure, go ahead

>


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

Patch

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 4fd7a5be5158..c4b4da2f95bb 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -84,7 +84,6 @@  [PcdsFixedAtBuild.common]
   # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor.
   gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024
 
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000080000000|UINT64|0x00000002
   # This PCD will free the unallocated buffers if their size reach this threshold.
   # We set the default value to 512MB.
   gArmTokenSpaceGuid.PcdArmFreeUncachedMemorySizeThreshold|0x20000000|UINT64|0x00000003
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 8fe3c3816961..00cdd7c20201 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -113,11 +113,6 @@  [PcdsFixedAtBuild.common]
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000
 
-  #
-  # ARM Pcds
-  #
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000
-
   ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)
   gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE
 
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index aa40374745af..8354b13ddb1a 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -113,11 +113,6 @@  [PcdsFixedAtBuild.common]
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000
 
-  #
-  # ARM Pcds
-  #
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000
-
   ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)
   gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE
 
diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index a71a01ac7723..87879c33fcd9 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -368,11 +368,6 @@  [PcdsFixedAtBuild.common]
   # Shell.
   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
 
-  #
-  # ARM Pcds
-  #
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000
-
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10
 
   # GUID of the UEFI Shell
diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc
index ad7d9898c330..fc94ca7ed129 100644
--- a/Omap35xxPkg/Omap35xxPkg.dsc
+++ b/Omap35xxPkg/Omap35xxPkg.dsc
@@ -162,11 +162,6 @@  [PcdsFixedAtBuild.common]
   # OMAP Interrupt Controller
   gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000
 
-  #
-  # ARM Pcds
-  #
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000
-
 ################################################################################
 #
 # Components Section - list of all EDK II Modules needed by this Platform