[edk2] Platform/Silicon: clean up BeagleBoard cargo culting

Message ID 20170824162153.23494-1-leif.lindholm@linaro.org
State New
Headers show

Commit Message

Leif Lindholm Aug. 24, 2017, 4:21 p.m.
A group of Pcd settings have been copied around ARM platforms from the
original BeagleBoardPkg, which
1) Used Ebl.
2) Was designed to minimise image size.

None of the affected platforms _use_ Ebl, and all of them could benefit
from keeping ComponentName*Protocol information around, so remove these
overrides and build with default settings.

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

---
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 22 ----------------------
 Platform/Marvell/Armada/Armada.dsc.inc       | 22 ----------------------
 Silicon/Hisilicon/Hisilicon.dsc.inc          | 23 -----------------------
 3 files changed, 67 deletions(-)

-- 
2.11.0

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

Comments

Ard Biesheuvel Aug. 24, 2017, 6:28 p.m. | #1
On 24 August 2017 at 17:21, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> A group of Pcd settings have been copied around ARM platforms from the

> original BeagleBoardPkg, which

> 1) Used Ebl.

> 2) Was designed to minimise image size.

>

> None of the affected platforms _use_ Ebl, and all of them could benefit

> from keeping ComponentName*Protocol information around, so remove these

> overrides and build with default settings.

>

> Contributed-under: TianoCore Contribution Agreement 1.1

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


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


> ---

>  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 22 ----------------------

>  Platform/Marvell/Armada/Armada.dsc.inc       | 22 ----------------------

>  Silicon/Hisilicon/Hisilicon.dsc.inc          | 23 -----------------------

>  3 files changed, 67 deletions(-)

>

> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc

> index f2a05e8e6..12ce5ad96 100644

> --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc

> +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc

> @@ -280,23 +280,6 @@

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

>

>  [PcdsFeatureFlag.common]

> -  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|TRUE

> -  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE

> -  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE

> -  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE

> -

> -  #

> -  # Control what commands are supported from the UI

> -  # Turn these on and off to add features or save size

> -  #

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedHobCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedHwDebugCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedPciDebugCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedIoEnable|FALSE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedScriptCmd|FALSE

> -

>    gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE

>

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

> @@ -312,7 +295,6 @@

>    gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"

>  !endif

>

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"VExpress"

>    gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

>    gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000

>    gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000

> @@ -356,10 +338,6 @@

>    #  DEBUG_ERROR     0x80000000  // Error

>    gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F

>

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|""

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000

> -

>    #

>    # Optional feature to help prevent EFI memory map fragments

>    # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob

> diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc

> index 4e8f289fc..7e5c55c05 100644

> --- a/Platform/Marvell/Armada/Armada.dsc.inc

> +++ b/Platform/Marvell/Armada/Armada.dsc.inc

> @@ -208,23 +208,6 @@

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

>

>  [PcdsFeatureFlag.common]

> -  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|TRUE

> -  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE

> -  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE

> -  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE

> -

> -  #

> -  # Control what commands are supported from the UI

> -  # Turn these on and off to add features or save size

> -  #

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedHobCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedHwDebugCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedPciDebugCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedIoEnable|FALSE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedScriptCmd|FALSE

> -

>    gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE

>

>    # Use the Vector Table location in CpuDxe.

> @@ -250,7 +233,6 @@

>    gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"

>    gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"

>

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"Marvell>> "

>    gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

>    gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000

>    gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000

> @@ -323,10 +305,6 @@

>    gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F

>  !endif

>

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|""

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000

> -

>    #

>    # Optional feature to help prevent EFI memory map fragments

>    # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob

> diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc

> index a48c4773a..dd7fa6a3d 100644

> --- a/Silicon/Hisilicon/Hisilicon.dsc.inc

> +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc

> @@ -238,25 +238,6 @@

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

>

>  [PcdsFeatureFlag.common]

> -  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|TRUE

> -  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE

> -  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE

> -  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE

> -

> -  #

> -  # Control what commands are supported from the UI

> -  # Turn these on and off to add features or save size

> -  #

> -  ## Set PcdEmbeddedMacBoot to FALSE, or console mode will be changed when

> -  ## entering EBL and not restored when exiting.

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|FALSE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedHobCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedHwDebugCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedPciDebugCmd|TRUE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedIoEnable|FALSE

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedScriptCmd|FALSE

> -

>    gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE

>

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

> @@ -273,7 +254,6 @@

>  [PcdsFixedAtBuild.common]

>    gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express"

>

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"VExpress"

>    gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|44

>    gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0

>    gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

> @@ -316,9 +296,6 @@

>

>    gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000004

>    gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|""

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07

> -  gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000

>

>    #

>    # Optional feature to help prevent EFI memory map fragments

> --

> 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/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index f2a05e8e6..12ce5ad96 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -280,23 +280,6 @@ 
 ################################################################################
 
 [PcdsFeatureFlag.common]
-  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE
-
-  #
-  # Control what commands are supported from the UI
-  # Turn these on and off to add features or save size
-  #
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedHobCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedHwDebugCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedPciDebugCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedIoEnable|FALSE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedScriptCmd|FALSE
-
   gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE
 
   # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress
@@ -312,7 +295,6 @@ 
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
 !endif
 
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"VExpress"
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000
   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000
   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000
@@ -356,10 +338,6 @@ 
   #  DEBUG_ERROR     0x80000000  // Error
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F
 
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|""
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000
-
   #
   # Optional feature to help prevent EFI memory map fragments
   # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob
diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
index 4e8f289fc..7e5c55c05 100644
--- a/Platform/Marvell/Armada/Armada.dsc.inc
+++ b/Platform/Marvell/Armada/Armada.dsc.inc
@@ -208,23 +208,6 @@ 
 ################################################################################
 
 [PcdsFeatureFlag.common]
-  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE
-
-  #
-  # Control what commands are supported from the UI
-  # Turn these on and off to add features or save size
-  #
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedHobCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedHwDebugCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedPciDebugCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedIoEnable|FALSE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedScriptCmd|FALSE
-
   gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE
 
   # Use the Vector Table location in CpuDxe.
@@ -250,7 +233,6 @@ 
   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"
   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"
 
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"Marvell>> "
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000
   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000
   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000
@@ -323,10 +305,6 @@ 
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F
 !endif
 
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|""
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000
-
   #
   # Optional feature to help prevent EFI memory map fragments
   # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob
diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
index a48c4773a..dd7fa6a3d 100644
--- a/Silicon/Hisilicon/Hisilicon.dsc.inc
+++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
@@ -238,25 +238,6 @@ 
 ################################################################################
 
 [PcdsFeatureFlag.common]
-  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE
-
-  #
-  # Control what commands are supported from the UI
-  # Turn these on and off to add features or save size
-  #
-  ## Set PcdEmbeddedMacBoot to FALSE, or console mode will be changed when
-  ## entering EBL and not restored when exiting.
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|FALSE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedHobCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedHwDebugCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedPciDebugCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedIoEnable|FALSE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedScriptCmd|FALSE
-
   gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE
 
   # Use the Vector Table location in CpuDxe. We will not copy the Vector Table at PcdCpuVectorBaseAddress
@@ -273,7 +254,6 @@ 
 [PcdsFixedAtBuild.common]
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express"
 
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"VExpress"
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|44
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000
@@ -316,9 +296,6 @@ 
 
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000004
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|""
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000
 
   #
   # Optional feature to help prevent EFI memory map fragments