From 5cbd981c3e9503f656eee33af77025b85824f9f3 Mon Sep 17 00:00:00 2001
From: Joerg Hofrichter <joerg.hofrichter@ni.com>
Date: Thu, 21 Nov 2024 15:51:49 +0100
Subject: [PATCH] fpga: x4xx: assemble x410/x440-version-info.dtsi in BUILD_DIR

Original-commit: 0a635d0d11b52b300474cb2871f54a1a5458647c
---
 top/x400/.gitignore | 1 -
 top/x400/Makefile   | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/top/x400/.gitignore b/top/x400/.gitignore
index d96446d..21b2f49 100644
--- a/top/x400/.gitignore
+++ b/top/x400/.gitignore
@@ -4,4 +4,3 @@ build-*
 *.jou
 vivado*.str
 ip/*/sim/
-dts/x4*0-version-info.dtsi
diff --git a/top/x400/Makefile b/top/x400/Makefile
index 72be08f..6e9f6b1 100644
--- a/top/x400/Makefile
+++ b/top/x400/Makefile
@@ -134,24 +134,24 @@ 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)
 
-dts/x410-version-info.dtsi: regmap/x410/versioning_regs_regmap_utils.vh
+$(BUILD_DIR)/x410-version-info.dtsi: regmap/x410/versioning_regs_regmap_utils.vh
 	tools/parse_versions_for_dts.py \
 		--input $< --output $@ \
 		--components fpga,cpld_ifc,db_gpio_ifc,rf_core_100m,rf_core_400m
 
-dts/x440-version-info.dtsi: regmap/x440/versioning_regs_regmap_utils.vh
+$(BUILD_DIR)/x440-version-info.dtsi: regmap/x440/versioning_regs_regmap_utils.vh
 	tools/parse_versions_for_dts.py \
 		--input $< --output $@ \
 		--components fpga,cpld_ifc,db_gpio_ifc,rf_core_full
 
 # 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
+$(BUILD_DIR)/X410.dts: $(BUILD_DIR)/device_tree.dts $(BUILD_DIR)/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
+$(BUILD_DIR)/X440.dts: $(BUILD_DIR)/device_tree.dts $(BUILD_DIR)/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.