diff --git a/top/e31x/Makefile b/top/e31x/Makefile
index f4319d8..437fc5d 100644
--- a/top/e31x/Makefile
+++ b/top/e31x/Makefile
@@ -57,6 +57,8 @@ ifeq ($(TARGET),bin)
 		cp $(BUILD_DIR)/e31x.bit $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).bit; \
 		echo "Exporting build report..."; \
 		cp $(BUILD_DIR)/build.rpt $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).rpt; \
+		echo "Exporting devicetree file..."; \
+		cp $(BUILD_DIR)/$(1).dts $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts; \
 		echo "Build DONE ... $(1)";
 else
 	post_build = @echo "Skipping bitfile export."
@@ -91,27 +93,26 @@ ifndef BUILD_DIR
 endif
 
 ##E310_SG1_IDLE:  Build USRP E3XX idle design (Speed Grade 1).
-E310_SG1_IDLE E3XX_idle: check-variables E310_SG1_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+E310_SG1_IDLE E3XX_idle: check-variables E310_SG1_IP $(BUILD_DIR)/E310_SG1_IDLE.dts
 	$(call vivado_build,E310_SG1,$(DEFS) E310_IDLE_IMAGE=1 E310_SG1=1)
-	$(call post_build,$@)
+	$(call post_build,E310_SG1_IDLE)
 
 ##E310_SG3_IDLE:  Build USRP E3XX idle design (Speed Grade 3).
-E310_SG3_IDLE E3XX_idle_sg3: check-variables E310_SG3_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+E310_SG3_IDLE E3XX_idle_sg3: check-variables E310_SG3_IP $(BUILD_DIR)/E310_SG3_IDLE.dts
 	$(call vivado_build,E310_SG3,$(DEFS) E310_IDLE_IMAGE=1 E310_SG3=1)
-	$(call post_build,$@)
+	$(call post_build,E310_SG3_IDLE)
 
 ##E310_SG1:       Build USRP E3XX (Speed Grade 1).
-E310_SG1 E310: check-variables E310_SG1_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+E310_SG1 E310: check-variables E310_SG1_IP $(BUILD_DIR)/E310_SG1.dts
 	$(call vivado_build,E310_SG1,$(DEFS) E310_SG1=1 $(if $(DRAM),ENABLE_DRAM=1,))
-	$(call post_build,$@)
+	$(call post_build,E310_SG1)
 
 ##E310_SG3:       Build USRP E3XX (Speed Grade 3).
-E310_SG3 E310_sg3: check-variables E310_SG3_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+E310_SG3 E310_sg3: check-variables E310_SG3_IP $(BUILD_DIR)/E310_SG3.dts
 	$(call vivado_build,E310_SG3,$(DEFS) E310_SG3=1 $(if $(DRAM),ENABLE_DRAM=1,))
-	$(call post_build,$@)
+	$(call post_build,E310_SG3)
 
