diff --git a/iob_soc_opencryptolinux.py b/iob_soc_opencryptolinux.py
index a99a3dc8..601606b9 100755
--- a/iob_soc_opencryptolinux.py
+++ b/iob_soc_opencryptolinux.py
@@ -153,16 +153,16 @@ def _post_setup(cls):
         )
         # Set custom ethernet CONSOLE_CMD
         contents.append(
-            """
+            f"""
 ### Launch minicom if running Linux
-ifeq ($(shell grep -o rootfs.cpio.gz ../iob_soc_opencryptolinux_mem.config),rootfs.cpio.gz)
+ifeq ($(shell grep -o rootfs.cpio.gz ../{cls.name}_mem.config),rootfs.cpio.gz)
 ifneq ($(wildcard minicom_linux_script.txt),)
 SCRIPT_STR:=-S minicom_linux_script.txt
 # Set TERM variable to linux-c-nc (needed to run in non-interactive mode https://stackoverflow.com/a/49077622)
 TERM_STR:=TERM=linux-c-nc
+endif
 # Set a capture file and print its contents (to work around minicom clearing the screen)
 LOG_STR:=-C minicom_out.log || cat minicom_out.log
-endif
 # Set HOME to current (fpga) directory (needed because minicom always reads the '.minirc.*' config file from HOME)
 HOME_STR:=HOME=$$(pwd)
 # Always exit with code 0 (since linux is terminated with CTRL-C)
diff --git a/software/sw_build.mk b/software/sw_build.mk
index 28f5191a..26f6f8c1 100644
--- a/software/sw_build.mk
+++ b/software/sw_build.mk
@@ -46,12 +46,12 @@ iob_soc_opencryptolinux_firmware.bin: ../../software/iob_soc_opencryptolinux_fir
 Image rootfs.cpio.gz:
 	cp $(OS_DIR)/$@ .
 
-ifeq ($(IS_FPGA),1)
 fw_jump.bin iob_soc.dtb:
-	cp $(FPGA_TOOL)/$(BOARD)/$@ .
+	if [ "$(FPGA_TOOL)" != "" ]; then\
+		cp $(FPGA_TOOL)/$(BOARD)/$@ .;\
+	fi
 # Set targets as PHONY to ensure that they are copied even if $(BOARD) is changed
 .PHONY: fw_jump.bin iob_soc.dtb
-endif
 
 ../../software/%.bin:
 	make -C ../../ fw-build
diff --git a/submodules/IOBSOC b/submodules/IOBSOC
index 0bbf6176..98fa6513 160000
--- a/submodules/IOBSOC
+++ b/submodules/IOBSOC
@@ -1 +1 @@
-Subproject commit 0bbf6176a3e5cbee6f3696c9589f96e56568c4a5
+Subproject commit 98fa65138c29d45bee067969c4abe0bab50092c0
diff --git a/submodules/OS b/submodules/OS
index c48e3fad..0286e42a 160000
--- a/submodules/OS
+++ b/submodules/OS
@@ -1 +1 @@
-Subproject commit c48e3fad10a576613c85ec64eb26e59338f60fef
+Subproject commit 0286e42aba02019125903478cceaaa339a372375