Misc changes for clean compilation of freedom-kl25z config

7 files changed, 23 insertions, 219 deletions

diff --git a/nuttx/arch/arm/src/kl/Kconfig b/nuttx/arch/arm/src/kl/Kconfig
index 3d69482a1..7f1910963 100644
--- a/nuttx/arch/arm/src/kl/Kconfig
+++ b/nuttx/arch/arm/src/kl/Kconfig
@@ -289,6 +289,15 @@ config KL_PIT
 
 endmenu
 
+choice
+	prompt "SysTick clock source"
+	default KL_SYSTICK_CORECLK
+
+config KL_SYSTICK_CORECLK
+	bool "Cortex-M0 core clock"
+
+endchoice
+
 comment "Kinetis GPIO Interrupt Configuration"
 
 config GPIO_IRQ
diff --git a/nuttx/arch/arm/src/kl/kl_clockconfig.c b/nuttx/arch/arm/src/kl/kl_clockconfig.c
index 25679243b..7d04b9a4b 100644
--- a/nuttx/arch/arm/src/kl/kl_clockconfig.c
+++ b/nuttx/arch/arm/src/kl/kl_clockconfig.c
@@ -45,7 +45,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/kl_internal.h"
+#include "kl_internal.h"
 #include "chip/kl_mcg.h"
 #include "chip/kl_sim.h"
 #include "chip/kl_osc.h"
