diff --git a/arch/arm/src/sam34/sam_serial.c b/arch/arm/src/sam34/sam_serial.c
index c1e2090827..6ffa535421 100644
--- a/arch/arm/src/sam34/sam_serial.c
+++ b/arch/arm/src/sam34/sam_serial.c
@@ -152,7 +152,10 @@
 #  undef CONFIG_USART2_SERIAL_CONSOLE
 #  define HAVE_CONSOLE 1
 #else
-#  warning "No valid CONFIG_USARTn_SERIAL_CONSOLE Setting"
+#  ifndef CONFIG_NO_SERIAL_CONSOLE
+#    warning "No valid CONFIG_USARTn_SERIAL_CONSOLE Setting"
+#  endif
+
 #  undef CONFIG_UART0_SERIAL_CONSOLE
 #  undef CONFIG_UART1_SERIAL_CONSOLE
 #  undef CONFIG_USART0_SERIAL_CONSOLE
diff --git a/arch/arm/src/sam34/sam_start.c b/arch/arm/src/sam34/sam_start.c
index 501c386ddb..d0f855585c 100644
--- a/arch/arm/src/sam34/sam_start.c
+++ b/arch/arm/src/sam34/sam_start.c
@@ -51,6 +51,7 @@
 
 #include "sam_clockconfig.h"
 #include "sam_lowputc.h"
+#include "sam_cmcc.h"
 #include "sam_userspace.h"
 
 /****************************************************************************