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

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

...

Clean up any [commented out] references to the recently removed DebugUncachedMemoryAllocationLib, and to the related PCD PcdArmUncachedMemoryMask which will be removed as soon as all references are gone.

While we're at it, remove some stale comments as well.

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

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

Pushed, thanks.

...

---

Chips/Hisilicon/Hisilicon.dsc.inc | 9 --------- Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 5 ----- Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 10 ---------- Platforms/Hisilicon/D02/Pv660D02.dsc | 10 ---------- Platforms/Hisilicon/D03/D03.dsc | 12 ------------ Platforms/Hisilicon/D05/D05.dsc | 7 ------- Platforms/Hisilicon/HiKey/HiKey.dsc | 5 ----- Platforms/Marvell/Armada/Armada.dsc.inc | 1 - 8 files changed, 59 deletions(-)

diff --git a/Chips/Hisilicon/Hisilicon.dsc.inc b/Chips/Hisilicon/Hisilicon.dsc.inc index 510ee1d2898e..4c6eea0ea428 100644 --- a/Chips/Hisilicon/Hisilicon.dsc.inc +++ b/Chips/Hisilicon/Hisilicon.dsc.inc @@ -340,15 +340,6 @@ gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0

#

• # ARM Pcds
• #
• gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000
• #
• # ARM PrimeCell
• #
• # # ARM OS Loader # # Versatile Express machine type (ARM VERSATILE EXPRESS = 2272) required for ARM Linux:

diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc index cf4b803096f1..56feed48495f 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc @@ -114,11 +114,6 @@ # 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 NS EL2 in ArmPlatformPkg/Sec) gArmTokenSpaceGuid.PcdTrustzoneSupport|TRUE

diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc index ddf617c850c8..c94001b3bcdb 100644 --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc @@ -25,7 +25,6 @@ !else DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf -# UncachedMemoryAllocationLib|ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf !endif DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

@@ -394,15 +393,6 @@ gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath|L"VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)"

#

• # ARM Pcds
• #
• gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000
• #
• # ARM PrimeCell
• #
• # # FileSystem #

diff --git a/Platforms/Hisilicon/D02/Pv660D02.dsc b/Platforms/Hisilicon/D02/Pv660D02.dsc index 2f5fbe53217a..b61157905829 100644 --- a/Platforms/Hisilicon/D02/Pv660D02.dsc +++ b/Platforms/Hisilicon/D02/Pv660D02.dsc @@ -126,16 +126,6 @@ # Size of the region used by UEFI in permanent memory (Reserved 64MB) gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x10000000

• #
• # ARM Pcds
• #
• gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000
• #
• # ARM PrimeCell
• #
• ## SP805 Watchdog - Motherboard Watchdog gArmPlatformTokenSpaceGuid.PcdSP805WatchdogBase|0x801e0000

diff --git a/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc index 4c903268c8b3..9c73494c7398 100644 --- a/Platforms/Hisilicon/D03/D03.dsc +++ b/Platforms/Hisilicon/D03/D03.dsc @@ -143,18 +143,6 @@ gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x10000000

gHisiTokenSpaceGuid.PcdSerDesFlowCtrlFlag|1

• #
• # ARM Pcds
• #
• gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000
• #
• # ARM PrimeCell
• #
• gHisiTokenSpaceGuid.PcdSlotPerChannelNum|0x2

diff --git a/Platforms/Hisilicon/D05/D05.dsc b/Platforms/Hisilicon/D05/D05.dsc index 5645b15b255c..2877da013bd5 100644 --- a/Platforms/Hisilicon/D05/D05.dsc +++ b/Platforms/Hisilicon/D05/D05.dsc @@ -155,13 +155,6 @@ gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x10000000

gHisiTokenSpaceGuid.PcdSerDesFlowCtrlFlag|1

• #
• # ARM Pcds
• #
• gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000
• gHisiTokenSpaceGuid.PcdSlotPerChannelNum|0x2

diff --git a/Platforms/Hisilicon/HiKey/HiKey.dsc b/Platforms/Hisilicon/HiKey/HiKey.dsc index 492faaa02429..a9b29f2b0e9b 100644 --- a/Platforms/Hisilicon/HiKey/HiKey.dsc +++ b/Platforms/Hisilicon/HiKey/HiKey.dsc @@ -296,11 +296,6 @@ gArmTokenSpaceGuid.PcdVFPEnabled|1

#

• # ARM Pcds
• #
• gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000
• # # ARM PrimeCell #

diff --git a/Platforms/Marvell/Armada/Armada.dsc.inc b/Platforms/Marvell/Armada/Armada.dsc.inc index aac6b7f66f78..da48ea6702e1 100644 --- a/Platforms/Marvell/Armada/Armada.dsc.inc +++ b/Platforms/Marvell/Armada/Armada.dsc.inc @@ -359,7 +359,6 @@ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

# ARM Pcds

• gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000 gArmTokenSpaceGuid.PcdSystemMemoryBase|0 gArmTokenSpaceGuid.PcdSystemMemorySize|0x40000000 gArmTokenSpaceGuid.PcdArmScr|0x531

-- 2.7.4