diff --git a/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig
index 81e0c89063..5833a41c94 100644
--- a/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig
@@ -6,6 +6,7 @@
 # modifications.
 #
 # CONFIG_DISABLE_OS_API is not set
+# CONFIG_MPFS_MAC_AUTONEG is not set
 # CONFIG_NSH_DISABLE_LOSMART is not set
 # CONFIG_SPI_CALLBACK is not set
 CONFIG_ALLOW_BSD_COMPONENTS=y
@@ -21,10 +22,21 @@ CONFIG_ARCH_RISCV=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_BOARD_LOOPSPERMSEC=54000
 CONFIG_BUILTIN=y
+CONFIG_CDCACM=y
+CONFIG_CDCACM_EPBULKIN=3
+CONFIG_CDCACM_EPINTIN=4
+CONFIG_CDCACM_RXBUFSIZE=257
+CONFIG_CDCACM_TXBUFSIZE=193
 CONFIG_DEBUG_ASSERTIONS=y
 CONFIG_DEBUG_FEATURES=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEFAULT_TASK_STACKSIZE=8192
+CONFIG_EXAMPLES_TCPBLASTER=y
+CONFIG_EXAMPLES_TCPBLASTER_PROGNAME1="tcpclient"
+CONFIG_EXAMPLES_TCPBLASTER_SERVER=y
+CONFIG_EXAMPLES_TCPBLASTER_SERVERIP=0x0a000001
+CONFIG_EXAMPLES_UDPBLASTER=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_FS_FAT=y
 CONFIG_FS_PROCFS=y
@@ -33,7 +45,6 @@ CONFIG_I2C=y
 CONFIG_I2C_DRIVER=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INIT_ENTRYPOINT="nsh_main"
-CONFIG_INIT_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
@@ -46,10 +57,14 @@ CONFIG_MPFS_CORESPI=y
 CONFIG_MPFS_DMA=y
 CONFIG_MPFS_EMMCSD=y
 CONFIG_MPFS_ENABLE_DPFPU=y
+CONFIG_MPFS_ETHMAC_1=y
 CONFIG_MPFS_HAVE_COREPWM=y
 CONFIG_MPFS_HAVE_CORESPI=y
 CONFIG_MPFS_I2C0=y
 CONFIG_MPFS_I2C1=y
+CONFIG_MPFS_MAC_ETH1000MBPS=y
+CONFIG_MPFS_MAC_ETHFD=y
+CONFIG_MPFS_PHYADDR=9
 CONFIG_MPFS_SPI0=y
 CONFIG_MPFS_SPI1=y
 CONFIG_MPFS_UART0=y
@@ -57,13 +72,19 @@ CONFIG_MPFS_UART1=y
 CONFIG_MPFS_UART2=y
 CONFIG_MPFS_UART3=y
 CONFIG_MPFS_UART4=y
+CONFIG_NET=y
+CONFIG_NETDEV_PHY_IOCTL=y
+CONFIG_NETINIT_NOMAC=y
+CONFIG_NETUTILS_TELNETC=y
+CONFIG_NETUTILS_TELNETD=y
+CONFIG_NET_ETH_PKTSIZE=1478
+CONFIG_NET_ICMP_SOCKET=y
+CONFIG_NET_IGMP=y
+CONFIG_NET_SOCKOPTS=y
+CONFIG_NET_TCP=y
+CONFIG_NET_UDP=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_DISABLE_IFUPDOWN=y
-CONFIG_NSH_DISABLE_MKDIR=y
-CONFIG_NSH_DISABLE_RM=y
-CONFIG_NSH_DISABLE_RMDIR=y
-CONFIG_NSH_DISABLE_UMOUNT=y
 CONFIG_NSH_STRERROR=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTABLE_PARTITION=y
@@ -86,11 +107,17 @@ CONFIG_STACK_COLORATION=y
 CONFIG_START_MONTH=4
 CONFIG_START_YEAR=2021
 CONFIG_SYSLOG_COLOR_OUTPUT=y
