bitstream file renamed

diff --git a/Makefile b/Makefile
index 6339ccf11c747ac699b29f270fd910e9bcec4fc7..9347c0a650c3dabd9111a203294ffaec49334ec6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,24 @@
 # 2. peta linux
 # 3. apps (latester)
 
+TFTPROOT := /tftpboot
+
 system_project:
        cd system/script && vivado -mode batch -nolog -nojournal -source recreate.tcl
-system/system.hdf:
+system/system.hdf system/system.bit:
        cd system/script && vivado -mode batch -nolog -nojournal -source build.tcl
+petalinux/bootscript: FORCE
+       $(MAKE) -C petalinux bootscript
+petalinux/images/linux/BOOT.BIN: FORCE
+       $(MAKE) -C petalinux images/linux/BOOT.BIN
+
+.PHONY: dist
+dist: system/system.hdf system/system.bit petalinux/bootscript petalinux/images/linux/BOOT.BIN
+       cp -t $(TFTPROOT) $^
 
 petalinux_config: system/system.hdf
        $(MAKE) -C petalinux config
 petalinux_build:
        $(MAKE) -C petalinux build bootscript
+
+FORCE:

diff --git a/petalinux/bootscript.txt b/petalinux/bootscript.txt
index 939678d88924cdf6ed128fa88377ef75576c6426..1da6faa23a974a18d45f3ef560635018d146a0a1 100644 (file)
--- a/petalinux/bootscript.txt
+++ b/petalinux/bootscript.txt
@@ -2,7 +2,7 @@ echo "Running bootscript ..."
 
 setenv tftp_dir ''
 
-setenv bitstream_image top_wrapper.bit
+setenv bitstream_image system.bit
 setenv dtb_img system.dtb
 setenv kernel_img image.ub
 

diff --git a/system/script/build.tcl b/system/script/build.tcl
index 7006963cd52d21e6a4470af6103c736b07fdc4d8..6ca520ac1d9d900ebd20e33920ed6f704ec6c66d 100644 (file)
--- a/system/script/build.tcl
+++ b/system/script/build.tcl
@@ -23,3 +23,4 @@ wait_on_run impl_1
 launch_runs impl_1 -jobs $jobs -to_step write_bitstream
 wait_on_run impl_1
 file copy -force ../project/canbench.runs/impl_1/top_wrapper.sysdef ../system.hdf
+file copy -force ../project/canbench.runs/impl_1/top_wrapper.bit ../system.bit