diff --git a/conf/linux_defconfig b/conf/linux_defconfig
index 5aa8253..ca5e069 100644
--- a/conf/linux_defconfig
+++ b/conf/linux_defconfig
@@ -4,7 +4,6 @@ CONFIG_HZ_100=y
 CONFIG_PCI=y
 CONFIG_PCI_DEBUG=y
 CONFIG_PCIE_XILINX=y
-CONFIG_PCI_DMA_32=y
 CONFIG_CROSS_COMPILE="riscv64-unknown-linux-gnu-"
 CONFIG_DEFAULT_HOSTNAME="ucbvax"
 # CONFIG_CROSS_MEMORY_ATTACH is not set
@@ -31,31 +30,60 @@ CONFIG_INET=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK_RO=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
 CONFIG_VIRTIO_BLK=y
+CONFIG_EEPROM_AT24=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_SIL24=y
 CONFIG_NETDEVICES=y
 CONFIG_VIRTIO_NET=y
+CONFIG_MACB=y
 CONFIG_E1000E=y
 CONFIG_R8169=y
+CONFIG_MICROSEMI_PHY=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_VT is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_SIFIVE=y
+CONFIG_SERIAL_SIFIVE_CONSOLE=y
+# CONFIG_HVC_RISCV_SBI is not set
 CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
+CONFIG_I2C=y
+CONFIG_I2C_OCORES=y
+CONFIG_SPI=y
+CONFIG_SPI_SIFIVE=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_SIFIVE=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_PMBUS=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_MMC=y
+CONFIG_MMC_SPI=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_PWM=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_VIRTIO_MMIO=y
+CONFIG_CLK_U54_PRCI=y
+CONFIG_CLK_GEMGXL_MGMT=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_PWM=y
+CONFIG_PWM_SIFIVE=y
+CONFIG_NVMEM_SIFIVE_U500_OTP=y
 CONFIG_EXT3_FS=y
 # CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_TMPFS=y
@@ -68,39 +96,3 @@ CONFIG_STRIP_ASM_SYMS=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_STACKTRACE=y
 # CONFIG_CRYPTO_HW is not set
-# Freedom-Unleash devices:
-CONFIG_NET_CADENCE=y
-CONFIG_MACB=y
-CONFIG_CLK_GEMGXL_MGMT=y
-CONFIG_CLK_U54_PRCI=y
-CONFIG_MICROSEMI_PHY=y
-CONFIG_I2C=y
-CONFIG_I2C_OCORES=y
-CONFIG_HWMON=y
-CONFIG_PMBUS=y
-CONFIG_EEPROM_AT24=y
-CONFIG_SPI=y
-CONFIG_SPI_SIFIVE=y
-CONFIG_MMC=y
-CONFIG_MMC_SPI=y
-CONFIG_MTD=y
-CONFIG_MTD_SPI_NOR=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_BLOCK_RO=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SIFIVE=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_GPIO_RESTART=y
-CONFIG_PWM=y
-CONFIG_PWM_SIFIVE=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_PWM=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_NETDEV=y
-CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SIFIVE_U500_OTP=y
diff --git a/linux b/linux
index 7501d87..2b0aa1d 160000
--- a/linux
+++ b/linux
@@ -1 +1 @@
-Subproject commit 7501d87f7ebf8337ab2efa3fe692612a3b845c6f
+Subproject commit 2b0aa1de45f63535f6d26757aa22b48515289302