diff --git a/04_build_linux.sh b/04_build_linux.sh
index 92a491d..be4a801 100755
--- a/04_build_linux.sh
+++ b/04_build_linux.sh
@@ -29,6 +29,7 @@ else
 	cp -v ../patches/linux/mainline/dts/mpfs-beaglev-fire-fabric.dtsi arch/riscv/boot/dts/microchip/
 fi
 
+echo "make ARCH=riscv CROSS_COMPILE=${CC} clean"
 make ARCH=riscv CROSS_COMPILE=${CC} clean
 
 if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
@@ -129,7 +130,9 @@ else
 	make ARCH=riscv CROSS_COMPILE=${CC} defconfig
 
 	./scripts/config --enable CONFIG_PCIE_MICROCHIP_HOST
+
 	./scripts/config --enable CONFIG_OF_OVERLAY
+
 	./scripts/config --enable CONFIG_I2C
 	./scripts/config --enable CONFIG_EEPROM_AT24
 	./scripts/config --enable CONFIG_I2C_MICROCHIP_CORE
@@ -137,8 +140,22 @@ else
 	./scripts/config --enable CONFIG_SPI_MICROCHIP_CORE
 	./scripts/config --enable CONFIG_SPI_MICROCHIP_CORE_QSPI
 	./scripts/config --module CONFIG_SPI_SPIDEV
+
 	./scripts/config --enable CONFIG_GPIO_SYSFS
 
+	./scripts/config --enable CONFIG_HW_RANDOM_POLARFIRE_SOC
+
+	./scripts/config --enable CONFIG_USB_MUSB_POLARFIRE_SOC
+
+	./scripts/config --enable CONFIG_MAILBOX
+	./scripts/config --enable CONFIG_POLARFIRE_SOC_MAILBOX
+	./scripts/config --disable CONFIG_SUN6I_MSGBOX
+
+	./scripts/config --enable CONFIG_REMOTEPROC
+	./scripts/config --enable CONFIG_REMOTEPROC_CDEV
+
+	./scripts/config --enable CONFIG_POLARFIRE_SOC_SYS_CTRL
+
 	echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig"
 	make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig
 fi
diff --git a/build_linux_menuconfig.sh b/build_linux_menuconfig.sh
index e88c0e3..ed5b323 100755
--- a/build_linux_menuconfig.sh
+++ b/build_linux_menuconfig.sh
@@ -29,118 +29,15 @@ else
 	cp -v ../patches/linux/mainline/dts/mpfs-beaglev-fire-fabric.dtsi arch/riscv/boot/dts/microchip/
 fi
 
+echo "make ARCH=riscv CROSS_COMPILE=${CC} clean"
 make ARCH=riscv CROSS_COMPILE=${CC} clean
 
 if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
 	echo "make ARCH=riscv CROSS_COMPILE=${CC} mpfs_defconfig"
 	make ARCH=riscv CROSS_COMPILE=${CC} mpfs_defconfig
-
-	#
-	# Scheduler features
-	#
-	# end of Scheduler features
-
-	./scripts/config --enable CONFIG_MEMCG
-	./scripts/config --enable CONFIG_MEMCG_KMEM
-	./scripts/config --enable CONFIG_RT_GROUP_SCHED
-	./scripts/config --enable CONFIG_SCHED_MM_CID
-	./scripts/config --enable CONFIG_CGROUP_PIDS
-	./scripts/config --enable CONFIG_CGROUP_FREEZER
-	./scripts/config --enable CONFIG_CGROUP_HUGETLB
-	./scripts/config --enable CONFIG_CPUSETS
-	./scripts/config --enable CONFIG_PROC_PID_CPUSET
-	./scripts/config --enable CONFIG_CGROUP_DEVICE
-	./scripts/config --enable CONFIG_CGROUP_CPUACCT
-	./scripts/config --enable CONFIG_CGROUP_PERF
-	./scripts/config --enable CONFIG_NAMESPACES
-	./scripts/config --enable CONFIG_UTS_NS
-	./scripts/config --enable CONFIG_TIME_NS
-	./scripts/config --enable CONFIG_IPC_NS
-	./scripts/config --enable CONFIG_USER_NS
-	./scripts/config --enable CONFIG_PID_NS
-	./scripts/config --enable CONFIG_NET_NS
-	./scripts/config --enable CONFIG_CHECKPOINT_RESTORE
-
-	./scripts/config --set-str CONFIG_CMDLINE ""
-	./scripts/config --disable CONFIG_CMDLINE_FALLBACK
-	./scripts/config --enable CONFIG_EEPROM_AT24
-	./scripts/config --enable CONFIG_OF_OVERLAY
-	./scripts/config --enable CONFIG_GPIO_MICROCHIP_CORE
-	./scripts/config --enable CONFIG_MCP356X
-	./scripts/config --enable CONFIG_POLARFIRE_SOC_GENERIC_SERVICE
-
-	#
-	# Networking options
-	#
-	./scripts/config --disable CONFIG_NETLABEL
-
-	#
-	# File systems
-	#
-	./scripts/config --enable CONFIG_EXT4_FS_SECURITY
-	./scripts/config --disable CONFIG_FANOTIFY
-	./scripts/config --enable CONFIG_AUTOFS_FS
-
-	#
-	# DOS/FAT/EXFAT/NT Filesystems
-	#
-	./scripts/config --enable CONFIG_FAT_FS
-	./scripts/config --enable CONFIG_MSDOS_FS
-	./scripts/config --enable CONFIG_VFAT_FS
-
-	#
-	# Pseudo filesystems
-	#
-	./scripts/config --enable CONFIG_PROC_CHILDREN
-	./scripts/config --enable CONFIG_HUGETLBFS
-	./scripts/config --enable CONFIG_NLS_CODEPAGE_437
-
-	#
-	# Security options
-	#
-	./scripts/config --enable CONFIG_SECURITY
-	./scripts/config --enable CONFIG_SECURITYFS
-	./scripts/config --enable CONFIG_SECURITY_NETWORK
-	./scripts/config --enable CONFIG_SECURITY_PATH
-	./scripts/config --set-val CONFIG_LSM_MMAP_MIN_ADDR 65536
-
-	./scripts/config --disable CONFIG_SECURITY_SELINUX
-	./scripts/config --disable CONFIG_SECURITY_SMACK
-	./scripts/config --disable CONFIG_SECURITY_TOMOYO
-	./scripts/config --disable CONFIG_SECURITY_APPARMOR
-	./scripts/config --disable CONFIG_SECURITY_LOADPIN
-	./scripts/config --disable CONFIG_SECURITY_YAMA
-	./scripts/config --disable CONFIG_SECURITY_SAFESETID
-	./scripts/config --disable CONFIG_SECURITY_LOCKDOWN_LSM
-	./scripts/config --disable CONFIG_SECURITY_LANDLOCK
-
-	./scripts/config --enable CONFIG_INTEGRITY
-	./scripts/config --disable CONFIG_INTEGRITY_SIGNATURE
-
-	./scripts/config --disable CONFIG_IMA
-	./scripts/config --disable CONFIG_EVM
-
-	#./scripts/config --disable CONFIG_VMAP_STACK
-	#./scripts/config --disable CONFIG_SMP
-	echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig"
-	make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig
 else
 	echo "make ARCH=riscv CROSS_COMPILE=${CC} defconfig"
 	make ARCH=riscv CROSS_COMPILE=${CC} defconfig
