ArmPlatformPkg/PL011Uart: Ignore BAUD rate if Integral non-zero

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14432 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c b/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c
index 2b6741528ba8d869854a5e400150fb9e7ce0f395..9361205b1990d2da8e170d2ea205a7bf952ecce0 100644 (file)
--- a/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c
+++ b/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c
@@ -130,19 +130,17 @@ PL011UartInitializePort (
   // Baud Rate\r
   //\r
 \r
-  // If BaudRate is zero then use default baud rate\r
-  if (*BaudRate == 0) {\r
-    if (PcdGet32 (PL011UartInteger) != 0) {\r
+  // If PL011 Integral value has been defined then always ignore the BAUD rate\r
+  if (PcdGet32 (PL011UartInteger) != 0) {\r
       MmioWrite32 (UartBase + UARTIBRD, PcdGet32 (PL011UartInteger));\r
       MmioWrite32 (UartBase + UARTFBRD, PcdGet32 (PL011UartFractional));\r
-    } else {\r
+  } else {\r
+    // If BAUD rate is zero then replace it with the system default value\r
+    if (*BaudRate == 0) {\r
       *BaudRate = PcdGet32 (PcdSerialBaudRate);\r
       ASSERT (*BaudRate != 0);\r
     }\r
-  }\r
 \r
-  // If BaudRate != 0 then we must calculate the divisor from the value\r
-  if (*BaudRate != 0) {\r
     Divisor = (PcdGet32 (PL011UartClkInHz) * 4) / *BaudRate;\r
     MmioWrite32 (UartBase + UARTIBRD, Divisor >> 6);\r
     MmioWrite32 (UartBase + UARTFBRD, Divisor & 0x3F);\r