diff --git a/nuttx/arch/arm/src/kl/kl_clockconfig.c_orig b/nuttx/arch/arm/src/kl/kl_clockconfig.c_orig
deleted file mode 100644
index f595f3210..000000000
--- a/nuttx/arch/arm/src/kl/kl_clockconfig.c_orig
+++ /dev/null
@@ -1,209 +0,0 @@
-/****************************************************************************
- * arch/arm/src/kl/kl_clockconfig.c
- * arch/arm/src/chip/kl_clockconfig.c
- *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <arch/board/board.h>
-
-#include "up_arch.h"
-
-#include "chip.h"
-#include "chip/kl_internal.h"
-#include "chip/kl_mcg.h"
-#include "chip/kl_sim.h"
-#include "chip/kl_osc.h"
-#include "chip/kl_fmc.h"
-#include "chip/kl_llwu.h"
-#include "chip/kl_pinmux.h"
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: kl_portclocks
- *
- * Description:
- *   Enable all of the port clocks
- *
- ****************************************************************************/
-
-static inline void kl_portclocks(void)
-{
-  uint32_t regval;
-
-  /* Enable all of the port clocks */
-
-  regval = getreg32(KL_SIM_SCGC5);
-  regval |= (SIM_SCGC5_PORTA | SIM_SCGC5_PORTB | SIM_SCGC5_PORTC |
-             SIM_SCGC5_PORTD | SIM_SCGC5_PORTE);
-  putreg32(regval, KL_SIM_SCGC5);
-}
-
-/****************************************************************************
- * Name: kl_pllconfig
- *
- * Description:
- *   Initialize the PLL using the settings in board.h.  This assumes that
- *   the MCG is in default FLL Engaged Internal (FEI mode) out of reset.
- *
- ****************************************************************************/
-
-void kl_pllconfig(void)
-{
-  uint32_t regval32;
-  uint8_t regval8;
-
-  /* Enable clock gate to Port A module to enable pin routing (PORTA=1) */
-  regval32 = getreg32(KL_SIM_SCGC5);
-  regval32 |= SIM_SCGC5_PORTA;
-  putreg32(regval32, KL_SIM_SCGC5);
-
-  /* Divide-by-2 for clock 1 and clock 4 (OUTDIV1=1, OUTDIV4=1) */
-  regval32 = (SIM_CLKDIV1_OUTDIV1(1) | SIM_CLKDIV1_OUTDIV4(1));
-  putreg32(regval32, KL_SIM_CLKDIV1);
-
-  /* System oscillator drives 32 kHz clock for various peripherals (OSC32KSEL=0) */
-  regval32 = getreg32(KL_SIM_SOPT1);
-  regval32 &= ~(SIM_SOPT1_OSC32KSEL);
-  putreg32(regval32, KL_SIM_SOPT1);
-
-  /* Select PLL as a clock source for various peripherals (PLLFLLSEL=1)
-     Clock source for TPM counter clock is MCGFLLCLK or MCGPLLCLK/2 */
-  regval32 = getreg32(KL_SIM_SOPT2);
-  regval32 |= SIM_SOPT2_PLLFLLSEL;
-  putreg32(regval32, KL_SIM_SOPT2);
-  regval32 = (regval32 & ~(SIM_SOPT2_TPMSRC_OCSERCLK)) | SIM_SOPT2_TPMSRC_MCGCLK;
-  putreg32(regval32, KL_SIM_SOPT2);
-
-  /* PORTA_PCR18: ISF=0,MUX=0 */
-  /* PORTA_PCR19: ISF=0,MUX=0 */
-  regval32 = getreg32(KL_PORTA_PCR18);
-  regval32 = ~(PORT_PCR_ISF | PORT_PCR_MUX_ALT7);
-  putreg32(regval32, KL_PORTA_PCR18);  
-  regval32 = getreg32(KL_PORTA_PCR19);
-  regval32 = ~(PORT_PCR_ISF | PORT_PCR_MUX_ALT7);
-  putreg32(regval32, KL_PORTA_PCR19);  
-
-  /* Switch to FBE Mode */
-  /* OSC0_CR: ERCLKEN=0,??=0,EREFSTEN=0,??=0,SC2P=0,SC4P=0,SC8P=0,SC16P=0 */
-  putreg8(0, KL_OSC_CR);
-  /* MCG_C2: LOCRE0=0,??=0,RANGE0=2,HGO0=0,EREFS0=1,LP=0,IRCS=0 */
-  regval8 = (MCG_C2_RANGE_VHIGH | MCG_C2_EREFS);
-  putreg8(regval8, KL_MCG_C2);
-  /* MCG_C1: CLKS=2,FRDIV=3,IREFS=0,IRCLKEN=0,IREFSTEN=0 */
-  regval8 = (MCG_C1_CLKS_EXTREF | MCG_C1_FRDIV_R0DIV8);
-  putreg8(regval8, KL_MCG_C1);
-  /* MCG_C4: DMX32=0,DRST_DRS=0 */
-  regval8 = ~(MCG_C4_DMX32 | MCG_C4_DRST_DRS_HIGH);
-  putreg8(regval8, KL_MCG_C4);
-  /* MCG_C5: ??=0,PLLCLKEN0=0,PLLSTEN0=0,PRDIV0=1 */
-  regval8 = MCG_C5_PRDIV(1);
-  putreg8(regval8, KL_MCG_C5);
-  /* MCG_C6: LOLIE0=0,PLLS=0,CME0=0,VDIV0=0 */
-  putreg8(0, KL_MCG_C6);
-  
-  /* Check that the source of the FLL reference clock is
-     the external reference clock. */
-  while((getreg8(KL_MCG_S) & MCG_S_IREFST) != 0)
-    ;
-
-  /* Wait until external reference */
-  while((getreg8(KL_MCG_S) & MCG_S_CLKST_MASK) != 8)
-    ;
-
-  /* Switch to PBE mode
-     Select PLL as MCG source (PLLS=1) */
-  putreg8(MCG_C6_PLLS, KL_MCG_C6);
-  /* Wait until PLL locked */
-  while((getreg8(KL_MCG_S) & MCG_S_LOCK) == 0)
-    ;
-
-  /* Switch to PEE mode
-     Select PLL output (CLKS=0)
-     FLL external reference divider (FRDIV=3)
-     External reference clock for FLL (IREFS=0) */
-  putreg8(MCG_C1_FRDIV_R0DIV8, KL_MCG_C1);
-
-  /* Wait until PLL output */
-  while((getreg8(KL_MCG_S) & MCG_S_CLKST_MASK) != 0x0C)
-    ;
-}
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: kl_clockconfig
- *
- * Description:
- *   Called to initialize the Kinetis chip.  This does whatever setup is
- *   needed to put the  MCU in a usable state.  This includes the
- *   initialization of clocking using the settings in board.h.
- *
- ****************************************************************************/
-
-void kl_clockconfig(void)
-{
-  /* Enable all of the port clocks */
-
-  //kl_portclocks();
-
-  /* Configure the PLL based on settings in the board.h file */
-
-  kl_pllconfig();
-
-  /* For debugging, we will normally want to enable the trace clock and/or
-   * the FlexBus clock.
-   */
-
-  //kl_traceconfig();
-  //kl_fbconfig();
-}
-
diff --git a/nuttx/arch/arm/src/kl/chip/kl_internal.h b/nuttx/arch/arm/src/kl/kl_internal.h
index 3fb16afc6..9f6219b89 100644
--- a/nuttx/arch/arm/src/kl/chip/kl_internal.h
+++ b/nuttx/arch/arm/src/kl/kl_internal.h
@@ -52,7 +52,7 @@
 #include "up_internal.h"
 #include "kl_config.h"
 #include "chip.h"
