SAM4L: Add DFLL0 support, add logic to set the power scaling mode, add support for RAM functions

9 files changed, 312 insertions, 35 deletions

diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig
index 92a4275ce..9e9a77df2 100644
--- a/nuttx/arch/arm/Kconfig
+++ b/nuttx/arch/arm/Kconfig
@@ -115,6 +115,7 @@ config ARCH_CHIP_NUC1XX
 config ARCH_CHIP_SAM34
 	bool "Atmel AT91SAM3/SAM4"
 	select ARCH_HAVE_MPU
+	select ARCH_HAVE_RAMFUNCS
 	---help---
 		Atmel AT91SAM3 (ARM Cortex-M3) and SAM4 (ARM Cortex-M4) architectures
 
diff --git a/nuttx/arch/arm/src/sam34/Kconfig b/nuttx/arch/arm/src/sam34/Kconfig
index b26dec659..f46b33403 100644
--- a/nuttx/arch/arm/src/sam34/Kconfig
+++ b/nuttx/arch/arm/src/sam34/Kconfig
@@ -134,6 +134,7 @@ config ARCH_CHIP_SAM3U
 config ARCH_CHIP_SAM4L
 	bool
 	default n
+	select ARCH_RAMFUNCS
 
 config ARCH_CHIP_SAM4S
 	bool
diff --git a/nuttx/arch/arm/src/sam34/chip/sam4l_bpm.h b/nuttx/arch/arm/src/sam34/chip/sam4l_bpm.h
index 90a1f1cd3..16a0bf028 100644
--- a/nuttx/arch/arm/src/sam34/chip/sam4l_bpm.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam4l_bpm.h
@@ -110,6 +110,7 @@
 #  define BPM_PMCON_PS1              (1 << BPM_PMCON_PS_SHIFT)
 #  define BPM_PMCON_PS2              (2 << BPM_PMCON_PS_SHIFT)
 #define BPM_PMCON_PSCREQ             (1 << 2)  /* Bit 2:  Power Scaling Change Request */
+#define BPM_PMCON_PSCM               (1 << 3)  /* Bit 3:  Power Scaling Change Mode */
 #define BPM_PMCON_BKUP               (1 << 8)  /* Bit 8:  BACKUP Mode */
 #define BPM_PMCON_RET                (1 << 9)  /* Bit 9:  RETENTION Mode */
 #define BPM_PMCON_SLEEP_SHIFT        (12)      /* Bits 12-13: SLEEP mode Configuration */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam4l_scif.h b/nuttx/arch/arm/src/sam34/chip/sam4l_scif.h
index 54cb4da33..b1e23a2b7 100644
--- a/nuttx/arch/arm/src/sam34/chip/sam4l_scif.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam4l_scif.h
@@ -250,10 +250,26 @@
 #define SCIF_DFLL0CONF_QLDIS              (1 << 6)  /* Bit 6:  Quick Lock Disable */
 #define SCIF_DFLL0CONF_RANGE_SHIFT        (16)      /* Bits 16-17: Range Value */
 #define SCIF_DFLL0CONF_RANGE_MASK         (3 << SCIF_DFLL0CONF_RANGE_SHIFT)
+#  define SCIF_DFLL0CONF_RANGE(n)         ((n) << SCIF_DFLL0CONF_RANGE_SHIFT)
+#  define SCIF_DFLL0CONF_RANGE0           (0 << SCIF_DFLL0CONF_RANGE_SHIFT) /* 96-150MHz */
+#  define SCIF_DFLL0CONF_RANGE1           (1 << SCIF_DFLL0CONF_RANGE_SHIFT) /* 50-110MHz */
+#  define SCIF_DFLL0CONF_RANGE2           (2 << SCIF_DFLL0CONF_RANGE_SHIFT) /* 25-55MHz */
+#  define SCIF_DFLL0CONF_RANGE3           (3 << SCIF_DFLL0CONF_RANGE_SHIFT) /* 20-30MHz */
 #define SCIF_DFLL0CONF_FCD                (1 << 23) /* Bit 23: Fuse Calibration Done */
 #define SCIF_DFLL0CONF_CALIB_SHIFT        (24)      /* Bits 24-27: Calibration Value */
 #define SCIF_DFLL0CONF_CALIB_MASK         (15 << SCIF_DFLL0CONF_CALIB_SHIFT)
 
