Merge pull request ipbus#159 from ipbus/task/directory-reorganisation

Merge utils directories and rename freq_ctr_div file
jhegeman · Feb 3, 2020 · 4914f4b · 4914f4b
2 parents b871c80 + f86003a
commit 4914f4b
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 7 deletions.
diff --git a/...laves/firmware/hdl/ipbus_freq_ctr_div.vhd → ...pbus_slaves/firmware/hdl/freq_ctr_div.vhd b/...laves/firmware/hdl/ipbus_freq_ctr_div.vhd → ...pbus_slaves/firmware/hdl/freq_ctr_div.vhd
diff --git a/...s/addr_table/ipbus_example_xilinx_usp.xml → ...l/addr_table/ipbus_example_xilinx_usp.xml b/...s/addr_table/ipbus_example_xilinx_usp.xml → ...l/addr_table/ipbus_example_xilinx_usp.xml
diff --git a/...ls/addr_table/ipbus_example_xilinx_x7.xml → ...il/addr_table/ipbus_example_xilinx_x7.xml b/...ls/addr_table/ipbus_example_xilinx_x7.xml → ...il/addr_table/ipbus_example_xilinx_x7.xml
diff --git a/...firmware/cfg/ipbus_example_xilinx_usp.dep → ...firmware/cfg/ipbus_example_xilinx_usp.dep b/...firmware/cfg/ipbus_example_xilinx_usp.dep → ...firmware/cfg/ipbus_example_xilinx_usp.dep
@@ -27,6 +27,6 @@
 src payload_xilinx_usp.vhd
 src ipbus_decode_ipbus_example_xilinx_usp.vhd
 src -c components/ipbus_slaves ipbus_reg_types.vhd
-include -c components/ipbus_util ipbus_sysmon_usp_int_ref.dep
-include -c components/ipbus_util ipbus_device_dna_us_usp.dep
-addrtab -t -c components/utils ipbus_example_xilinx_usp.xml
+include ipbus_sysmon_usp_int_ref.dep
+include ipbus_device_dna_us_usp.dep
+addrtab -t ipbus_example_xilinx_usp.xml
diff --git a/.../firmware/cfg/ipbus_example_xilinx_x7.dep → .../firmware/cfg/ipbus_example_xilinx_x7.dep b/.../firmware/cfg/ipbus_example_xilinx_x7.dep → .../firmware/cfg/ipbus_example_xilinx_x7.dep
@@ -25,5 +25,5 @@
 
 
 src payload_xilinx_x7.vhd
-include -c components/ipbus_util ipbus_sysmon_x7.dep
-addrtab -c components/utils ipbus_example_xilinx_x7.xml
+include ipbus_sysmon_x7.dep
+addrtab -t ipbus_example_xilinx_x7.xml
diff --git a/...ipbus_decode_ipbus_example_xilinx_usp.vhd → ...ipbus_decode_ipbus_example_xilinx_usp.vhd b/...ipbus_decode_ipbus_example_xilinx_usp.vhd → ...ipbus_decode_ipbus_example_xilinx_usp.vhd
diff --git a/...utils/firmware/hdl/payload_xilinx_usp.vhd → ..._util/firmware/hdl/payload_xilinx_usp.vhd b/...utils/firmware/hdl/payload_xilinx_usp.vhd → ..._util/firmware/hdl/payload_xilinx_usp.vhd
diff --git a/.../utils/firmware/hdl/payload_xilinx_x7.vhd → ...s_util/firmware/hdl/payload_xilinx_x7.vhd b/.../utils/firmware/hdl/payload_xilinx_x7.vhd → ...s_util/firmware/hdl/payload_xilinx_x7.vhd
diff --git a/projects/xilinx/firmware/cfg/top_kc705_gmii.dep b/projects/xilinx/firmware/cfg/top_kc705_gmii.dep
@@ -25,4 +25,4 @@
 
 
 include -c boards/kc705/gmii/synth kc705_gmii.dep
-include -c components/utils ipbus_example_xilinx_x7.dep
+include -c components/ipbus_util ipbus_example_xilinx_x7.dep
diff --git a/projects/xilinx/firmware/cfg/top_vcu118_sgmii.dep b/projects/xilinx/firmware/cfg/top_vcu118_sgmii.dep
@@ -25,4 +25,4 @@
 
 
 include -c boards/vcu118/sgmii/synth top.dep
-include -c components/utils ipbus_example_xilinx_usp.dep
+include -c components/ipbus_util ipbus_example_xilinx_usp.dep