From 2b0558a4003a031a7e6dc0c95670473e018d8b98 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 24 Apr 2013 16:46:38 -0600
Subject: Minor Freedom-KL25Z updates

---
 nuttx/arch/arm/src/kl/kl_irq.c     |  2 +-
 nuttx/arch/arm/src/kl/kl_lowputc.c | 28 ++++++++++++++++++++++------
 nuttx/arch/arm/src/kl/kl_serial.c  |  5 +++++
 3 files changed, 28 insertions(+), 7 deletions(-)

(limited to 'nuttx/arch/arm/src')

diff --git a/nuttx/arch/arm/src/kl/kl_irq.c b/nuttx/arch/arm/src/kl/kl_irq.c
index a400c2cae..783fc42a4 100644
--- a/nuttx/arch/arm/src/kl/kl_irq.c
+++ b/nuttx/arch/arm/src/kl/kl_irq.c
@@ -359,7 +359,7 @@ int up_prioritize_irq(int irq, int priority)
               irq == KL_IRQ_PENDSV ||
               irq == KL_IRQ_SYSTICK ||
              (irq >= KL_IRQ_EXTINT && irq < NR_IRQS));
-  DEBUGASSERT(priority >= NVIC_SYSH_DISABLE_PRIORITY &&
+  DEBUGASSERT(priority >= NVIC_SYSH_PRIORITY_MAX &&
               priority <= NVIC_SYSH_PRIORITY_MIN);
 
   /* Check for external interrupt */
diff --git a/nuttx/arch/arm/src/kl/kl_lowputc.c b/nuttx/arch/arm/src/kl/kl_lowputc.c
index 33aab79e0..208bf2c0f 100644
--- a/nuttx/arch/arm/src/kl/kl_lowputc.c
+++ b/nuttx/arch/arm/src/kl/kl_lowputc.c
@@ -56,18 +56,35 @@
 #include "chip/kl_uart.h"
 #include "chip/kl_pinmux.h"
 
-
 /**************************************************************************
  * Private Definitions
  **************************************************************************/
-     
+
+#warning "Revisit"
+#undef BOARD_CORECLK_FREQ
+#define BOARD_CORECLK_FREQ 48000000
+
 /* Select UART parameters for the selected console */
 
+#if defined(CONFIG_UART0_SERIAL_CONSOLE)
 #  define CONSOLE_BASE     KL_UART0_BASE
 #  define CONSOLE_FREQ     48000000
 #  define CONSOLE_BAUD     CONFIG_UART0_BAUD
 #  define CONSOLE_BITS     CONFIG_UART0_BITS
 #  define CONSOLE_PARITY   CONFIG_UART0_PARITY
+#elif defined(CONFIG_UART1_SERIAL_CONSOLE)
+#  define CONSOLE_BASE     KL_UART1_BASE
+#  define CONSOLE_FREQ     48000000
+#  define CONSOLE_BAUD     CONFIG_UART1_BAUD
+#  define CONSOLE_BITS     CONFIG_UART1_BITS
+#  define CONSOLE_PARITY   CONFIG_UART1_PARITY
+#elif defined(CONFIG_UART2_SERIAL_CONSOLE)
+#  define CONSOLE_BASE     KL_UART2_BASE
+#  define CONSOLE_FREQ     48000000
+#  define CONSOLE_BAUD     CONFIG_UART2_BAUD
+#  define CONSOLE_BITS     CONFIG_UART2_BITS
+#  define CONSOLE_PARITY   CONFIG_UART2_PARITY
+#endif
 
 /**************************************************************************
  * Private Types
@@ -215,7 +232,7 @@ void kl_lowsetup(void)
 //#if defined(HAVE_SERIAL_CONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG)
 
 //  kl_uartconfigure(CONSOLE_BASE, CONSOLE_BAUD, CONSOLE_FREQ,
-//                        CONSOLE_PARITY, CONSOLE_BITS);
+//                   CONSOLE_PARITY, CONSOLE_BITS);
 //#endif
 }
 
@@ -249,9 +266,8 @@ void kl_uartreset(uintptr_t uart_base)
  ******************************************************************************/
 
 #ifdef HAVE_UART_DEVICE
-void kl_uartconfigure(uintptr_t uart_base, uint32_t baud,
-                           uint32_t clock, unsigned int parity,
-                           unsigned int nbits)
+void kl_uartconfigure(uintptr_t uart_base, uint32_t baud, uint32_t clock,
+                      unsigned int parity, unsigned int nbits)
 {
   uint32_t     sbr;
   uint32_t     brfa;
diff --git a/nuttx/arch/arm/src/kl/kl_serial.c b/nuttx/arch/arm/src/kl/kl_serial.c
index caaa2c8af..6e4477c0b 100644
--- a/nuttx/arch/arm/src/kl/kl_serial.c
+++ b/nuttx/arch/arm/src/kl/kl_serial.c
@@ -69,6 +69,11 @@
  * Pre-processor Definitions
  ****************************************************************************/
 /* Some sanity checks *******************************************************/
+
+#warning "Revisit"
+#undef BOARD_CORECLK_FREQ
+#define BOARD_CORECLK_FREQ 48000000
+
 /* Is there at least one UART enabled and configured as a RS-232 device? */
 
 #ifndef HAVE_UART_DEVICE
-- 
cgit v1.2.3