[edk2,03/10] StandaloneMmPkg: switch to NULL DebugLib resolution

Message ID 20190305133248.4828-4-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • StandaloneMmPkg, ArmPkg: cleanups and improvements
Related show

Commit Message

Ard Biesheuvel March 5, 2019, 1:32 p.m.
Building StandaloneMmPkg from its .DSC is mainly intended for build
coverage, and so platform specific configuration such as UART addresses
don't belong here.

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

---
 StandaloneMmPkg/StandaloneMmPkg.dsc | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

-- 
2.20.1

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

Comments

Yao, Jiewen March 5, 2019, 2:22 p.m. | #1
Reviewed-by: jiewen.yao@intel.com


> -----Original Message-----

> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]

> Sent: Tuesday, March 5, 2019 5:33 AM

> To: edk2-devel@lists.01.org

> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>; Achin Gupta

> <achin.gupta@arm.com>; Supreeth Venkatesh

> <supreeth.venkatesh@arm.com>; Yao, Jiewen <jiewen.yao@intel.com>;

> Leif Lindholm <leif.lindholm@linaro.org>; Jagadeesh Ujja

> <jagadeesh.ujja@arm.com>

> Subject: [PATCH 03/10] StandaloneMmPkg: switch to NULL DebugLib

> resolution

> 

> Building StandaloneMmPkg from its .DSC is mainly intended for build

> coverage, and so platform specific configuration such as UART addresses

> don't belong here.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

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

> ---

>  StandaloneMmPkg/StandaloneMmPkg.dsc | 11 +----------

>  1 file changed, 1 insertion(+), 10 deletions(-)

> 

> diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc

> b/StandaloneMmPkg/StandaloneMmPkg.dsc

> index f279d9e7e5c7..8def9688fe7d 100644

> --- a/StandaloneMmPkg/StandaloneMmPkg.dsc

> +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc

> @@ -43,7 +43,7 @@ [LibraryClasses]

>    #

>    BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

>    BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

> -

> DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.

> inf

> +  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

> 

> DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas

> eDebugPrintErrorLevelLib.inf

>    FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf

> 

> HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneM

> mCoreHobLib.inf

> @@ -66,10 +66,6 @@ [LibraryClasses.AARCH64]

>    ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf

> 

> CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCach

> eMaintenanceLib.inf

> 

> PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtr

> aActionLib/StandaloneMmPeCoffExtraActionLib.inf

> -  PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf

> -

> PL011UartClockLib|ArmPlatformPkg/Library/PL011UartClockLib/PL011Uart

> ClockLib.inf

> -  # ARM PL011 UART Driver

> -

> SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLi

> b.inf

> 

> 

> StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmC

> oreEntryPoint/StandaloneMmCoreEntryPoint.inf

> 

> @@ -83,11 +79,6 @@ [PcdsFixedAtBuild]

>    gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xff

>    gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0f

> 

> -[PcdsFixedAtBuild.AARCH64]

> -  ## PL011 - Serial Terminal

> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x1c0b0000

> -  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

> -

> 

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

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

>  #

>  # Components Section - list of the modules and components that will be

> processed by compilation

> --

> 2.20.1


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Achin Gupta March 6, 2019, 3:38 p.m. | #2
Reviewed-by: achin.gupta@arm.com


On Tue, Mar 05, 2019 at 02:32:41PM +0100, Ard Biesheuvel wrote:
> Building StandaloneMmPkg from its .DSC is mainly intended for build

> coverage, and so platform specific configuration such as UART addresses

> don't belong here.

>

> Contributed-under: TianoCore Contribution Agreement 1.1

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

> ---

>  StandaloneMmPkg/StandaloneMmPkg.dsc | 11 +----------

>  1 file changed, 1 insertion(+), 10 deletions(-)

>

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

> index f279d9e7e5c7..8def9688fe7d 100644

> --- a/StandaloneMmPkg/StandaloneMmPkg.dsc

> +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc

> @@ -43,7 +43,7 @@ [LibraryClasses]

>    #

>    BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

>    BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

> -  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

> +  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

>    DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

>    FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf

>    HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf

> @@ -66,10 +66,6 @@ [LibraryClasses.AARCH64]

>    ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf

>    CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf

>    PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf

> -  PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf

> -  PL011UartClockLib|ArmPlatformPkg/Library/PL011UartClockLib/PL011UartClockLib.inf

> -  # ARM PL011 UART Driver

> -  SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf

>

>    StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf

>

> @@ -83,11 +79,6 @@ [PcdsFixedAtBuild]

>    gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xff

>    gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0f

>

> -[PcdsFixedAtBuild.AARCH64]

> -  ## PL011 - Serial Terminal

> -  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x1c0b0000

> -  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

> -

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

>  #

>  # Components Section - list of the modules and components that will be processed by compilation

> --

> 2.20.1

>

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

Patch

diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/StandaloneMmPkg.dsc
index f279d9e7e5c7..8def9688fe7d 100644
--- a/StandaloneMmPkg/StandaloneMmPkg.dsc
+++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
@@ -43,7 +43,7 @@  [LibraryClasses]
   #
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
   FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf
   HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf
@@ -66,10 +66,6 @@  [LibraryClasses.AARCH64]
   ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf
   CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
   PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf
-  PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
-  PL011UartClockLib|ArmPlatformPkg/Library/PL011UartClockLib/PL011UartClockLib.inf
-  # ARM PL011 UART Driver
-  SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
 
   StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
 
@@ -83,11 +79,6 @@  [PcdsFixedAtBuild]
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xff
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0f
 
-[PcdsFixedAtBuild.AARCH64]
-  ## PL011 - Serial Terminal
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x1c0b0000
-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
-
 ###################################################################################################
 #
 # Components Section - list of the modules and components that will be processed by compilation