4 files changed, 10 insertions, 10 deletions
diff --git a/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.c b/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.c
index 9d5f429e2d..fc5ca6b975 100644
--- a/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.c
+++ b/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.c
@@ -49,7 +49,7 @@ GdbIsCharAvailable (
   VOID
   )  
 {
-  UINT32 LSR = UartBase(PcdGet32(PcdBeagleConsoleUart)) + UART_LSR_REG;
+  UINT32 LSR = UartBase(PcdGet32(PcdOmap35xxConsoleUart)) + UART_LSR_REG;
 
   if ((MmioRead8(LSR) & UART_LSR_RX_FIFO_E_MASK) == UART_LSR_RX_FIFO_E_NOT_EMPTY) {
     return TRUE;
@@ -64,8 +64,8 @@ GdbGetChar (
   VOID
   )
 {
-  UINT32  LSR = UartBase(PcdGet32(PcdBeagleConsoleUart)) + UART_LSR_REG;
-  UINT32  RBR = UartBase(PcdGet32(PcdBeagleConsoleUart)) + UART_RBR_REG;
+  UINT32  LSR = UartBase(PcdGet32(PcdOmap35xxConsoleUart)) + UART_LSR_REG;
+  UINT32  RBR = UartBase(PcdGet32(PcdOmap35xxConsoleUart)) + UART_RBR_REG;
   CHAR8   Char;
     
   while ((MmioRead8(LSR) & UART_LSR_RX_FIFO_E_MASK) == UART_LSR_RX_FIFO_E_EMPTY);
@@ -80,8 +80,8 @@ GdbPutChar (
   IN  CHAR8   Char
   )
 {
-  UINT32  LSR = UartBase(PcdGet32(PcdBeagleConsoleUart)) + UART_LSR_REG;
-  UINT32  THR = UartBase(PcdGet32(PcdBeagleConsoleUart)) + UART_THR_REG;
+  UINT32  LSR = UartBase(PcdGet32(PcdOmap35xxConsoleUart)) + UART_LSR_REG;
+  UINT32  THR = UartBase(PcdGet32(PcdOmap35xxConsoleUart)) + UART_THR_REG;
     
   while ((MmioRead8(LSR) & UART_LSR_TX_FIFO_E_MASK) == UART_LSR_TX_FIFO_E_NOT_EMPTY);
   MmioWrite8(THR, Char);
diff --git a/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.inf b/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.inf
index 6d9752a1ef..7dd71f4eb8 100644
--- a/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.inf
+++ b/BeagleBoardPkg/Library/GdbSerialLib/GdbSerialLib.inf
@@ -37,5 +37,5 @@
   OmapLib    
 
 [FixedPcd]
-  gOmap35xxTokenSpaceGuid.PcdBeagleConsoleUart
+  gOmap35xxTokenSpaceGuid.PcdOmap35xxConsoleUart
 
diff --git a/BeagleBoardPkg/Sec/Sec.c b/BeagleBoardPkg/Sec/Sec.c
index cc134317b1..fa18038a9a 100644
--- a/BeagleBoardPkg/Sec/Sec.c
+++ b/BeagleBoardPkg/Sec/Sec.c
@@ -55,7 +55,7 @@ TimerInit (
   VOID
   )
 {
-  UINTN  Timer            = FixedPcdGet32(PcdBeagleFreeTimer);
+  UINTN  Timer            = FixedPcdGet32(PcdOmap35xxFreeTimer);
   UINT32 TimerBaseAddress = TimerBase(Timer);
 
   // Set source clock for GPT3 & GPT4 to SYS_CLK
@@ -83,7 +83,7 @@ UartInit (
   VOID
   )
 {
-  UINTN   Uart            = FixedPcdGet32(PcdBeagleConsoleUart);
+  UINTN   Uart            = FixedPcdGet32(PcdOmap35xxConsoleUart);
   UINT32  UartBaseAddress = UartBase(Uart);
 
   // Set MODE_SELECT=DISABLE before trying to initialize or modify DLL, DLH registers.
diff --git a/BeagleBoardPkg/Sec/Sec.inf b/BeagleBoardPkg/Sec/Sec.inf
index 5f003562d0..ff48d3bfc0 100644
--- a/BeagleBoardPkg/Sec/Sec.inf
+++ b/BeagleBoardPkg/Sec/Sec.inf
@@ -63,8 +63,8 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryBase
   gEmbeddedTokenSpaceGuid.PcdMemorySize
   
-  gOmap35xxTokenSpaceGuid.PcdBeagleConsoleUart
-  gOmap35xxTokenSpaceGuid.PcdBeagleFreeTimer
+  gOmap35xxTokenSpaceGuid.PcdOmap35xxConsoleUart
+  gOmap35xxTokenSpaceGuid.PcdOmap35xxFreeTimer
   
   gArmTokenSpaceGuid.PcdCpuVectorBaseAddress