diff --git a/boards/x86/quark_d2000_crb/Makefile.board b/boards/x86/quark_d2000_crb/Makefile.board
index a60842004ec..483cef40b05 100644
--- a/boards/x86/quark_d2000_crb/Makefile.board
+++ b/boards/x86/quark_d2000_crb/Makefile.board
@@ -1,7 +1,7 @@
 FLASH_SCRIPT = openocd.sh
 DEBUG_SCRIPT = openocd.sh
-OPENOCD_LOAD_CMD = "load_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}"
-OPENOCD_VERIFY_CMD = "verify_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}"
+OPENOCD_LOAD_CMD = "load_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
+OPENOCD_VERIFY_CMD = "verify_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}"
 
 export FLASH_SCRIPT OPENOCD_VERIFY_CMD OPENOCD_LOAD_CMD
 
diff --git a/boards/x86/quark_d2000_crb/quark_d2000_crb_defconfig b/boards/x86/quark_d2000_crb/quark_d2000_crb_defconfig
index eccdd1112e8..1114c28eec8 100644
--- a/boards/x86/quark_d2000_crb/quark_d2000_crb_defconfig
+++ b/boards/x86/quark_d2000_crb/quark_d2000_crb_defconfig
@@ -14,3 +14,4 @@ CONFIG_PRINTK=y
 CONFIG_ISR_STACK_SIZE=256
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_PINMUX=y
+CONFIG_HAS_DTS=y
diff --git a/dts/x86/Makefile b/dts/x86/Makefile
index a8c24977834..80599be6714 100644
--- a/dts/x86/Makefile
+++ b/dts/x86/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_HAS_DTS),y)
 dtb-$(CONFIG_SOC_QUARK_SE_C1000)	=	arduino_101.dts_compiled
-dtb-$(CONFIG_SOC_SERIES_QUARK_D2000)	=	quark_d2000_crb.dts_compiled
+dtb-$(CONFIG_BOARD_QUARK_D2000_CRB)	=	quark_d2000_crb.dts_compiled
 always	:= $(dtb-y)
 endif
diff --git a/dts/x86/quark_d2000_crb.dts b/dts/x86/quark_d2000_crb.dts
new file mode 100644
index 00000000000..8bb98337114
--- /dev/null
+++ b/dts/x86/quark_d2000_crb.dts
@@ -0,0 +1,29 @@
+/dts-v1/;
+
+#include "intel_quark_d2000.dtsi"
+
+/ {
+	model = "quark_d2000_crb";
+	compatible = "intel,quark-d2000-crb", "intel,quark-d2000";
+
+	aliases {
+		uart_0 = &uart0;
+		uart_1 = &uart1;
+	};
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+		zephyr,console = &uart1;
+	};
+};
+
+&uart0 {
+	status = "ok";
+	current-speed = <115200>;
+};
+
+&uart1 {
+	status = "ok";
+	current-speed = <115200>;
+};
diff --git a/dts/x86/quark_d2000_crb.fixup b/dts/x86/quark_d2000_crb.fixup
new file mode 100644
index 00000000000..d446604356a
--- /dev/null
+++ b/dts/x86/quark_d2000_crb.fixup
@@ -0,0 +1,9 @@
+#define CONFIG_UART_QMSI_0_BAUDRATE	INTEL_QMSI_UART_B0002000_CURRENT_SPEED
+#define CONFIG_UART_QMSI_0_NAME		INTEL_QMSI_UART_B0002000_LABEL
+
+#define CONFIG_UART_QMSI_1_BAUDRATE	INTEL_QMSI_UART_B0002400_CURRENT_SPEED
+#define CONFIG_UART_QMSI_1_NAME		INTEL_QMSI_UART_B0002400_LABEL
+
+#define CONFIG_PHYS_RAM_ADDR		CONFIG_SRAM_BASE_ADDRESS
+
+#define CONFIG_PHYS_LOAD_ADDR		CONFIG_FLASH_BASE_ADDRESS