+/* Min/max frequencies for each DFLL0 range */
+
+#define SCIF_DFLL0CONF_MAX_RANGE0   (150000000)
+#define SCIF_DFLL0CONF_MIN_RANGE0    (96000000)
+#define SCIF_DFLL0CONF_MAX_RANGE1   (110000000)
+#define SCIF_DFLL0CONF_MIN_RANGE1    (50000000)
+#define SCIF_DFLL0CONF_MAX_RANGE2    (55000000)
+#define SCIF_DFLL0CONF_MIN_RANGE2    (25000000)
+#define SCIF_DFLL0CONF_MAX_RANGE3    (30000000)
+#define SCIF_DFLL0CONF_MIN_RANGE3    (20000000)
+
 /* DFLL Value Register */
 
 #define SCIF_DFLL0VAL_FINE_SHIFT          (0)      /* Bits 0-7: Fine Value */
@@ -269,8 +285,10 @@
 
 #define SCIF_DFLL0STEP_FSTEP_SHIFT        (0)      /* Bits 0-7: Fine Maximum Step */
 #define SCIF_DFLL0STEP_FSTEP_MASK         (0xff << SCIF_DFLL0STEP_FSTEP_SHIFT)
+#  define SCIF_DFLL0STEP_FSTEP(n)         ((n) << SCIF_DFLL0STEP_FSTEP_SHIFT)
 #define SCIF_DFLL0STEP_CSTEP_SHIFT        (16)     /* Bits 16-20: Coarse Maximum Step */
 #define SCIF_DFLL0STEP_CSTEP_MASK         (31 << SCIF_DFLL0STEP_CSTEP_SHIFT)
+#  define SCIF_DFLL0STEP_CSTEP(4)         ((v) << SCIF_DFLL0STEP_CSTEP_SHIFT)
 
 /* DFLL0 Spread Spectrum Generator Control Register */
 
@@ -375,6 +393,7 @@
 #  define SCIF_GCCTRL_OSCSEL_RC32K        (13 << SCIF_GCCTRL_OSCSEL_SHIFT) /* Output from 32kHz RCOSC */
 #define SCIF_GCCTRL_DIV_SHIFT             (16)      /* Bits 16-31: Division Factor */
 #define SCIF_GCCTRL_DIV_MASK              (0xffff << SCIF_GCCTRL_DIV_SHIFT)
+#  define SCIF_GCCTRL_DIV(n)              ((n) << SCIF_GCCTRL_DIV_SHIFT)
 
 /* 4/8/12MHz RC Oscillator Version Register */
 /* Generic Clock Prescaler Version Register */
diff --git a/nuttx/arch/arm/src/sam34/sam4l_clockconfig.c b/nuttx/arch/arm/src/sam34/sam4l_clockconfig.c
index 20adad8c1..d69dc7e8a 100644
--- a/nuttx/arch/arm/src/sam34/sam4l_clockconfig.c
+++ b/nuttx/arch/arm/src/sam34/sam4l_clockconfig.c
@@ -56,8 +56,14 @@
 #include "sam_clockconfig.h"
 
 /****************************************************************************
- * Private Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
+/* Configuration ************************************************************/
+
+#ifndef CONFIG_ARCH_RAMFUNCS
+# error "CONFIG_ARCH_RAMFUNCS must be defined"
+#endif
+
 /* Nominal frequencies in on-chip RC oscillators.  These may frequencies
  * may vary with temperature changes.
  */
@@ -395,6 +401,23 @@
 #      define SAM_PLL0_OPTIONS       0
 #    endif
 #  endif