-$(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts: dts/*.dts dts/*.dtsi
-	-mkdir -p $(BUILD_OUTPUT_DIR)
+$(BUILD_DIR)/%.dts: dts/%.dts dts/*.dtsi
 	${CC} -o $@ -E -I dts -nostdinc -undef -x assembler-with-cpp -D__DTS__ $<
 
 ##
diff --git a/top/e31x/dts/usrp_e310_sg1_fpga.dts b/top/e31x/dts/E310_SG1.dts
similarity index 100%
rename from top/e31x/dts/usrp_e310_sg1_fpga.dts
rename to top/e31x/dts/E310_SG1.dts
diff --git a/top/e31x/dts/usrp_e310_sg1_idle_fpga.dts b/top/e31x/dts/E310_SG1_IDLE.dts
similarity index 100%
rename from top/e31x/dts/usrp_e310_sg1_idle_fpga.dts
rename to top/e31x/dts/E310_SG1_IDLE.dts
diff --git a/top/e31x/dts/usrp_e310_sg3_fpga.dts b/top/e31x/dts/E310_SG3.dts
similarity index 100%
rename from top/e31x/dts/usrp_e310_sg3_fpga.dts
rename to top/e31x/dts/E310_SG3.dts
diff --git a/top/e31x/dts/usrp_e310_sg3_idle_fpga.dts b/top/e31x/dts/E310_SG3_IDLE.dts
similarity index 100%
rename from top/e31x/dts/usrp_e310_sg3_idle_fpga.dts
rename to top/e31x/dts/E310_SG3_IDLE.dts
diff --git a/top/e320/Makefile b/top/e320/Makefile
index 81f2dda..1ca6629 100644
--- a/top/e320/Makefile
+++ b/top/e320/Makefile
@@ -60,6 +60,8 @@ ifeq ($(TARGET),bin)
 		cp $(BUILD_DIR)/e320.bit $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).bit; \
 		echo "Exporting build report..."; \
 		cp $(BUILD_DIR)/build.rpt $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).rpt; \
+		echo "Exporting devicetree file..."; \
+		cp $(BUILD_DIR)/$(1).dts $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts; \
 		echo "Build DONE ... $(1)";
 else
 	post_build = @echo "Skipping bitfile export."
@@ -91,22 +93,21 @@ ifndef BUILD_DIR
 endif
 
 ##E320_1G:  1GigE on SFP+ Port.
-E320_1G: check-variables E320_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+E320_1G: check-variables E320_IP $(BUILD_DIR)/E320_1G.dts
 	$(call vivado_build,E320,$(1G_DEFS) E320=1)
 	$(call post_build,E320_1G)
 
 ##E320_XG:  10GigE on SFP+ Port.
-E320_XG: check-variables E320_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+E320_XG: check-variables E320_IP $(BUILD_DIR)/E320_XG.dts
 	$(call vivado_build,E320,$(XG_DEFS) E320=1)
 	$(call post_build,E320_XG)
 
 ##E320_AA:  Aurora on SFP+ Port.
-E320_AA: check-variables E320_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+E320_AA: check-variables E320_IP $(BUILD_DIR)/E320_AA.dts
 	$(call vivado_build,E320,$(AA_DEFS) E320=1)
 	$(call post_build,E320_AA)
 
-$(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts: dts/*.dts dts/*.dtsi
-	-mkdir -p $(BUILD_OUTPUT_DIR)
+$(BUILD_DIR)/%.dts: dts/%.dts dts/*.dtsi
 	${CC} -o $@ -E -I dts -nostdinc -undef -x assembler-with-cpp -D__DTS__ $<
 
 ##
diff --git a/top/e320/dts/usrp_e320_fpga_1G.dts b/top/e320/dts/E320_1G.dts
similarity index 100%
rename from top/e320/dts/usrp_e320_fpga_1G.dts
rename to top/e320/dts/E320_1G.dts
diff --git a/top/e320/dts/usrp_e320_fpga_AA.dts b/top/e320/dts/E320_AA.dts
similarity index 100%
rename from top/e320/dts/usrp_e320_fpga_AA.dts
rename to top/e320/dts/E320_AA.dts
diff --git a/top/e320/dts/usrp_e320_fpga_XG.dts b/top/e320/dts/E320_XG.dts
similarity index 100%
rename from top/e320/dts/usrp_e320_fpga_XG.dts
rename to top/e320/dts/E320_XG.dts
diff --git a/top/n3xx/Makefile b/top/n3xx/Makefile
index 00c6e21..4d9e9d7 100644
--- a/top/n3xx/Makefile
+++ b/top/n3xx/Makefile
@@ -86,6 +86,8 @@ ifeq ($(TARGET),bin)
 		cp $(BUILD_DIR)/n3xx.bit $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).bit; \
 		echo "Exporting build report..."; \
 		cp $(BUILD_DIR)/build.rpt $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).rpt; \
+		echo "Exporting devicetree file..."; \
+		cp $(BUILD_DIR)/$(1)_$(2).dts $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts; \
 		echo "Build DONE ... $(1)_$(2)";
 else
 	post_build = @echo "Skipping bitfile export."
@@ -122,97 +124,96 @@ ifndef BUILD_DIR
 endif
 
 ##N310_WX:  1GigE White Rabbit on SFP+ Port0, 10Gig on SFP+ Port1.
-N310_WX: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N310_WX: check-variables N3X0_IP $(BUILD_DIR)/N310_WX.dts
 	$(call vivado_build,N310,$(WX_DEFS) N310=1,$(N310_DEFAULTS))
 	$(call post_build,N310,WX)
 
 ##N310_HG:  1GigE on SFP+ Port0, 10Gig on SFP+ Port1.
-N310_HG: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N310_HG: check-variables N3X0_IP $(BUILD_DIR)/N310_HG.dts
 	$(call vivado_build,N310,$(HG_DEFS) N310=1,$(N310_DEFAULTS))
 	$(call post_build,N310,HG)
 
 ##N310_XG:  10GigE on SFP+ Port0, 10Gig on SFP+ Port1.
-N310_XG: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N310_XG: check-variables N3X0_IP $(BUILD_DIR)/N310_XG.dts
 	$(call vivado_build,N310,$(XG_DEFS) N310=1,$(N310_DEFAULTS))
 	$(call post_build,N310,XG)
 
 ##N310_HA:  1Gig on SFP+ Port0, Aurora on SFP+ Port1.
-N310_HA: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N310_HA: check-variables N3X0_IP $(BUILD_DIR)/N310_HA.dts
 	$(call vivado_build,N310,$(HA_DEFS) N310=1,$(N310_DEFAULTS))
 	$(call post_build,N310,HA)
 
 ##N310_XA:  10Gig on SFP+ Port0, Aurora on SFP+ Port1.
-N310_XA: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N310_XA: check-variables N3X0_IP $(BUILD_DIR)/N310_XA.dts
 	$(call vivado_build,N310,$(XA_DEFS) N310=1,$(N310_DEFAULTS))
 	$(call post_build,N310,XA)
 
 ##N310_AA:  Aurora on SFP+ Port0, Aurora on SFP+ Port1.
-N310_AA: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N310_AA: check-variables N3X0_IP $(BUILD_DIR)/N310_AA.dts
 	$(call vivado_build,N310,$(AA_DEFS) N310=1,$(N310AA_DEFAULTS))
 	$(call post_build,N310,AA)
 
 ##N300_WX:  1GigE White Rabbit on SFP+ Port0, 10Gig on SFP+ Port1.
-N300_WX: check-variables N300_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N300_WX: check-variables N300_IP $(BUILD_DIR)/N300_WX.dts
 	$(call vivado_build,N300,$(WX_DEFS) N300=1,$(N300_DEFAULTS))
 	$(call post_build,N300,WX)
 
 ##N300_HG:  1GigE on SFP+ Port0, 10Gig on SFP+ Port1.
-N300_HG: check-variables N300_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N300_HG: check-variables N300_IP $(BUILD_DIR)/N300_HG.dts
 	$(call vivado_build,N300,$(HG_DEFS) N300=1,$(N300_DEFAULTS))
 	$(call post_build,N300,HG)
 
 ##N300_XG:  10GigE on SFP+ Port0, 10Gig on SFP+ Port1.
-N300_XG: check-variables N300_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N300_XG: check-variables N300_IP $(BUILD_DIR)/N300_XG.dts
 	$(call vivado_build,N300,$(XG_DEFS) N300=1,$(N300_DEFAULTS))
 	$(call post_build,N300,XG)
 
 ##N300_HA:  1Gig on SFP+ Port0, Aurora on SFP+ Port1.
-N300_HA: check-variables N300_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N300_HA: check-variables N300_IP $(BUILD_DIR)/N300_HA.dts
 	$(call vivado_build,N300,$(HA_DEFS) N300=1,$(N300_DEFAULTS))
 	$(call post_build,N300,HA)
 
 ##N300_XA:  10Gig on SFP+ Port0, Aurora on SFP+ Port1.
-N300_XA: check-variables N300_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N300_XA: check-variables N300_IP $(BUILD_DIR)/N300_XA.dts
 	$(call vivado_build,N300,$(XA_DEFS) N300=1,$(N300_DEFAULTS))
 	$(call post_build,N300,XA)
 
 ##N300_AA:  Aurora on SFP+ Port0, Aurora on SFP+ Port1.
-N300_AA: check-variables N300_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N300_AA: check-variables N300_IP $(BUILD_DIR)/N300_AA.dts
 	$(call vivado_build,N300,$(AA_DEFS) N300=1,$(N300AA_DEFAULTS))
 	$(call post_build,N300,AA)
 
 ##N320_WX:  1GigE White Rabbit on SFP+ Port0, 10Gig on SFP+ Port1.
-N320_WX: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N320_WX: check-variables N3X0_IP $(BUILD_DIR)/N320_WX.dts
 	$(call vivado_build,N320,$(WX_DEFS) N320=1,$(N320_DEFAULTS))
 	$(call post_build,N320,WX)
 
 ##N320_HG:  1GigE on SFP+ Port0, 10Gig on SFP+ Port1.
-N320_HG: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N320_HG: check-variables N3X0_IP $(BUILD_DIR)/N320_HG.dts
 	$(call vivado_build,N320,$(HG_DEFS) N320=1,$(N320_DEFAULTS))
 	$(call post_build,N320,HG)
 
 ##N320_XG:  10GigE on SFP+ Port0, 10Gig on SFP+ Port1.
-N320_XG: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N320_XG: check-variables N3X0_IP $(BUILD_DIR)/N320_XG.dts
 	$(call vivado_build,N320,$(XG_DEFS) N320=1,$(N320_DEFAULTS))
 	$(call post_build,N320,XG)
 
 ##N320_XQ:  WR on SFP+ Port0, 10Gig on QSFP+ Port0,1.
-N320_XQ: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N320_XQ: check-variables N3X0_IP $(BUILD_DIR)/N320_XQ.dts
 	$(call vivado_build,N320,$(XQ_DEFS) N320=1,$(N320_DEFAULTS))
 	$(call post_build,N320,XQ)
 
 ##N320_AQ:  10Gig on SFP+ Port0,1 Aurora on QSFP+ Port0,1,2,3.
-N320_AQ: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N320_AQ: check-variables N3X0_IP $(BUILD_DIR)/N320_AQ.dts
 	$(call vivado_build,N320,$(AQ_DEFS) N320=1,$(N320_DEFAULTS))
 	$(call post_build,N320,AQ)
 
 ##N320_AA:  Aurora on SFP+ Port0, Aurora on SFP+ Port1.
-N320_AA: check-variables N3X0_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+N320_AA: check-variables N3X0_IP $(BUILD_DIR)/N320_AA.dts
 	$(call vivado_build,N320,$(AA_DEFS) N320=1,$(N320AA_DEFAULTS))
 	$(call post_build,N320,AA)
 
-$(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts: dts/*.dts dts/*.dtsi
-	-mkdir -p $(BUILD_OUTPUT_DIR)
+$(BUILD_DIR)/%.dts: dts/%.dts dts/*.dtsi
 	${CC} -o $@ -E -I dts -nostdinc -undef -x assembler-with-cpp -D__DTS__ $<
 
 ##
diff --git a/top/n3xx/dts/usrp_n300_fpga_AA.dts b/top/n3xx/dts/N300_AA.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n300_fpga_AA.dts
rename to top/n3xx/dts/N300_AA.dts
diff --git a/top/n3xx/dts/usrp_n300_fpga_HA.dts b/top/n3xx/dts/N300_HA.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n300_fpga_HA.dts
rename to top/n3xx/dts/N300_HA.dts
diff --git a/top/n3xx/dts/usrp_n300_fpga_HG.dts b/top/n3xx/dts/N300_HG.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n300_fpga_HG.dts
rename to top/n3xx/dts/N300_HG.dts
diff --git a/top/n3xx/dts/usrp_n300_fpga_WX.dts b/top/n3xx/dts/N300_WX.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n300_fpga_WX.dts
rename to top/n3xx/dts/N300_WX.dts
diff --git a/top/n3xx/dts/usrp_n300_fpga_XA.dts b/top/n3xx/dts/N300_XA.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n300_fpga_XA.dts
rename to top/n3xx/dts/N300_XA.dts
diff --git a/top/n3xx/dts/usrp_n300_fpga_XG.dts b/top/n3xx/dts/N300_XG.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n300_fpga_XG.dts
rename to top/n3xx/dts/N300_XG.dts
diff --git a/top/n3xx/dts/usrp_n310_fpga_AA.dts b/top/n3xx/dts/N310_AA.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n310_fpga_AA.dts
rename to top/n3xx/dts/N310_AA.dts
diff --git a/top/n3xx/dts/usrp_n310_fpga_HA.dts b/top/n3xx/dts/N310_HA.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n310_fpga_HA.dts
rename to top/n3xx/dts/N310_HA.dts
diff --git a/top/n3xx/dts/usrp_n310_fpga_HG.dts b/top/n3xx/dts/N310_HG.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n310_fpga_HG.dts
rename to top/n3xx/dts/N310_HG.dts
diff --git a/top/n3xx/dts/usrp_n310_fpga_WX.dts b/top/n3xx/dts/N310_WX.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n310_fpga_WX.dts
rename to top/n3xx/dts/N310_WX.dts
diff --git a/top/n3xx/dts/usrp_n310_fpga_XA.dts b/top/n3xx/dts/N310_XA.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n310_fpga_XA.dts
rename to top/n3xx/dts/N310_XA.dts
diff --git a/top/n3xx/dts/usrp_n310_fpga_XG.dts b/top/n3xx/dts/N310_XG.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n310_fpga_XG.dts
rename to top/n3xx/dts/N310_XG.dts
diff --git a/top/n3xx/dts/usrp_n320_fpga_AA.dts b/top/n3xx/dts/N320_AA.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n320_fpga_AA.dts
rename to top/n3xx/dts/N320_AA.dts
diff --git a/top/n3xx/dts/usrp_n320_fpga_AQ.dts b/top/n3xx/dts/N320_AQ.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n320_fpga_AQ.dts
rename to top/n3xx/dts/N320_AQ.dts
diff --git a/top/n3xx/dts/usrp_n320_fpga_HG.dts b/top/n3xx/dts/N320_HG.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n320_fpga_HG.dts
rename to top/n3xx/dts/N320_HG.dts
diff --git a/top/n3xx/dts/usrp_n320_fpga_WX.dts b/top/n3xx/dts/N320_WX.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n320_fpga_WX.dts
rename to top/n3xx/dts/N320_WX.dts
diff --git a/top/n3xx/dts/usrp_n320_fpga_XG.dts b/top/n3xx/dts/N320_XG.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n320_fpga_XG.dts
rename to top/n3xx/dts/N320_XG.dts
diff --git a/top/n3xx/dts/usrp_n320_fpga_XQ.dts b/top/n3xx/dts/N320_XQ.dts
similarity index 100%
rename from top/n3xx/dts/usrp_n320_fpga_XQ.dts
rename to top/n3xx/dts/N320_XQ.dts
diff --git a/top/x400/Makefile b/top/x400/Makefile
index 10c2412..72be08f 100644
--- a/top/x400/Makefile
+++ b/top/x400/Makefile
@@ -75,6 +75,8 @@ ifeq ($(TARGET),bin)
 		cp $(BUILD_DIR)/x4xx.bit $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).bit; \
 		echo "Exporting build report..."; \
 		cp $(BUILD_DIR)/build.rpt $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).rpt; \
+		echo "Exporting devicetree file..."; \
+		cp $(BUILD_DIR)/$(1).dts $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts; \
 		echo "Build DONE ... $(IMAGE_CORE_NAME)";
 else
 	post_build = @echo "Skipping bitfile export."
@@ -112,10 +114,10 @@ ifndef BUILD_DIR
 	$(error BUILD_DIR is not set! Use rfnoc_image_builder to create valid make commands)
 endif
 
-X410: check-variables X410_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+X410: check-variables X410_IP $(BUILD_DIR)/X410.dts
 	$(call vivado_build,X410,$(DEFS) X410=1)
 	$(call post_build,X410)
-X440: check-variables X440_IP $(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts
+X440: check-variables X440_IP $(BUILD_DIR)/X440.dts
 	$(call vivado_build,X440,$(DEFS) X440=1)
 	$(call post_build,X440)
 
@@ -132,26 +134,25 @@ X410_IP:      ##Build X410 IP only. Use the -j option to build multiple IP block
 X440_IP:      ##Build X440 IP only. Use the -j option to build multiple IP blocks simultaneously.
 	+$(call vivado_ip,X440,$(DEFS) X440=1)
 
-ifeq ($(MAKECMDGOALS),X410)
-$(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts: dts/*.dts dts/*.dtsi $(BUILD_DIR)/device_tree.dts
-	-mkdir -p $(BUILD_OUTPUT_DIR)
+dts/x410-version-info.dtsi: regmap/x410/versioning_regs_regmap_utils.vh
 	tools/parse_versions_for_dts.py \
-		--input regmap/x410/versioning_regs_regmap_utils.vh \
-		--output dts/x410-version-info.dtsi \
+		--input $< --output $@ \
 		--components fpga,cpld_ifc,db_gpio_ifc,rf_core_100m,rf_core_400m
-	${CC} -o $@ -C -E -I dts -nostdinc -undef -x assembler-with-cpp -D__DTS__ \
-		$(BUILD_DIR)/device_tree.dts
-endif
-ifeq ($(MAKECMDGOALS),X440)
-$(BUILD_OUTPUT_DIR)/$(IMAGE_CORE_NAME).dts: dts/*.dts dts/*.dtsi $(BUILD_DIR)/device_tree.dts
-	-mkdir -p $(BUILD_OUTPUT_DIR)
+
+dts/x440-version-info.dtsi: regmap/x440/versioning_regs_regmap_utils.vh
 	tools/parse_versions_for_dts.py \
-		--input regmap/x440/versioning_regs_regmap_utils.vh \
-		--output dts/x440-version-info.dtsi \
+		--input $< --output $@ \
 		--components fpga,cpld_ifc,db_gpio_ifc,rf_core_full
-	${CC} -o $@ -C -E -I dts -nostdinc -undef -x assembler-with-cpp -D__DTS__ \
-		$(BUILD_DIR)/device_tree.dts
-endif
+
+# The device tree source file $(BUILD_DIR)/device_tree.dts is generated by the
+# RFNoC image builder.
+$(BUILD_DIR)/X410.dts: $(BUILD_DIR)/device_tree.dts dts/x410-version-info.dtsi dts/*.dtsi
+	${CC} -o $@ -C -E -I dts -nostdinc -undef -x assembler-with-cpp -D__DTS__ $<
+
+# The device tree source file $(BUILD_DIR)/device_tree.dts is generated by the
+# RFNoC image builder.
+$(BUILD_DIR)/X440.dts: $(BUILD_DIR)/device_tree.dts dts/x440-version-info.dtsi dts/*.dtsi
+	${CC} -o $@ -C -E -I dts -nostdinc -undef -x assembler-with-cpp -D__DTS__ $<
 
 clean:        ##Clean up all target build outputs.
 	@echo "Cleaning targets..."