-#include "kl_port.h"
+#include "chip/kl_port.h"
 
 /************************************************************************************
  * Definitions
diff --git a/nuttx/arch/arm/src/kl/kl_lowputc.c b/nuttx/arch/arm/src/kl/kl_lowputc.c
index d19eba1de..33aab79e0 100644
--- a/nuttx/arch/arm/src/kl/kl_lowputc.c
+++ b/nuttx/arch/arm/src/kl/kl_lowputc.c
@@ -48,8 +48,8 @@
 #include "up_arch.h"
 
 #include "kl_config.h"
-//#include "kl_lowputc.h"
-//#include "chip/kl_internal.h"
+#include "kl_lowputc.h"
+#include "kl_internal.h"
 #include "chip/kl_uart.h"
 #include "chip/kl_sim.h"
 #include "chip/kl_port.h"
@@ -109,7 +109,7 @@ static uint8_t g_sizemap[8] = {1, 4, 8, 16, 32, 64, 128, 0};
  *
  **************************************************************************/
 
-void kl_lowputc(char ch)
+void kl_lowputc(uint32_t ch)
 {
 #if defined HAVE_UART_DEVICE && defined HAVE_SERIAL_CONSOLE
 #ifdef CONFIG_KL_UARTFIFOS
diff --git a/nuttx/arch/arm/src/kl/kl_serial.c b/nuttx/arch/arm/src/kl/kl_serial.c
index 1a110ae90..caaa2c8af 100644
--- a/nuttx/arch/arm/src/kl/kl_serial.c
+++ b/nuttx/arch/arm/src/kl/kl_serial.c
@@ -62,7 +62,8 @@
 #include "kl_lowputc.h"
 #include "chip.h"
 #include "chip/kl_uart.h"
-//#include "kl_internal.h"
+
+#include "kl_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/arch/arm/src/kl/kl_start.c b/nuttx/arch/arm/src/kl/kl_start.c
index 7857cc01a..9a55a1750 100644
--- a/nuttx/arch/arm/src/kl/kl_start.c
+++ b/nuttx/arch/arm/src/kl/kl_start.c
@@ -52,8 +52,8 @@
 
 #include "kl_config.h"
 #include "kl_lowputc.h"
-//#include "kl_clockconfig.h"
 #include "kl_userspace.h"
+#include "kl_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -104,8 +104,10 @@ const uint32_t g_idle_topstack = HEAP_BASE;
 
 void iprintf(const char *string)
 {
-   while(*string != NULL)
-        kl_lowputc((char) *string++);
+  while(*string != '\0')
+    {
+      kl_lowputc((char) *string++);
+    }
 }
 
 /****************************************************************************
@@ -119,8 +121,9 @@ void iprintf(const char *string)
 void __start(void)
 {
   const uint32_t *src;
-  uint32_t *dest, i=0;
+  uint32_t *dest;
   volatile unsigned int *SIM_COPC = ((volatile unsigned int *)0x40048100);
+  //int i = 0;
 
   /*acassis: disable SIM_COP*/
   *SIM_COPC = 0;