+
+/* DPLL0 reference clock */
+
+#  if defined(BOARD_DFLL0_SOURCE_RCSYS)
+#    define SAM_DFLLO_REFCLK         SCIF_GCCTRL_OSCSEL_RCSYS
+#  elif defined(BOARD_DFLL0_SOURCE_OSC32K)
+#    define SAM_DFLLO_REFCLK         SCIF_GCCTRL_OSCSEL_OSC32K
+#  elif define(BOARD_DFLL0_SOURCE_OSC0)
+#    define SAM_DFLLO_REFCLK         SCIF_GCCTRL_OSCSEL_OSC0
+#  elif define(BOARD_DFLL0_SOURCE_RC80M)
+#    define SAM_DFLLO_REFCLK         SCIF_GCCTRL_OSCSEL_RC80M
+#  elif define(BOARD_DFLL0_SOURCE_RC32K)
+#    define SAM_DFLLO_REFCLK         SCIF_GCCTRL_OSCSEL_RC32K
+#  else
+#    error No DFLL0 source for reference clock defined
+#  endif
+
 #endif
 
 /****************************************************************************
@@ -636,14 +659,14 @@ static inline void sam_enableglck9(void)
 #endif
 
 /****************************************************************************
- * Name: sam_enablepll0
+ * Name: sam_enablepll0 (and its helper sam_pll0putreg())
  *
  * Description:
  *   Initialiaze PLL0 settings per the definitions in the board.h file.
  *
  ****************************************************************************/
 
