diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index 45fbddf1c56..dd20b99e65c 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -61,10 +61,13 @@ CONFIG_ARCH_ARM=y
 # CONFIG_ARCH_AVR is not set
 # CONFIG_ARCH_HC is not set
 # CONFIG_ARCH_MIPS is not set
+# CONFIG_ARCH_MISOC is not set
 # CONFIG_ARCH_RGMP is not set
 # CONFIG_ARCH_RENESAS is not set
+# CONFIG_ARCH_RISCV is not set
 # CONFIG_ARCH_SIM is not set
 # CONFIG_ARCH_X86 is not set
+# CONFIG_ARCH_XTENSA is not set
 # CONFIG_ARCH_Z16 is not set
 # CONFIG_ARCH_Z80 is not set
 CONFIG_ARCH="arm"
@@ -369,8 +372,6 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # Board-Specific Options
 #
 CONFIG_SAM4S_XPLAINED_PRO_CDCACM_DEVMINOR=0
-CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH="/dev/rtt0"
-CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH="/dev/tc0"
 # CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_RESET is not set
@@ -399,6 +400,7 @@ CONFIG_USEC_PER_TICK=10000
 CONFIG_SYSTEMTICK_EXTCLK=y
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
+# CONFIG_ARCH_HAVE_TIMEKEEPING is not set
 CONFIG_JULIAN_TIME=y
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_PREALLOC_WDOGS=32
@@ -431,6 +433,8 @@ CONFIG_NPTHREAD_KEYS=4
 CONFIG_SCHED_CPULOAD=y
 CONFIG_SCHED_CPULOAD_EXTCLK=y
 CONFIG_SCHED_CPULOAD_TICKSPERSEC=222
+# CONFIG_CPULOAD_ONESHOT is not set
+CONFIG_CPULOAD_ONESHOT_ENTROPY=6
 CONFIG_SCHED_CPULOAD_TIMECONSTANT=2
 # CONFIG_SCHED_INSTRUMENTATION is not set
 
@@ -513,12 +517,16 @@ CONFIG_DEV_ZERO=y
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
+# CONFIG_ARCH_HAVE_SPI_CRCGENERATION is not set
+# CONFIG_ARCH_HAVE_SPI_CS_CONTROL is not set
+# CONFIG_ARCH_HAVE_SPI_BITORDER is not set
 # CONFIG_I2S is not set
 
 #
 # Timer Driver Support
 #
-CONFIG_TIMER=y
+# CONFIG_TIMER is not set
+# CONFIG_ONESHOT is not set
 CONFIG_RTC=y
 # CONFIG_RTC_DATETIME is not set
 CONFIG_RTC_HIRES=y
@@ -699,6 +707,7 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
+# CONFIG_DRIVERS_CONTACTLESS is not set
 
 #
 # System Logging
@@ -812,6 +821,8 @@ CONFIG_NUNGET_CHARS=2
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
 # CONFIG_LIBC_IOCTL_VARIADIC is not set
+# CONFIG_LIBC_WCHAR is not set
+# CONFIG_LIBC_LOCALE is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -872,6 +883,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # Examples
 #
+# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CCTYPE is not set
 # CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 CONFIG_EXAMPLES_CPUHOG=y
@@ -909,6 +922,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
 # CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RFID_READUID is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -932,7 +946,6 @@ CONFIG_EXAMPLES_SERIALRX_PRINTHEX=y
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
-# CONFIG_EXAMPLES_TIMER is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
@@ -962,6 +975,7 @@ CONFIG_EXAMPLES_SERIALRX_PRINTHEX=y
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_MINIBASIC is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
@@ -1034,6 +1048,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_MOUNT is not set
 # CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
+CONFIG_NSH_DISABLE_PRINTF=y
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
 # CONFIG_NSH_DISABLE_PWD is not set
@@ -1106,6 +1121,8 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_SYSTEM is not set
+# CONFIG_SYSTEM_TEE is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sam4s-xplained-pro/src/sam_tc.c b/configs/sam4s-xplained-pro/src/sam_tc.c
index f00fd42c042..8d25619c792 100644
--- a/configs/sam4s-xplained-pro/src/sam_tc.c
+++ b/configs/sam4s-xplained-pro/src/sam_tc.c
@@ -99,6 +99,8 @@
  * Private Functions
  ****************************************************************************/
 
+#if 0 /* Cannot be used -- needs to be updated to current, signal based interface */
+
 #if defined(CONFIG_SYSTEMTICK_EXTCLK) && !defined(CONFIG_SUPPRESS_INTERRUPTS) && \
     !defined(CONFIG_SUPPRESS_TIMER_INTS)
 
@@ -119,6 +121,7 @@ static bool calc_cpuload(FAR uint32_t *next_interval_us)
 }
 
 #endif /* CONFIG_SCHED_CPULOAD && CONFIG_SCHED_CPULOAD_EXTCLK */
+#endif /* 0 */
 
 /****************************************************************************
  * Public Functions
@@ -134,6 +137,7 @@ static bool calc_cpuload(FAR uint32_t *next_interval_us)
 
 int sam_timerinitialize(void)
 {
+#if 0 /* Cannot be used -- needs to be updated to current, signal based interface */
   int fd;
   int ret;
 
@@ -200,14 +204,14 @@ int sam_timerinitialize(void)
 
   /* install user callback */
   {
-    struct timer_sethandler_s tccb;
-    tccb.newhandler = systemtick;
-    tccb.oldhandler = NULL;
+    struct timer_notify_s notify;
+    notify.newhandler = systemtick;
+    notify.oldhandler = NULL;
 
-    ret = ioctl(fd, TCIOC_SETHANDLER, (unsigned long)&tccb);
+    ret = ioctl(fd, TCIOC_NOTIFICATION, (unsigned long)&notify);
     if (ret < 0)
       {
-        tmrerr("ERROR: ioctl(TCIOC_SETHANDLER) failed: %d\n", errno);
+        tmrerr("ERROR: ioctl(TCIOC_NOTIFICATION) failed: %d\n", errno);
         goto errout_with_dev;
       }
   }
@@ -251,14 +255,14 @@ int sam_timerinitialize(void)
   /* Install user callback */
 
   {
-    struct timer_sethandler_s tccb;
-    tccb.newhandler = calc_cpuload;
-    tccb.oldhandler = NULL;
+    struct timer_notify_s notify;
+    notify.newhandler = calc_cpuload;
+    notify.oldhandler = NULL;
 
-    ret = ioctl(fd, TCIOC_SETHANDLER, (unsigned long)&tccb);
+    ret = ioctl(fd, TCIOC_NOTIFICATION, (unsigned long)&notify);
     if (ret < 0)
       {
-        tmrerr("ERROR: ioctl(TCIOC_SETHANDLER) failed: %d\n", errno);
+        tmrerr("ERROR: ioctl(TCIOC_NOTIFICATION) failed: %d\n", errno);
         goto errout_with_dev;
       }
   }
@@ -282,6 +286,9 @@ errout:
 
 success:
   return OK;
+#else
+  return -ENOSYS;
+#endif
 
 }