+CONFIG_SYSTEM_CDCACM=y
 CONFIG_SYSTEM_CLE_CMD_HISTORY=y
 CONFIG_SYSTEM_COLOR_CLE=y
+CONFIG_SYSTEM_MDIO=y
 CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_PING=y
 CONFIG_SYSTEM_TIME64=y
 CONFIG_TASK_NAME_SIZE=20
 CONFIG_TESTING_GETPRIME=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_UART1_SERIAL_CONSOLE=y
+CONFIG_USBDEV=y
+CONFIG_USBDEV_DUALSPEED=y
+CONFIG_USBDEV_TRACE=y
diff --git a/boards/risc-v/mpfs/icicle/configs/network/defconfig b/boards/risc-v/mpfs/icicle/configs/network/defconfig
deleted file mode 100644
index 5ef5fe11d2..0000000000
--- a/boards/risc-v/mpfs/icicle/configs/network/defconfig
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# This file is autogenerated: PLEASE DO NOT EDIT IT.
-#
-# You can use "make menuconfig" to make any modifications to the installed .config file.
-# You can then do "make savedefconfig" to generate a new defconfig file that includes your
-# modifications.
-#
-# CONFIG_DISABLE_OS_API is not set
-# CONFIG_NSH_DISABLE_LOSMART is not set
-CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="icicle"
-CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ICICLE_MPFS=y
-CONFIG_ARCH_CHIP="mpfs"
-CONFIG_ARCH_CHIP_MPFS250T_FCVG484=y
-CONFIG_ARCH_CHIP_MPFS=y
-CONFIG_ARCH_INTERRUPTSTACK=2048
-CONFIG_ARCH_RISCV=y
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_BOARD_LOOPSPERMSEC=54000
-CONFIG_BUILTIN=y
-CONFIG_DEBUG_ASSERTIONS=y
-CONFIG_DEBUG_FEATURES=y
-CONFIG_DEBUG_FULLOPT=y
-CONFIG_DEBUG_SYMBOLS=y
-CONFIG_EXAMPLES_TCPBLASTER=y
-CONFIG_EXAMPLES_TCPBLASTER_PROGNAME1="tcpclient"
-CONFIG_EXAMPLES_TCPBLASTER_SERVER=y
-CONFIG_EXAMPLES_TCPBLASTER_SERVERIP=0x0a000001
-CONFIG_EXAMPLES_UDPBLASTER=y
-CONFIG_EXPERIMENTAL=y
-CONFIG_FS_PROCFS=y
-CONFIG_FS_ROMFS=y
-CONFIG_IDLETHREAD_STACKSIZE=2048
-CONFIG_INIT_ENTRYPOINT="nsh_main"
-CONFIG_INIT_STACKSIZE=3072
-CONFIG_INTELHEX_BINARY=y
-CONFIG_LIBC_HOSTNAME="icicle"
-CONFIG_LIBC_MEMSET_64BIT=y
-CONFIG_LIBC_MEMSET_OPTSPEED=y
-CONFIG_LIBC_PERROR_STDOUT=y
-CONFIG_LIBC_STRERROR=y
-CONFIG_LINE_MAX=160
-CONFIG_MPFS_ENABLE_DPFPU=y
-CONFIG_MPFS_ETHMAC_1=y
-CONFIG_MPFS_PHYADDR=9
-CONFIG_MPFS_UART1=y
-CONFIG_NET=y
-CONFIG_NETDEV_PHY_IOCTL=y
-CONFIG_NETINIT_DRIPADDR=0xC0A866FE
-CONFIG_NETINIT_IPADDR=0xC0A86605
-CONFIG_NETINIT_NOMAC=y
-CONFIG_NETUTILS_TELNETC=y
-CONFIG_NETUTILS_TELNETD=y
-CONFIG_NET_ETH_PKTSIZE=1518
-CONFIG_NET_ICMP_SOCKET=y
-CONFIG_NET_IGMP=y
-CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_TCP=y
-CONFIG_NET_UDP=y
-CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_DISABLE_IFUPDOWN=y
-CONFIG_NSH_DISABLE_MKDIR=y
-CONFIG_NSH_DISABLE_PRINTF=y
-CONFIG_NSH_DISABLE_RM=y
-CONFIG_NSH_DISABLE_RMDIR=y
-CONFIG_NSH_DISABLE_TRUNCATE=y
-CONFIG_NSH_DISABLE_UMOUNT=y
-CONFIG_NSH_STRERROR=y
-CONFIG_PREALLOC_TIMERS=4
-CONFIG_RAM_SIZE=1048576
-CONFIG_RAM_START=0x80200000
-CONFIG_RAW_BINARY=y
-CONFIG_READLINE_CMD_HISTORY=y
-CONFIG_READLINE_TABCOMPLETION=y
-CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_LPWORK=y
-CONFIG_SCHED_WAITPID=y
-CONFIG_SERIAL_NPOLLWAITERS=2
-CONFIG_STACK_COLORATION=y
-CONFIG_START_MONTH=4
-CONFIG_START_YEAR=2021
-CONFIG_SYSLOG_COLOR_OUTPUT=y
-CONFIG_SYSTEM_CLE_CMD_HISTORY=y
-CONFIG_SYSTEM_COLOR_CLE=y
-CONFIG_SYSTEM_MDIO=y
-CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_PING=y
-CONFIG_SYSTEM_TIME64=y
-CONFIG_TASK_NAME_SIZE=20
-CONFIG_TESTING_GETPRIME=y
-CONFIG_TESTING_OSTEST=y
-CONFIG_UART1_SERIAL_CONSOLE=y
diff --git a/boards/risc-v/mpfs/icicle/configs/usb/defconfig b/boards/risc-v/mpfs/icicle/configs/usb/defconfig
deleted file mode 100644
index 2fd3120630..0000000000
--- a/boards/risc-v/mpfs/icicle/configs/usb/defconfig
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# This file is autogenerated: PLEASE DO NOT EDIT IT.
-#
-# You can use "make menuconfig" to make any modifications to the installed .config file.
-# You can then do "make savedefconfig" to generate a new defconfig file that includes your
-# modifications.
-#
-# CONFIG_ARCH_FPU is not set
-# CONFIG_DISABLE_OS_API is not set
-# CONFIG_NSH_DISABLE_DATE is not set
-# CONFIG_NSH_DISABLE_LOSMART is not set
-# CONFIG_NSH_DISABLE_MB is not set
-CONFIG_ARCH="risc-v"
-CONFIG_ARCH_BOARD="icicle"
-CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ICICLE_MPFS=y
-CONFIG_ARCH_CHIP="mpfs"
-CONFIG_ARCH_CHIP_MPFS250T_FCVG484=y
-CONFIG_ARCH_CHIP_MPFS=y
-CONFIG_ARCH_INTERRUPTSTACK=2048
-CONFIG_ARCH_RISCV=y
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_BOARDCTL_MKRD=y
-CONFIG_BOARD_LOOPSPERMSEC=54000
-CONFIG_BUILTIN=y
-CONFIG_CDCACM=y
-CONFIG_CDCACM_BULKIN_REQLEN=96
-CONFIG_CDCACM_COMPOSITE=y
-CONFIG_CDCACM_RXBUFSIZE=257
-CONFIG_CDCACM_TXBUFSIZE=193
-CONFIG_COMPOSITE_IAD=y
-CONFIG_DEBUG_ASSERTIONS=y
-CONFIG_DEBUG_FEATURES=y
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_FS_ERROR=y
-CONFIG_DEBUG_FS_WARN=y
-CONFIG_DEBUG_FULLOPT=y
-CONFIG_DEBUG_MEMCARD=y
-CONFIG_DEBUG_MEMCARD_ERROR=y
-CONFIG_DEBUG_SYMBOLS=y
-CONFIG_DEBUG_USB=y
-CONFIG_EXPERIMENTAL=y
-CONFIG_FAT_LCNAMES=y
-CONFIG_FAT_LFN=y
-CONFIG_FS_FAT=y
-CONFIG_FS_PROCFS=y
-CONFIG_FS_ROMFS=y
-CONFIG_IDLETHREAD_STACKSIZE=2048
-CONFIG_INIT_ENTRYPOINT="nsh_main"
-CONFIG_INIT_STACKSIZE=3072
-CONFIG_INTELHEX_BINARY=y
-CONFIG_IOB_NBUFFERS=24
-CONFIG_IOB_NCHAINS=24
-CONFIG_LIBC_HOSTNAME="icicle"
-CONFIG_LIBC_MEMSET_64BIT=y
-CONFIG_LIBC_MEMSET_OPTSPEED=y
-CONFIG_LIBC_PERROR_STDOUT=y
-CONFIG_LIBC_STRERROR=y
-CONFIG_LINE_MAX=160
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SDIO=y
-CONFIG_MM_IOB=y
-CONFIG_MPFS_EMMCSD=y
-CONFIG_MPFS_UART2=y
-CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_DISABLE_BASENAME=y
-CONFIG_NSH_DISABLE_DF=y
-CONFIG_NSH_DISABLE_DIRNAME=y
-CONFIG_NSH_DISABLE_EXIT=y
-CONFIG_NSH_DISABLE_EXPORT=y
-CONFIG_NSH_DISABLE_FREE=y
-CONFIG_NSH_DISABLE_GET=y
-CONFIG_NSH_DISABLE_HEXDUMP=y
-CONFIG_NSH_DISABLE_MKRD=y
-CONFIG_NSH_DISABLE_PUT=y
-CONFIG_NSH_DISABLE_PWD=y
-CONFIG_NSH_DISABLE_RM=y
-CONFIG_NSH_DISABLE_RMDIR=y
-CONFIG_NSH_DISABLE_SET=y
-CONFIG_NSH_DISABLE_SLEEP=y
-CONFIG_NSH_DISABLE_SOURCE=y
-CONFIG_NSH_DISABLE_TEST=y
-CONFIG_NSH_DISABLE_TIME=y
-CONFIG_NSH_DISABLE_TRUNCATE=y
-CONFIG_NSH_DISABLE_UMOUNT=y
-CONFIG_NSH_DISABLE_UNAME=y
-CONFIG_NSH_DISABLE_UNSET=y
-CONFIG_NSH_DISABLE_USLEEP=y
-CONFIG_NSH_DISABLE_WGET=y
-CONFIG_NSH_DISABLE_XD=y
-CONFIG_PREALLOC_TIMERS=4
-CONFIG_RAM_SIZE=1048576
-CONFIG_RAM_START=0xa2200000
-CONFIG_RAW_BINARY=y
-CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_LPWORK=y
-CONFIG_SCHED_WAITPID=y
-CONFIG_STACK_COLORATION=y
-CONFIG_START_MONTH=4
-CONFIG_START_YEAR=2021
-CONFIG_SYSTEM_COMPOSITE=y
-CONFIG_SYSTEM_NSH=y
-CONFIG_SYSTEM_TIME64=y
-CONFIG_TASK_NAME_SIZE=20
-CONFIG_UART2_SERIAL_CONSOLE=y
-CONFIG_USBDEV=y
-CONFIG_USBDEV_COMPOSITE=y
-CONFIG_USBDEV_DUALSPEED=y
-CONFIG_USBDEV_TRACE=y
-CONFIG_USBMONITOR=y
-CONFIG_USBMONITOR_INTERVAL=1
-CONFIG_USBMONITOR_TRACECLASS=y
-CONFIG_USBMONITOR_TRACECONTROLLER=y
-CONFIG_USBMONITOR_TRACEINIT=y
-CONFIG_USBMONITOR_TRACEINTERRUPTS=y
-CONFIG_USBMONITOR_TRACETRANSFERS=y
-CONFIG_USBMSC=y
-CONFIG_USBMSC_COMPOSITE=y
-CONFIG_USBMSC_IFNOBASE=2