diff --git a/arch/arm/src/sam34/sam3u_clockconfig.c b/arch/arm/src/sam34/sam3u_clockconfig.c
index efa0a3fc6df..71d918b8c2f 100644
--- a/arch/arm/src/sam34/sam3u_clockconfig.c
+++ b/arch/arm/src/sam34/sam3u_clockconfig.c
@@ -102,8 +102,8 @@
 
 static inline void sam_efcsetup(void)
 {
-  putreg32((2 << EEFC_FMR_FWS_SHIFT), SAM_EEFC0_FMR);
-  putreg32((2 << EEFC_FMR_FWS_SHIFT), SAM_EEFC1_FMR);
+  putreg32((BOARD_FWS << EEFC_FMR_FWS_SHIFT), SAM_EEFC0_FMR);
+  putreg32((BOARD_FWS << EEFC_FMR_FWS_SHIFT), SAM_EEFC1_FMR);
 }
 
 /****************************************************************************
@@ -215,7 +215,7 @@ static inline void sam_pmcsetup(void)
   putreg32(regval, SAM_PMC_MCKR);
   sam_pmcwait(PMC_INT_MCKRDY);
 
-  /* Settup PLLA and wait for LOCKA */
+  /* Setup PLLA and wait for LOCKA */
 
   putreg32(BOARD_CKGR_PLLAR, SAM_PMC_CKGR_PLLAR);
   sam_pmcwait(PMC_INT_LOCKA);
diff --git a/arch/arm/src/sam34/sam_lowputc.c b/arch/arm/src/sam34/sam_lowputc.c
index 6a3d2c88822..54f4ac6e31b 100644
--- a/arch/arm/src/sam34/sam_lowputc.c
+++ b/arch/arm/src/sam34/sam_lowputc.c
@@ -319,6 +319,11 @@ void sam_lowsetup(void)
   (void)sam_configgpio(GPIO_UART0_TXD);
 #endif
 
+#ifdef CONFIG_SAM34_UART1
+  (void)sam_configgpio(GPIO_UART1_RXD);
+  (void)sam_configgpio(GPIO_UART1_TXD);
+#endif
+
 #ifdef CONFIG_SAM34_USART0
   (void)sam_configgpio(GPIO_USART0_RXD);
   (void)sam_configgpio(GPIO_USART0_TXD);