From 496b2cfab9ba1e0943f4bb6749ca5349b489997a Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 17 Mar 2022 09:40:10 +0100 Subject: [PATCH] targets/gowin: Switch to get_bitstream_filename. --- litex_boards/targets/myminieye_runber.py | 4 ++-- litex_boards/targets/sipeed_tang_nano.py | 4 ++-- litex_boards/targets/sipeed_tang_nano_4k.py | 4 ++-- litex_boards/targets/sipeed_tang_nano_9k.py | 6 +++--- litex_boards/targets/trenz_tec0117.py | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/litex_boards/targets/myminieye_runber.py b/litex_boards/targets/myminieye_runber.py index bebcfd4f..768c6023 100755 --- a/litex_boards/targets/myminieye_runber.py +++ b/litex_boards/targets/myminieye_runber.py @@ -79,11 +79,11 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "impl", "pnr", "project.fs")) # FIXME + prog.load_bitstream(builder.get_bitstream_filename(mode="sram")) if args.flash: prog = soc.platform.create_programmer() - prog.flash(0, os.path.join(builder.gateware_dir, "impl", "pnr", "project.fs")) # FIXME + prog.flash(0, builder.get_bitstream_filename(mode="flash", ext=".fs")) # FIXME if __name__ == "__main__": main() diff --git a/litex_boards/targets/sipeed_tang_nano.py b/litex_boards/targets/sipeed_tang_nano.py index 3b137055..d948c3b5 100755 --- a/litex_boards/targets/sipeed_tang_nano.py +++ b/litex_boards/targets/sipeed_tang_nano.py @@ -106,11 +106,11 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "impl", "pnr", "project.fs")) # FIXME + prog.load_bitstream(builder.get_bitstream_filename(mode="sram")) if args.flash: prog = soc.platform.create_programmer() - prog.flash(0, os.path.join(builder.gateware_dir, "impl", "pnr", "project.fs")) # FIXME + prog.flash(0, builder.get_bitstream_filename(mode="flash", ext=".fs")) # FIXME if __name__ == "__main__": main() diff --git a/litex_boards/targets/sipeed_tang_nano_4k.py b/litex_boards/targets/sipeed_tang_nano_4k.py index 048d89af..89fdd608 100755 --- a/litex_boards/targets/sipeed_tang_nano_4k.py +++ b/litex_boards/targets/sipeed_tang_nano_4k.py @@ -160,11 +160,11 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "impl", "pnr", "project.fs")) # FIXME + prog.load_bitstream(builder.get_bitstream_filename(mode="sram")) if args.flash: prog = soc.platform.create_programmer() - prog.flash(0, os.path.join(builder.gateware_dir, "impl", "pnr", "project.fs")) # FIXME + prog.flash(0, builder.get_bitstream_filename(mode="flash", ext=".fs")) # FIXME prog.flash(0, builder.get_bios_filename(), external=True) diff --git a/litex_boards/targets/sipeed_tang_nano_9k.py b/litex_boards/targets/sipeed_tang_nano_9k.py index f41d5923..de6c4beb 100755 --- a/litex_boards/targets/sipeed_tang_nano_9k.py +++ b/litex_boards/targets/sipeed_tang_nano_9k.py @@ -134,12 +134,12 @@ def main(): if args.load: prog = soc.platform.create_programmer(kit=args.prog_kit) - prog.load_bitstream(os.path.join(builder.gateware_dir, "impl", "pnr", "project.fs")) # FIXME + prog.load_bitstream(builder.get_bitstream_filename(mode="sram")) if args.flash: prog = soc.platform.create_programmer(kit=args.prog_kit) - prog.flash(0, os.path.join(builder.gateware_dir, "impl", "pnr", "project.fs")) # FIXME - # external SPI programming not supported by gowin 'programmer_cli' now! + prog.flash(0, builder.get_bitstream_filename(mode="flash", ext=".fs")) # FIXME + # Axternal SPI programming not supported by gowin 'programmer_cli' now! # if needed, use openFPGALoader or Gowin programmer GUI if args.prog_kit == "openfpgaloader": prog.flash(int(args.bios_flash_offset, 0), builder.get_bios_filename(), external=True) diff --git a/litex_boards/targets/trenz_tec0117.py b/litex_boards/targets/trenz_tec0117.py index a7e49dcb..c4a40a4c 100755 --- a/litex_boards/targets/trenz_tec0117.py +++ b/litex_boards/targets/trenz_tec0117.py @@ -138,7 +138,7 @@ def flash(bios_flash_offset): ] platform.build(module) prog = platform.create_programmer() - prog.load_bitstream("build/impl/pnr/project.fs") + prog.flash(0, builder.get_bitstream_filename(mode="flash", ext=".fs")) # FIXME # Flash Image through proxy Bitstream. # ------------------------------------ @@ -184,11 +184,11 @@ def main(): if args.load: prog = soc.platform.create_programmer() - prog.load_bitstream(os.path.join(builder.gateware_dir, "impl", "pnr", "project.fs")) # FIXME. + prog.flash(0, builder.get_bitstream_filename(mode="sram")) if args.flash: prog = soc.platform.create_programmer() - prog.flash(0, os.path.join(builder.gateware_dir, "impl", "pnr", "project.fs")) # FIXME. + prog.flash(0, builder.get_bitstream_filename(mode="flash", ext=".fs")) # FIXME flash(int(args.bios_flash_offset, 0)) if __name__ == "__main__":