diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment
index 6d65cb7bb8..28bb373ef2 100644
--- a/board/radxa/rock5b/linux.fragment
+++ b/board/radxa/rock5b/linux.fragment
@@ -1,4 +1,5 @@
 CONFIG_R8169=y
+# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set
 # Disable Rockchip specific WiFi drivers, as the kernel
 # code cannot be build with GCC 12 due to several Werrors
 # CONFIG_WL_ROCKCHIP is not set
diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt
index f02f3d380e..b3eb06851a 100644
--- a/board/radxa/rock5b/readme.txt
+++ b/board/radxa/rock5b/readme.txt
@@ -20,6 +20,7 @@ output/images
 ├── rk3588-rock-5b.dtb
 ├── rk3588_bl31_v1.40.elf
 ├── rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin
+├── rock5b.dts
 ├── rock5b.its
 ├── rootfs.ext2
 ├── rootfs.ext4
@@ -64,6 +65,8 @@ https://forum.radxa.com/c/rock5
 Issues:
 =======
 
+WiFi
+----
 The custom Radxa kernel provides custom code to support WiFi. However,
 that code does not compile with GCC 12, which is the current default
 version in buildroot. Hence, the WiFi kernel drivers are disabled, until
@@ -80,3 +83,20 @@ BR2_GCC_VERSION_11_X=y
 board/radxa/rock5b/linux.fragment:
 
 # CONFIG_WL_ROCKCHIP is not set
+
+Rockchip FIQ Debugger
+---------------------
+The custom kernel used for this board features an FIQ debugger, which
+can be activated by typing "fiq" on the serial interface. As this can be
+annoying if a user wants to type these charakters and it is not needed
+for most users, this board support disables the FIQ debugger by default.
+To re-enable the FIQ debugger follow the steps:
+
+1. In board/radxa/rock5b/rock5b.dts set the status property of the
+fiq_debugger node to "okay" and set the status property of the uart2
+node to "disabled"
+
+2. Re-enable the fiq debugger module  by removing the following line
+from board/radxa/rock5b/linux.fragment:
+
+# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set
diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts
new file mode 100644
index 0000000000..71a4e42b5e
--- /dev/null
+++ b/board/radxa/rock5b/rock5b.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+
+#include "rockchip/rk3588-rock-5b.dts"
+
+&fiq_debugger {
+	status = "disabled";
+};
+
+&uart2 {
+	pinctrl-0 = <&uart2m0_xfer>;
+	status = "okay";
+};
diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its
index d73659a56e..9ce235d041 100644
--- a/board/radxa/rock5b/rock5b.its
+++ b/board/radxa/rock5b/rock5b.its
@@ -20,7 +20,7 @@
 		};
 		fdt {
 			description = "Device Tree";
-			data = /incbin/("rk3588-rock-5b.dtb");
+			data = /incbin/("rock5b.dtb");
 			type = "flat_dt";
 			arch = "arm64";
 			compression = "none";
diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig
index 2e72b386b1..7175aa66bf 100644
--- a/configs/rock5b_defconfig
+++ b/configs/rock5b_defconfig
@@ -14,7 +14,8 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b"
 BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b"
+# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts"
 BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment"
 BR2_TARGET_ROOTFS_EXT2=y