Closed JuanEsco063 closed 3 years ago
This PR contains generated files, which should not be pushed into Git. An update of the PR is needed to limit it to source files only.
What is the easiest way to remove these generated files? (Also, just for my own tracking: which are the generated files?)
The list of generated files is quiet long. I believe what happened is that you either deleted or moved the .gitignore
file, so all generated files in the socs/<design>
folder have been added and committed.
As a reference, check the ZCU106 or ZCU102 design folder after a make distclean
or a fresh clone. Those are the files that should be in the design folder. Everything else is generated and should not be committed.
xilinx-zcu102-xczu9eg$ ls
grlib_config.in Makefile systest.c testbench.vhd top.vhd zynqmp_top_wrapper.vhd
This confirms you deleted the main .gitignore
. which should be restored.
The best way to fix this is a rebase, because if you just push a new commit, the history will still hold the generated files in the previous commit. You may use git reset
to restore the history (not the files) to a point before your changes, followed by new commits, which fix the problems. Finally, you can git push -f
to update the PR.
Alternatively, you may use git rebase -i
to interactively modify every commit. This second mode can save some time, if you know how to use it, but it can get confusing if you're not familiar with rebasing in git.
I have 0 experience rebasing so let me try the first option
This modifies top.vhd and zynqmp_top_wrapper.vhd for the ZCU102.
I have also modified the ESP link app to work on the ZCU
Note the change in the Zynq device tree to add the udmabuf entry is not tracked and thus not reflected here. The entry is:
reserved-memory {
address-cells = <2>;
size-cells = <2>;
ranges; esp_buf0: esp_buf@40000000 { compatible = "shared-dma-pool"; reusable; dma-coherent; reg = <0x0 0x40000000 0x0 0x40000000>; label = "esp_buf0"; }; }; udmabuf_esp@0 { compatible = "ikwzm,u-dma-buf"; device-name = "udmabuf_esp0"; dma-coherent; size = <0x40000000>; // 1GB memory-region = <&esp_buf0>; };
At the end of .../esp/socs/xilinx-zcu102-xczu9eg/zynq/zcu102/sdk/dt/system.dts.tmp