diff --git a/configs/sam4s-xplained-pro/Kconfig b/configs/sam4s-xplained-pro/Kconfig
index a2d3b9ad53c..c050077cf7e 100644
--- a/configs/sam4s-xplained-pro/Kconfig
+++ b/configs/sam4s-xplained-pro/Kconfig
@@ -4,4 +4,10 @@
 #
 
 if ARCH_BOARD_SAM4S_XPLAINED_PRO
+
+config SAM4S_XPLAINED_PRO_CDCACM_DEVMINOR
+	int "CDC/ACM Device Minor"
+	default 0
+	depends on SAM34_UDP && USBDEV && CDCACM
+
 endif
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index a9a10ce49ac..f4ba2b6a8f1 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -341,6 +341,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 #
 # Board-Specific Options
 #
+CONFIG_SAM4S_XPLAINED_PRO_CDCACM_DEVMINOR=0
 
 #
 # RTOS Features
@@ -574,7 +575,6 @@ CONFIG_ARCH_USBDEV_STALLQUEUE=y
 # CONFIG_USBDEV_COMPOSITE is not set
 # CONFIG_PL2303 is not set
 CONFIG_CDCACM=y
-CONFIG_CDCACM_DEVMINOR=0
 # CONFIG_CDCACM_CONSOLE is not set
 CONFIG_CDCACM_EP0MAXPACKET=64
 CONFIG_CDCACM_EPINTIN=1
@@ -747,6 +747,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_CAN is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 CONFIG_EXAMPLES_CPUHOG=y
+CONFIG_EXAMPLES_CPUHOG_STACKSIZE=2048
+CONFIG_EXAMPLES_CPUHOG_PRIORITY=50
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
@@ -783,6 +785,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SENDMAIL is not set
 CONFIG_EXAMPLES_SERIALBLASTER=y
 CONFIG_EXAMPLES_SERIALRX=y
+CONFIG_EXAMPLES_SERIALRX_STACKSIZE=2048
+CONFIG_EXAMPLES_SERIALRX_PRIORITY=50
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART_TEST is not set
diff --git a/configs/sam4s-xplained-pro/src/Makefile b/configs/sam4s-xplained-pro/src/Makefile
index e3ebc842f83..4de3f869920 100644
--- a/configs/sam4s-xplained-pro/src/Makefile
+++ b/configs/sam4s-xplained-pro/src/Makefile
@@ -73,7 +73,7 @@ CSRCS += sam_wdt.c
 endif
 
 ifeq ($(CONFIG_TIMER),y)
-CSRCS += sam_tc.c
+# CSRCS += sam_tc.c
 endif
 
 COBJS = $(CSRCS:.c=$(OBJEXT))
diff --git a/configs/sam4s-xplained-pro/src/sam_nsh.c b/configs/sam4s-xplained-pro/src/sam_nsh.c
index 8802d7f76db..e793df9794f 100644
--- a/configs/sam4s-xplained-pro/src/sam_nsh.c
+++ b/configs/sam4s-xplained-pro/src/sam_nsh.c
@@ -108,7 +108,7 @@ int nsh_archinitialize(void)
 
 #ifdef HAVE_USBDEV
   message("Registering CDC/ACM serial driver\n");
-  ret = cdcacm_initialize(CONFIG_CDCACM_DEVMINOR, NULL);
+  ret = cdcacm_initialize(CONFIG_SAM4S_XPLAINED_PRO_CDCACM_DEVMINOR, NULL);
   if (ret < 0)
     {
       message("ERROR: Failed to create the CDC/ACM serial device: %d\n", errno);