-#ifdef SAM_CLOCK_PLL0
+#ifdef BOARD_SYSCLK_SOURCE_PLL0
 static inline void sam_pll0putreg(uint32_t regval, uint32_t regaddr,
                                   uint32_t regoffset)
 {
@@ -672,7 +695,7 @@ static inline void sam_enablepll0(void)
   regval  = getreg32(SAM_SCIF_PLL0);
   regval &= ~(SCIF_PLL0_PLLOSC_MASK | SCIF_PLL0_PLLDIV_MASK | SCIF_PLL0_PLLMUL_MASK);
   regval |= ((SAM_PLL0_MUL - 1) << SCIF_PLL0_PLLMUL_SHIFT) |
-            (BOARD_FDLL0_DIV << SCIF_PLL0_PLLDIV_SHIFT) |
+            (BOARD_DFLL0_DIV << SCIF_PLL0_PLLDIV_SHIFT) |
             SCIF_PLL0_PLLCOUNT_MAX | SAM_PLL0_SOURCE;
   sam_pll0putreg(regval, SAM_SCIF_PLL0, SAM_SCIF_PLL0_OFFSET);
 
@@ -689,6 +712,127 @@ static inline void sam_enablepll0(void)
 #endif
 
 /****************************************************************************
+ * Name: sam_enabledfll0 (and its helper sam_dfll0_putreg32())
+ *
+ * Description:
+ *   Initialiaze DFLL0 settings per the definitions in the board.h file.
+ *
+ ****************************************************************************/
+
+#ifdef BOARD_SYSCLK_SOURCE_DFLL0
+static inline void sam_dfll0_putreg32(uint32_t regval, uint32_t regaddr,
+                                     uint32_t regoffset)
+{
+  /* Wait until DFLL0 is completes the last setting */
+
+  while ((getreg32(SAM_SCIF_PCLKSR) & SCIF_INT_DFLL0RDY) == 0);
+
+  /* Then unlock the register and write the next value */
+
+  putreg32(SCIF_UNLOCK_KEY(0xaa) | SCIF_UNLOCK_ADDR(regoffset),
+           SAM_SCIF_UNLOCK);
+  putreg32(regval, regaddr);
+}
+
+static inline void sam_enabledfll0(void)
+{
+  uint32_t regval;
+  uint32_t conf;
+
+  /* Set up generic clock source with specified reference clock
+   * and divider.
+   */
+
+  putreg(0, SAM_SCIF_GCCTRL0);
+
+  /* Set the generic clock 0 source */
+
+  regval  = getreg32(SAM_SCIF_GCCTRL0);
+  regval &= ~SCIF_GCCTRL_OSCSEL_MASK;
+  regval |= SAM_DFLLO_REFCLK;
+  putreg32(regval, SAM_SCIF_GCCTRL0);
+
+  /* Get the generic clock 0 divider */
+
+  regval  = getreg32(SAM_SCIF_GCCTRL0);
+  regval &= ~(SCIF_GCCTRL_DIVEN | SCIF_GCCTRL_DIV_MASK);
+
+#if BOARD_DFLL0_DIV > 1
+  regval |= SCIF_GCCTRL_DIVEN;
+  regval |= SCIF_GCCTRL_DIV(((BOARD_DFLL0_DIV + 1) / 2) - 1);
+#endif
+
+  putreg32(regval, SAM_SCIF_GCCTRL0);
+
+  /* Sync before reading a dfll conf register */
+
+  putreg32(SCIF_DFLL0SYNC_SYNC, SAM_SCIF_DFLL0SYNC);
+  while (getreg32(SAM_SCIF_PCLKSR) & SCIF_INT_DFLL0RDY) == 0);
+
+  /* Select Closed Loop Mode */
+
+  conf  = getreg(SAM_SCIF_DFLL0CONF);
+  conf &= ~SCIF_DFLL0CONF_RANGE_MASK;
+  conf |= SCIF_DFLL0CONF_MODE;
+
+  /* Select the DFLL0 Frequency Range */
+
+#if BOARD_DFLL0_FREQUENCY < SCIF_DFLL0CONF_MAX_RANGE3
+  conf |= SCIF_DFLL0CONF_RANGE3;
+#elif BOARD_DFLL0_FREQUENCY < SCIF_DFLL0CONF_MAX_RANGE2
+  conf |= SCIF_DFLL0CONF_RANGE2;
+#elif BOARD_DFLL0_FREQUENCY < SCIF_DFLL0CONF_MAX_RANGE1
+  conf |= SCIF_DFLL0CONF_RANGE1;
+#else
+  conf |= SCIF_DFLL0CONF_RANGE0;
+#ednif
+
+  /* Enable the reference generic clock 0 */
+
+  regval  = getreg32(SAM_SCIF_GCCTRL0);
+  regval |= SCIF_GCCTRL_CEN;
+  putreg32(regval, SAM_SCIF_GCCTRL0);
+
+  /* Enable DFLL0.  Here we assume DFLL0RDY because the DFLL was disabled
+   * before this function was called.
+   */
+
+  putreg32(SCIF_UNLOCK_KEY(0xaa) | SCIF_UNLOCK_ADDR(SAM_SCIF_DFLL0CONF_OFFSET),
+           SAM_SCIF_UNLOCK);
+  putreg32(SCIF_DFLL0CONF_EN, SAM_SCIF_DFLL0CONF);
+
+  /* Configure DFLL0.  Note that now we do have to wait for DFLL0RDY before
+   * every write.
+   *
+   * Set the initial coarse and fine step lengths to 4. If this is set
+   * too high, DFLL0 may fail to lock.
+   */
+
+  sam_dfll0_putreg32((SCIF_DFLL0STEP_CSTEP(4) | SCIF_DFLL0STEP_FSTEP(4),
+                     SAM_SCIF_DFLL0STEP,
+                     SAM_SCIF_DFLL0STEP_OFFSET);
+
+  /* Set the DFLL0 multipler register */
+
+  sam_dfll0_putreg32(BOARD_DFLL0_MUL, SAM_SCIF_DFLL0MUL,
+                     SAM_SCIF_DFLL0MUL_OFFSET);
+
+  /* Set the multipler and spread spectrum generator control registers */
+
+  sam_dfll0_putreg32(0, SAM_SCIF_DFLL0SSG, SAM_SCIF_DFLL0SSG_OFFSET);
+
+  /* Finally, set the DFLL0 configuration */
+
+  sam_dfll0_putreg32(conf | SCIF_DFLL0CONF_EN,
+                     SAM_SCIF_DFLL0CONF, SAM_SCIF_DFLL0CONF_OFFSET);
+
+  /* Wait until we are locked on the fine value */
+
+  while ((getreg32(SAM_SCIF_PCLKSR) & SCIF_INT_DFLL0LOCKF) == 0);
+}
+#endif
+
+/****************************************************************************
  * Name: sam_setdividers
  *
  * Description:
@@ -762,7 +906,7 @@ static inline void sam_setdividers(void)
  *
  ****************************************************************************/
 
-static void sam_fws(uint32_t cpuclock)
+static inline void sam_fws(uint32_t cpuclock, uint32_t psm, bool fastwkup)
 {
   uint32_t regval;
 
@@ -794,10 +938,51 @@ static inline void sam_mainclk(uint32_t mcsel)
   regval = getreg32(SAM_PM_MCCTRL);
   regval &= ~PM_MCCTRL_MCSEL_MASK;
   regval |= mcsel;
+
+  putreg32(PM_UNLOCK_KEY(0xaa) | PM_UNLOCK_ADDR(SAM_PM_MCCTRL_OFFSET),
+           SAM_PM_UNLOCK);
   putreg32(regval, SAM_PM_MCCTRL);
 }
 
 /****************************************************************************
+ * Name: sam_setpsm (and its helper, sam_instantiatepsm())
+ *
+ * Description:
+ *   Switch to the selected power scaling mode.
+ *
+ ****************************************************************************/
+
+static __ramfunc__ void sam_instantiatepsm(Bpm *bpm, uint32_t regval)
+{
+  /* Set the BMP PCOM register (containing the new power scaling mode) */
+
+  putreg32(BPM_UNLOCK_KEY(0xaa) | BPM_UNLOCK_ADDR(SAM_BPM_PMCON_OFFSET),
+           SAM_BPM_UNLOCK);
+  putreg32(regval, SAM_BPM_PMCON);
+
+  /* Wait for new power scaling mode to become active.  There should be
+   * timeout on this wait.
+   */
+
+  while ((getreg32(SAM_BPM_SR) & BPM_INT_PSOK) == 0);
+}
+
+static inline void sam_setpsm(uint32_t psm)
+{
+  uint32_t regval;
+
+  /* Setup the PMCON register content fo the new power scaling mode */
+
+  regval  = getreg32(SAM_BPM_PMCON);
+  regval &= ~BPM_PMCON_PS_MASK;
+  regval |= (psm |  BPM_PMCON_PSCM | BPM_PMCON_PSCREQ);
+
+  /* Then call the RAMFUNC sam_setpsm() to set the new power scaling mode */
+
+  sam_instantiatepsm(bpm, regval);
+}
+
+/****************************************************************************
  * Name: sam_usbclock
  *
  * Description:
@@ -849,7 +1034,7 @@ static inline void sam_usbclock(void)
 void sam_clockconfig(void)
 {
   uint32_t regval;
-  uint32_t bpmps;
+  uint32_t psm;
   bool fastwkup;
 
   /* Enable clocking to the PICOCACHE */
@@ -884,9 +1069,11 @@ void sam_clockconfig(void)
    */
 
 #ifdef CONFIG_SAM_FLASH_HSEN
-  /* The high speed FLASH mode has been enabled.  Select power scaling mode 2 */
+  /* The high speed FLASH mode has been enabled.  Select power scaling
+   * mode 2, no fast wakeup.
+   */
 
-  bpmps    = BPM_PMCON_PS2;
+  psm      = BPM_PMCON_PS2;
   fastwkup = false;
 #else
   /* Not high speed mode.  Check if we can go to power scaling mode 1. */
@@ -895,7 +1082,7 @@ void sam_clockconfig(void)
     {
       /* Yes.. Do we also need to enable fast wakeup? */
 
-      bpmps = BPM_PMCON_PS1;
+      psm = BPM_PMCON_PS1;
       if (BOARD_CPU_FREQUENCY > FLASH_MAXFREQ_PS1_HSDIS_FWS0)
         {
           /* Yes.. enable fast wakeup */
@@ -912,7 +1099,7 @@ void sam_clockconfig(void)
     }
   else
     {
-      bpmps = BPM_PMCON_PS0;
+      psm = BPM_PMCON_PS0;
     }
 #endif
 
@@ -972,11 +1159,13 @@ void sam_clockconfig(void)
   /* Since this function only executes at power up, we know that we are
    * already running from RCSYS.
    */
+
+  // sam_mainclk(PM_MCCTRL_MCSEL_RCSYS);
 #elif defined(BOARD_SYSCLK_SOURCE_OSC0)
 
   /* Set up FLASH wait states */
 
-  sam_fws(SAM_FOSC0);
+  sam_fws(BOARD_CPU_FREQUENCY, psm, fastwkup);
 
   /* Then switch the main clock to OSC0 */
 
@@ -990,25 +1179,65 @@ void sam_clockconfig(void)
 
   /* Set up FLASH wait states */
 
-  sam_fws(SAM_CPU_CLOCK);
+  sam_fws(BOARD_CPU_FREQUENCY, psm, fastwkup);
 
   /* Then switch the main clock to PLL0 */
 
-  sam_mainclk(PM_MCCTRL_MCSEL_PLL0);
+  sam_mainclk(PM_MCCTRL_MCSEL_PLL);
 
 #elif defined(BOARD_SYSCLK_SOURCE_DFLL0)
-#  error Missing logic
+
+  /* Enable PLL0 using the settings in board.h */
+
+  sam_enabledfll0();
+
+  /* Set up FLASH wait states */
+
+  sam_fws(BOARD_CPU_FREQUENCY, psm, fastwkup);
+
+  /* Then switch the main clock to DFLL0 */
+
+  sam_mainclk(PM_MCCTRL_MCSEL_DFLL);
+
 #elif defined(BOARD_SYSCLK_SOURCE_RC80M)
-#  error Missing logic
+
+  /* Set up FLASH wait states */
+
+  sam_fws(BOARD_CPU_FREQUENCY, psm, fastwkup);
+
+  /* Then switch the main clock to RCM80 */
+
+  sam_mainclk(PM_MCCTRL_MCSEL_RC80M);
+
 #elif defined(BOARD_SYSCLK_SOURCE_FCFAST12M) || defined(BOARD_SYSCLK_SOURCE_FCFAST8M) || \
       defined(BOARD_SYSCLK_SOURCE_FCFAST4M)
-#  error Missing logic
+
+  /* Set up FLASH wait states */
+
+  sam_fws(BOARD_CPU_FREQUENCY, psm, fastwkup);
+
+  /* Then switch the main clock to RCFAST */
+
+  sam_mainclk(PM_MCCTRL_MCSEL_RCFAST);
+
 #elif defined(BOARD_SYSCLK_SOURCE_RC1M)
-#  error Missing logic
+
+  /* Set up FLASH wait states */
+
+  sam_fws(BOARD_CPU_FREQUENCY, psm, fastwkup);
+
+  /* Then switch the main clock to RC1M */
+
+  sam_mainclk(PM_MCCTRL_MCSEL_RC1M);
+
 #else
-#  error "No SYSCLK source frequency"
+#  error "No SYSCLK source provided"
 #endif
 
+  /* Switch to the selected power scaling mode */
+
+  sam_setpsm(psm);
+
 #ifdef CONFIG_USBDEV
   void sam_usbclock();
 #endif
diff --git a/nuttx/arch/arm/src/sam34/sam_start.c b/nuttx/arch/arm/src/sam34/sam_start.c
index a3fc49fa2..e48da5645 100644
--- a/nuttx/arch/arm/src/sam34/sam_start.c
+++ b/nuttx/arch/arm/src/sam34/sam_start.c
@@ -100,12 +100,6 @@ void __start(void)
   const uint32_t *src;
   uint32_t *dest;
 
-  /* Configure the uart so that we can get debug output as soon as possible */
-
-  sam_clockconfig();
-  sam_lowsetup();
-  showprogress('A');
-
   /* Clear .bss.  We'll do this inline (vs. calling memset) just to be
    * certain that there are no issues with the state of global variables.
    */
@@ -114,7 +108,6 @@ void __start(void)
     {
       *dest++ = 0;
     }
-  showprogress('B');
 
   /* Move the intialized data section from his temporary holding spot in
    * FLASH into the correct place in SRAM.  The correct place in SRAM is
@@ -126,14 +119,33 @@ void __start(void)
     {
       *dest++ = *src++;
     }
-  showprogress('C');
+
+  /* Copy any necessary code sections from FLASH to RAM.  The correct
+   * destination in SRAM is geive by _sramfuncs and _eramfuncs.  The
+   * temporary location is in flash after the data initalization code
+   * at _framfuncs.  This must be done before sam_clockconfig() can be
+   * called (at least for the SAM4L family).
+   */
+
+#ifdef CONFIG_ARCH_RAMFUNCS
+  for (src = &_framfuncs, dest = &_sramfuncs; dest < &_eramfuncs; )
+    {
+      *dest++ = *src++;
+    }
+#endif
+
+  /* Configure the uart so that we can get debug output as soon as possible */
+
+  sam_clockconfig();
+  sam_lowsetup();
+  showprogress('A');
 
   /* Perform early serial initialization */
 
 #ifdef USE_EARLYSERIALINIT
   up_earlyserialinit();
 #endif
-  showprogress('D');
+  showprogress('B');
 
   /* For the case of the separate user-/kernel-space build, perform whatever
    * platform specific initialization of the user memory is required.
@@ -143,13 +155,13 @@ void __start(void)
 
 #ifdef CONFIG_NUTTX_KERNEL
   sam_userspace();
-  showprogress('E');
+  showprogress('C');
 #endif
 
   /* Initialize onboard resources */
 
   sam_boardinitialize();
-  showprogress('F');
+  showprogress('D');
 
   /* Then start NuttX */
 
diff --git a/nuttx/configs/sam4l-xplained/include/board.h b/nuttx/configs/sam4l-xplained/include/board.h
index 265bd01b4..ff75a4f2f 100644
--- a/nuttx/configs/sam4l-xplained/include/board.h
+++ b/nuttx/configs/sam4l-xplained/include/board.h
@@ -103,9 +103,9 @@
  */
 
 #define BOARD_DFLL0_SOURCE_OSC32K  1
-#define BOARD_FDLL0_FREQUENCY      48000000
-#define BOARD_FDLL0_MUL            (BOARD_FDLL0_FREQUENCY / BOARD_OSC32_FREQUENCY)
-#define BOARD_FDLL0_DIV            1
+#define BOARD_DFLL0_FREQUENCY      48000000
+#define BOARD_DFLL0_MUL            (BOARD_DFLL0_FREQUENCY / BOARD_OSC32_FREQUENCY)
+#define BOARD_DFLL0_DIV            1
 
 /* Phase Locked Loop configuration
  *  Fdfll = (Fclk * PLLmul) / PLLdiv
diff --git a/nuttx/configs/sam4l-xplained/ostest/defconfig b/nuttx/configs/sam4l-xplained/ostest/defconfig
index 3cab5109b..a33d555fa 100644
--- a/nuttx/configs/sam4l-xplained/ostest/defconfig
+++ b/nuttx/configs/sam4l-xplained/ostest/defconfig
@@ -126,6 +126,7 @@ CONFIG_ARCH_CHIP_SAM4L=y
 #
 # AT91SAM3 Peripheral Support
 #
+CONFIG_SAM_PICOCACHE=y
 # CONFIG_SAM34_DMA is not set
 # CONFIG_SAM34_NAND is not set
 # CONFIG_SAM34_HSMCI is not set
@@ -164,7 +165,8 @@ CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
-# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMFUNCS=y
+CONFIG_ARCH_RAMFUNCS=y
 CONFIG_ARCH_HAVE_RAMVECTORS=y
 # CONFIG_ARCH_RAMVECTORS is not set
 
@@ -313,6 +315,10 @@ CONFIG_USART1_BAUD=115200
 CONFIG_USART1_BITS=8
 CONFIG_USART1_PARITY=0
 CONFIG_USART1_2STOP=0
+# CONFIG_USART1_IFLOWCONTROL is not set
+# CONFIG_USART1_OFLOWCONTROL is not set
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
diff --git a/nuttx/configs/sam4l-xplained/scripts/ld.script b/nuttx/configs/sam4l-xplained/scripts/ld.script
index 751ab0299..83cea01e0 100755
--- a/nuttx/configs/sam4l-xplained/scripts/ld.script
+++ b/nuttx/configs/sam4l-xplained/scripts/ld.script
@@ -63,8 +63,6 @@ SECTIONS
 		_etext = ABSOLUTE(.);
 	} > flash
 
-	_eronly = ABSOLUTE(.);
-
 	.data : {
 		_sdata = ABSOLUTE(.);
 		*(.data .data.*)
@@ -73,6 +71,16 @@ SECTIONS
 		_edata = ABSOLUTE(.);
 	} > sram AT > flash
 
+	_eronly = LOADADDR(.data);
+
+	.ramfunc ALIGN(4): {
+		_sramfuncs = ABSOLUTE(.);
+		*(.ramfunc  .ramfunc.*)
+		_eramfuncs = ABSOLUTE(.);
+	} > sram AT > flash
+
+	_framfuncs = LOADADDR(.ramfunc);
+
 	.ARM.extab : {
 		*(.ARM.extab*)
 	} >sram