diff --git a/Makefile b/Makefile
index bd9c7c072..824f562c2 100755
--- a/Makefile
+++ b/Makefile
@@ -406,14 +406,14 @@ tftp: $(FIRMWARE_FILEBASE).bin
 	
 ifeq ($(FIRMWARE),linux)
 	cp $(FIRMWARE_FILEBASE).bin $(TFTPD_DIR)/Image
+	cp $(FIRMWARE_DIR)/$(ROOTFS_FILE) $(TFTPD_DIR)/rootfs.cpio
 	cp $(FIRMWARE_DIR)/boot.json $(TFTPD_DIR)
 ifeq ($(CPU),vexriscv)
 	cp $(FIRMWARE_DIR)/rv32.dtb $(TFTPD_DIR)
 	cp $(TARGET_BUILD_DIR)/emulator/emulator.bin $(TFTPD_DIR)
-	cp $(FIRMWARE_DIR)/$(ROOTFS_FILE) $(TFTPD_DIR)/rootfs.cpio
 endif
 ifeq ($(CPU),mor1kx)
-        # ATM nothing, DTB in the future
+	cp $(FIRMWARE_DIR)/mor1kx.dtb $(TFTPD_DIR)
 endif
 else
 	cp $(FIRMWARE_FILEBASE).bin $(TFTPD_DIR)/boot.bin
diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh
index 7cd173e66..826bf1f20 100755
--- a/scripts/build-linux.sh
+++ b/scripts/build-linux.sh
@@ -64,7 +64,6 @@ if [ ${CPU} = mor1kx ]; then
 	DTB=mor1kx.dtb
 	ROOTFS_MD5="c9ef89b45b0d2c34d14978a21f2863bd"
 	DTB_MD5="0271bc8f63f2d928dc9536ac31a2c6b9"
-	LINUX_BRANCH=${LINUX_BRANCH:-litex_buildenv-mor1kx}
 elif [ ${CPU} = vexriscv ]; then
 	export ARCH=riscv
 	ROOTFS=riscv32-rootfs.cpio
@@ -227,7 +226,11 @@ LLV_SRC="$TOP_DIR/third_party/linux-on-litex-vexriscv"
 
         	cat << EOF > $TARGET_LINUX_BUILD_DIR/boot.json
 {
-    "Image":        "0x00000000"
+    "mor1kx.dtb":   "0x01000000",
+    "Image":        "0x00000000",
+    "bootargs": {
+        "r1":       "0x01000000"
+    }
 }
 EOF
 	elif [ ${CPU} = vexriscv ]; then
diff --git a/third_party/litedram b/third_party/litedram
index edd5e0ec7..f51052f8b 160000
--- a/third_party/litedram
+++ b/third_party/litedram
@@ -1 +1 @@
-Subproject commit edd5e0ec7843f9b3f36669124859ce8e9ccc1618
+Subproject commit f51052f8b737156d1e257eff7cd3259cb56d0d1b
diff --git a/third_party/liteeth b/third_party/liteeth
index dbe15f17f..792013a17 160000
--- a/third_party/liteeth
+++ b/third_party/liteeth
@@ -1 +1 @@
-Subproject commit dbe15f17fcf96b8a4671465a4df93381ca11b818
+Subproject commit 792013a1756ea50608726ee86989ec38cfc35a8b
diff --git a/third_party/litepcie b/third_party/litepcie
index 56686796a..0b6a4bb6e 160000
--- a/third_party/litepcie
+++ b/third_party/litepcie
@@ -1 +1 @@
-Subproject commit 56686796a1a26ea647dc25d0dadf763078c42830
+Subproject commit 0b6a4bb6e742fd4de38d7ca3674f91acc5985b35
diff --git a/third_party/litex b/third_party/litex
index e76464167..9fc488bdf 160000
--- a/third_party/litex
+++ b/third_party/litex
@@ -1 +1 @@
-Subproject commit e76464167b14c367840cad42bed5acd3bf24bad0
+Subproject commit 9fc488bdf670c69193a6fa14e5f0c218db8b0ffe
diff --git a/third_party/litex-boards b/third_party/litex-boards
index 1f98bc5b9..2ce24df76 160000
--- a/third_party/litex-boards
+++ b/third_party/litex-boards
@@ -1 +1 @@
-Subproject commit 1f98bc5b940a3c19a91fc41263200400afeee212
+Subproject commit 2ce24df76dda20cff9ac40c334300d5dc1311d60
diff --git a/third_party/migen b/third_party/migen
index fa7bed286..7bc4eb138 160000
--- a/third_party/migen
+++ b/third_party/migen
@@ -1 +1 @@
-Subproject commit fa7bed28673fbbf463e590ec5d77b61914e15ba2
+Subproject commit 7bc4eb1387b39159a74c1dbd1b820728e0bfbbaa