-
-	./scripts/config --enable CONFIG_PCIE_MICROCHIP_HOST
-	./scripts/config --enable CONFIG_OF_OVERLAY
-	./scripts/config --enable CONFIG_I2C
-	./scripts/config --enable CONFIG_EEPROM_AT24
-	./scripts/config --enable CONFIG_I2C_MICROCHIP_CORE
-
-	./scripts/config --enable CONFIG_SPI_MICROCHIP_CORE
-	./scripts/config --enable CONFIG_SPI_MICROCHIP_CORE_QSPI
-	./scripts/config --module CONFIG_SPI_SPIDEV
-	./scripts/config --enable CONFIG_GPIO_SYSFS
-
-	echo "make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig"
-	make -j${CORES} ARCH=riscv CROSS_COMPILE=${CC} olddefconfig
 fi
 
 echo "make ARCH=riscv CROSS_COMPILE=${CC} menuconfig"
diff --git a/patches/linux/mainline/defconfig b/patches/linux/mainline/defconfig
index f15ae11..7e8b0ed 100644
--- a/patches/linux/mainline/defconfig
+++ b/patches/linux/mainline/defconfig
@@ -1266,7 +1266,9 @@ CONFIG_FW_CACHE=y
 # CONFIG_FW_UPLOAD is not set
 # end of Firmware loader
 
+CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
@@ -2248,6 +2250,7 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_BA431 is not set
 CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_HW_RANDOM_POLARFIRE_SOC=y
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
 # CONFIG_HW_RANDOM_JH7110 is not set
@@ -3582,12 +3585,13 @@ CONFIG_USB_MUSB_HOST=y
 # Platform Glue Layer
 #
 CONFIG_USB_MUSB_SUNXI=m
-# CONFIG_USB_MUSB_POLARFIRE_SOC is not set
+CONFIG_USB_MUSB_POLARFIRE_SOC=m
 
 #
 # MUSB DMA mode
 #
 # CONFIG_MUSB_PIO_ONLY is not set
+# CONFIG_USB_INVENTRA_DMA is not set
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_DWC2 is not set
 # CONFIG_USB_CHIPIDEA is not set
@@ -3931,7 +3935,13 @@ CONFIG_SUN4I_TIMER=y
 CONFIG_RISCV_TIMER=y
 # end of Clock Source drivers
 
-# CONFIG_MAILBOX is not set
+CONFIG_MAILBOX=y
+# CONFIG_PLATFORM_MHU is not set
+# CONFIG_PCC is not set
+# CONFIG_ALTERA_MBOX is not set
+# CONFIG_MAILBOX_TEST is not set
+CONFIG_POLARFIRE_SOC_MAILBOX=y
+# CONFIG_SUN6I_MSGBOX is not set
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 
@@ -3951,7 +3961,9 @@ CONFIG_SUN50I_IOMMU=y
 #
 # Remoteproc drivers
 #
-# CONFIG_REMOTEPROC is not set
+CONFIG_REMOTEPROC=y
+CONFIG_REMOTEPROC_CDEV=y
+# CONFIG_RCAR_REMOTEPROC is not set
 # end of Remoteproc drivers
 
 #
@@ -3961,6 +3973,7 @@ CONFIG_RPMSG=y
 CONFIG_RPMSG_CHAR=y
 CONFIG_RPMSG_CTRL=y
 CONFIG_RPMSG_NS=y
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=y
 # end of Rpmsg drivers
 
@@ -4001,6 +4014,7 @@ CONFIG_RPMSG_VIRTIO=y
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 # end of Enable LiteX SoC Builder specific drivers
 
+CONFIG_POLARFIRE_SOC_SYS_CTRL=y
 # CONFIG_WPCM450_SOC is not set
 
 #