diff --git a/boards/mpfs/icicle/nuttx-config/nsh/defconfig b/boards/mpfs/icicle/nuttx-config/nsh/defconfig
index d2c7a035a157..265fe26d2205 100644
--- a/boards/mpfs/icicle/nuttx-config/nsh/defconfig
+++ b/boards/mpfs/icicle/nuttx-config/nsh/defconfig
@@ -34,7 +34,6 @@ CONFIG_CDCACM_VENDORID=0x16c0
 CONFIG_CDCACM_VENDORSTR="SSRC"
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_RANDOM_POOL=y
-CONFIG_DEBUG_ERROR=y
 CONFIG_DEBUG_FEATURES=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_SYMBOLS=y
@@ -43,6 +42,8 @@ CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_EE24XX_FREQUENCY=400000
 CONFIG_EEPROM=y
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSSECTSIZE=128
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FDCLONE_STDIO=y
@@ -51,7 +52,6 @@ CONFIG_FS_FAT=y
 CONFIG_FS_FATTIME=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_PROCFS_EXCLUDE_ENVIRON=y
-CONFIG_FS_PROCFS_MAX_TASKS=64
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_ROMFS=y
 CONFIG_FS_SHMFS=y
@@ -105,9 +105,7 @@ CONFIG_NETINIT_MACADDR_1=0x554b4b41
 CONFIG_NETINIT_MACADDR_2=0x024a
 CONFIG_NETINIT_NOMAC=y
 CONFIG_NET_ARP_IPIN=y
-CONFIG_NET_ARP_SEND=y
 CONFIG_NET_BROADCAST=y
-CONFIG_NET_ICMP=y
 CONFIG_NET_ICMP_SOCKET=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
@@ -118,15 +116,11 @@ CONFIG_NET_UDP_CHECKSUMS=y
 CONFIG_NET_UDP_NOTIFIER=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_CUSTOMROMFS=y
-CONFIG_NSH_CUSTOMROMFS_HEADER="../../include/nsh_romfsimg.h"
 CONFIG_NSH_LINELEN=128
 CONFIG_NSH_MAXARGUMENTS=15
 CONFIG_NSH_NESTDEPTH=8
 CONFIG_NSH_PROMPT_STRING="icicle> "
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
-CONFIG_NSH_ROMFSSECTSIZE=128
 CONFIG_NSH_STRERROR=y
 CONFIG_NSH_VARS=y
 CONFIG_PIPES=y
@@ -145,10 +139,10 @@ CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_HPWORKPRIORITY=249
 CONFIG_SCHED_INSTRUMENTATION=y
 CONFIG_SCHED_INSTRUMENTATION_SWITCH=y
+CONFIG_SCHED_LPNTHREADS=2
 CONFIG_SCHED_LPWORK=y
 CONFIG_SCHED_LPWORKPRIORITY=50
 CONFIG_SCHED_LPWORKSTACKSIZE=4096
-CONFIG_SCHED_LPNTHREADS=2
 CONFIG_SCHED_WAITPID=y
 CONFIG_SEM_PREALLOCHOLDERS=32
 CONFIG_SERIAL_NPOLLWAITERS=2
diff --git a/boards/mpfs/icicle/src/mpfs_emmcsd.c b/boards/mpfs/icicle/src/mpfs_emmcsd.c
index f063a31e8a35..c2aae1229a1e 100644
--- a/boards/mpfs/icicle/src/mpfs_emmcsd.c
+++ b/boards/mpfs/icicle/src/mpfs_emmcsd.c
@@ -42,7 +42,7 @@
 #include <nuttx/mmcsd.h>
 #include <nuttx/fs/partition.h>
 
-#include "mpfs_emmcsd.h"
+#include "mpfs_sdio.h"
 #include "board_config.h"
 
 /****************************************************************************