Move the baud rate setting to the top of the .dsc file. Use a single
setting for each board.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Lee Leahy <leroy.p.le...@intel.com>
---
QuarkPlatformPkg/Quark.dsc | 25 ++++++++++++-------------
QuarkPlatformPkg/QuarkMin.dsc | 25 ++++++++++++-------------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/QuarkPlatformPkg/Quark.dsc b/QuarkPlatformPkg/Quark.dsc
index c87bb17..2b8038e 100644
--- a/QuarkPlatformPkg/Quark.dsc
+++ b/QuarkPlatformPkg/Quark.dsc
@@ -46,6 +46,16 @@
DEFINE GALILEO = GEN2
#
+ # Specify the maximum baud rate for the board
+ #
+!if $(GALILEO) == GEN1
+ DEFINE BAUD_RATE = 460800
+!endif
+!if $(GALILEO) == GEN2
+ DEFINE BAUD_RATE = 921600
+!endif
+
+ #
# TPM 1.2 Hardware. Options are [NONE, LPC, ATMEL_I2C, INFINEON_I2C]
#
DEFINE TPM_12_HARDWARE = NONE
@@ -342,12 +352,7 @@
!endif
gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask|0x18
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000
-!if $(GALILEO) == GEN1
- gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|460800
-!endif
-!if $(GALILEO) == GEN2
- gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|921600
-!endif
+ gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|$(BAUD_RATE)
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1
@@ -382,14 +387,8 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x9000B000
-!if $(GALILEO) == GEN1
- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|460800
+ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|$(BAUD_RATE)
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE
-!endif
-!if $(GALILEO) == GEN2
- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|921600
- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE
-!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialLineControl|0x03
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl|0x07
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialDetectCable|FALSE
diff --git a/QuarkPlatformPkg/QuarkMin.dsc b/QuarkPlatformPkg/QuarkMin.dsc
index f8a656e..7d89767 100644
--- a/QuarkPlatformPkg/QuarkMin.dsc
+++ b/QuarkPlatformPkg/QuarkMin.dsc
@@ -40,6 +40,16 @@
DEFINE PERFORMANCE_ENABLE = FALSE
DEFINE LOGGING = FALSE
+ #
+ # Specify the maximum baud rate for the board
+ #
+!if $(GALILEO) == GEN1
+ DEFINE BAUD_RATE = 460800
+!endif
+!if $(GALILEO) == GEN2
+ DEFINE BAUD_RATE = 921600
+!endif
+
!if $(TARGET) == "DEBUG"
DEFINE LOGGING = TRUE
!endif
@@ -311,12 +321,7 @@
!endif
gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask|0x18
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000
-!if $(GALILEO) == GEN1
- gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|460800
-!endif
-!if $(GALILEO) == GEN2
- gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|921600
-!endif
+ gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|$(BAUD_RATE)
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1
@@ -351,14 +356,8 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x9000B000
-!if $(GALILEO) == GEN1
- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|460800
+ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|$(BAUD_RATE)
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE
-!endif
-!if $(GALILEO) == GEN2
- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|921600
- gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE
-!endif
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialLineControl|0x03
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl|0x07
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialDetectCable|FALSE
--
1.9.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
