From eeba64d7b2a916cd828d71d1df5a5aca15adf803 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 21 May 2020 09:12:29 +0200 Subject: [PATCH] targets: use soc.build_name in load/flash bitstream. --- litex_boards/targets/ac701.py | 2 +- litex_boards/targets/acorn_cle_215.py | 4 ++-- litex_boards/targets/aller.py | 2 +- litex_boards/targets/alveo_u250.py | 2 +- litex_boards/targets/arty.py | 2 +- litex_boards/targets/arty_s7.py | 2 +- litex_boards/targets/c10lprefkit.py | 2 +- litex_boards/targets/camlink_4k.py | 2 +- litex_boards/targets/colorlight_5a_75b.py | 2 +- litex_boards/targets/de0nano.py | 2 +- litex_boards/targets/de10lite.py | 2 +- litex_boards/targets/de10nano.py | 2 +- litex_boards/targets/de1soc.py | 2 +- litex_boards/targets/de2_115.py | 2 +- litex_boards/targets/ecp5_evn.py | 2 +- litex_boards/targets/ecpix5.py | 2 +- litex_boards/targets/genesys2.py | 2 +- litex_boards/targets/icebreaker.py | 2 +- litex_boards/targets/kc705.py | 2 +- litex_boards/targets/kcu105.py | 2 +- litex_boards/targets/kx2.py | 2 +- litex_boards/targets/linsn_rv901t.py | 2 +- litex_boards/targets/mercury_xu5.py | 2 +- litex_boards/targets/mimas_a7.py | 2 +- litex_boards/targets/minispartan6.py | 2 +- litex_boards/targets/nereid.py | 2 +- litex_boards/targets/netv2.py | 2 +- litex_boards/targets/nexys4ddr.py | 2 +- litex_boards/targets/nexys_video.py | 2 +- litex_boards/targets/pano_logic_g2.py | 2 +- litex_boards/targets/pipistrello.py | 2 +- litex_boards/targets/tagus.py | 2 +- litex_boards/targets/trellisboard.py | 2 +- litex_boards/targets/ulx3s.py | 2 +- litex_boards/targets/vc707.py | 2 +- litex_boards/targets/vcu118.py | 2 +- litex_boards/targets/versa_ecp5.py | 2 +- litex_boards/targets/zcu104.py | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/litex_boards/targets/ac701.py b/litex_boards/targets/ac701.py index 8ba2967..d0cc05f 100755 --- a/litex_boards/targets/ac701.py +++ b/litex_boards/targets/ac701.py @@ -135,7 +135,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.svf")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/acorn_cle_215.py b/litex_boards/targets/acorn_cle_215.py index b428600..8858c39 100755 --- a/litex_boards/targets/acorn_cle_215.py +++ b/litex_boards/targets/acorn_cle_215.py @@ -217,11 +217,11 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if args.flash: prog = soc.platform.create_programmer() - prog.flash(0, os.path.join(builder.gateware_dir, "top.bin")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bin")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/aller.py b/litex_boards/targets/aller.py index 2a3d25d..49ee1fe 100755 --- a/litex_boards/targets/aller.py +++ b/litex_boards/targets/aller.py @@ -194,7 +194,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/alveo_u250.py b/litex_boards/targets/alveo_u250.py index 7f827fc..71d2c03 100755 --- a/litex_boards/targets/alveo_u250.py +++ b/litex_boards/targets/alveo_u250.py @@ -105,7 +105,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/arty.py b/litex_boards/targets/arty.py index 0450872..bba25de 100755 --- a/litex_boards/targets/arty.py +++ b/litex_boards/targets/arty.py @@ -122,7 +122,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/arty_s7.py b/litex_boards/targets/arty_s7.py index a2e27d2..1f12d2f 100755 --- a/litex_boards/targets/arty_s7.py +++ b/litex_boards/targets/arty_s7.py @@ -97,7 +97,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/c10lprefkit.py b/litex_boards/targets/c10lprefkit.py index de3bb3a..a47fc13 100755 --- a/litex_boards/targets/c10lprefkit.py +++ b/litex_boards/targets/c10lprefkit.py @@ -113,7 +113,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.sof")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".sof")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/camlink_4k.py b/litex_boards/targets/camlink_4k.py index 7ce02c4..7f1789c 100755 --- a/litex_boards/targets/camlink_4k.py +++ b/litex_boards/targets/camlink_4k.py @@ -121,7 +121,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.svf")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".svf")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/colorlight_5a_75b.py b/litex_boards/targets/colorlight_5a_75b.py index da321d2..fc4b78e 100755 --- a/litex_boards/targets/colorlight_5a_75b.py +++ b/litex_boards/targets/colorlight_5a_75b.py @@ -161,7 +161,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.svf")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".svf")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/de0nano.py b/litex_boards/targets/de0nano.py index 114773d..85a884c 100755 --- a/litex_boards/targets/de0nano.py +++ b/litex_boards/targets/de0nano.py @@ -90,7 +90,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.sof")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".sof")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/de10lite.py b/litex_boards/targets/de10lite.py index 710c5ac..bc68350 100755 --- a/litex_boards/targets/de10lite.py +++ b/litex_boards/targets/de10lite.py @@ -122,7 +122,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.sof")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".sof")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/de10nano.py b/litex_boards/targets/de10nano.py index 450f05a..e373802 100755 --- a/litex_boards/targets/de10nano.py +++ b/litex_boards/targets/de10nano.py @@ -106,7 +106,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.sof")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".sof")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/de1soc.py b/litex_boards/targets/de1soc.py index a0d3c12..1707620 100755 --- a/litex_boards/targets/de1soc.py +++ b/litex_boards/targets/de1soc.py @@ -83,7 +83,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.sof")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".sof")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/de2_115.py b/litex_boards/targets/de2_115.py index 5e861fa..a8aab1a 100755 --- a/litex_boards/targets/de2_115.py +++ b/litex_boards/targets/de2_115.py @@ -83,7 +83,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.sof")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".sof")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/ecp5_evn.py b/litex_boards/targets/ecp5_evn.py index fa8eca5..70ab8df 100755 --- a/litex_boards/targets/ecp5_evn.py +++ b/litex_boards/targets/ecp5_evn.py @@ -80,7 +80,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.svf")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".svf")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/ecpix5.py b/litex_boards/targets/ecpix5.py index 8ad8c1b..0eaaab8 100755 --- a/litex_boards/targets/ecpix5.py +++ b/litex_boards/targets/ecpix5.py @@ -129,7 +129,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.svf")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".svf")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/genesys2.py b/litex_boards/targets/genesys2.py index d0c8c9a..98cd8e2 100755 --- a/litex_boards/targets/genesys2.py +++ b/litex_boards/targets/genesys2.py @@ -112,7 +112,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/icebreaker.py b/litex_boards/targets/icebreaker.py index 557c7ab..def67e0 100755 --- a/litex_boards/targets/icebreaker.py +++ b/litex_boards/targets/icebreaker.py @@ -130,7 +130,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bin")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bin")) if args.flash: flash(args.bios_flash_offset) diff --git a/litex_boards/targets/kc705.py b/litex_boards/targets/kc705.py index 3bb2157..e6511c1 100755 --- a/litex_boards/targets/kc705.py +++ b/litex_boards/targets/kc705.py @@ -104,7 +104,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/kcu105.py b/litex_boards/targets/kcu105.py index 6c8a945..fc3829c 100755 --- a/litex_boards/targets/kcu105.py +++ b/litex_boards/targets/kcu105.py @@ -112,7 +112,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/kx2.py b/litex_boards/targets/kx2.py index 29b321c..5f25baa 100755 --- a/litex_boards/targets/kx2.py +++ b/litex_boards/targets/kx2.py @@ -91,7 +91,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/linsn_rv901t.py b/litex_boards/targets/linsn_rv901t.py index bd2bc9c..d6acfb1 100755 --- a/litex_boards/targets/linsn_rv901t.py +++ b/litex_boards/targets/linsn_rv901t.py @@ -129,7 +129,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/mercury_xu5.py b/litex_boards/targets/mercury_xu5.py index 19ad8aa..b7dd620 100755 --- a/litex_boards/targets/mercury_xu5.py +++ b/litex_boards/targets/mercury_xu5.py @@ -100,7 +100,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/mimas_a7.py b/litex_boards/targets/mimas_a7.py index 3dd421d..c3f3d0f 100755 --- a/litex_boards/targets/mimas_a7.py +++ b/litex_boards/targets/mimas_a7.py @@ -105,7 +105,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/minispartan6.py b/litex_boards/targets/minispartan6.py index 39f432a..5b9862c 100755 --- a/litex_boards/targets/minispartan6.py +++ b/litex_boards/targets/minispartan6.py @@ -89,7 +89,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/nereid.py b/litex_boards/targets/nereid.py index 3a48521..7b2a306 100755 --- a/litex_boards/targets/nereid.py +++ b/litex_boards/targets/nereid.py @@ -187,7 +187,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/netv2.py b/litex_boards/targets/netv2.py index 33979af..39b04df 100755 --- a/litex_boards/targets/netv2.py +++ b/litex_boards/targets/netv2.py @@ -105,7 +105,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/nexys4ddr.py b/litex_boards/targets/nexys4ddr.py index 51387d5..27fc24f 100755 --- a/litex_boards/targets/nexys4ddr.py +++ b/litex_boards/targets/nexys4ddr.py @@ -107,7 +107,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/nexys_video.py b/litex_boards/targets/nexys_video.py index 1f00cb7..f1a00bd 100755 --- a/litex_boards/targets/nexys_video.py +++ b/litex_boards/targets/nexys_video.py @@ -104,7 +104,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/pano_logic_g2.py b/litex_boards/targets/pano_logic_g2.py index d240a15..6c179b1 100755 --- a/litex_boards/targets/pano_logic_g2.py +++ b/litex_boards/targets/pano_logic_g2.py @@ -62,7 +62,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.sof")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/pipistrello.py b/litex_boards/targets/pipistrello.py index d0f5407..aac4179 100755 --- a/litex_boards/targets/pipistrello.py +++ b/litex_boards/targets/pipistrello.py @@ -205,7 +205,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/tagus.py b/litex_boards/targets/tagus.py index ee6508a..7732cfb 100755 --- a/litex_boards/targets/tagus.py +++ b/litex_boards/targets/tagus.py @@ -194,7 +194,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/trellisboard.py b/litex_boards/targets/trellisboard.py index 243e346..ce872e0 100755 --- a/litex_boards/targets/trellisboard.py +++ b/litex_boards/targets/trellisboard.py @@ -145,7 +145,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.svf")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".svf")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/ulx3s.py b/litex_boards/targets/ulx3s.py index 6a57848..6bbe488 100755 --- a/litex_boards/targets/ulx3s.py +++ b/litex_boards/targets/ulx3s.py @@ -121,7 +121,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.svf")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".svf")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/vc707.py b/litex_boards/targets/vc707.py index 09b6ed6..7f236d5 100755 --- a/litex_boards/targets/vc707.py +++ b/litex_boards/targets/vc707.py @@ -92,7 +92,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/vcu118.py b/litex_boards/targets/vcu118.py index 9baf06a..317de82 100755 --- a/litex_boards/targets/vcu118.py +++ b/litex_boards/targets/vcu118.py @@ -100,7 +100,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/versa_ecp5.py b/litex_boards/targets/versa_ecp5.py index bc9742d..293c467 100755 --- a/litex_boards/targets/versa_ecp5.py +++ b/litex_boards/targets/versa_ecp5.py @@ -134,7 +134,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.svf")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".svf")) if __name__ == "__main__": main() diff --git a/litex_boards/targets/zcu104.py b/litex_boards/targets/zcu104.py index d77a728..0579a32 100755 --- a/litex_boards/targets/zcu104.py +++ b/litex_boards/targets/zcu104.py @@ -99,7 +99,7 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "top.bit")) + prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) if __name__ == "__main__": main()