From ea0eda9f7587a5888593d665b73168e277fa0905 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Tue, 5 May 2020 09:42:34 +0200 Subject: [PATCH] platforms: make sure all Xilinx/Altera platforms have a create_programmer method, use OpenOCD on Spartan6 and 7-Series. --- litex_boards/platforms/ac701.py | 5 +++-- litex_boards/platforms/aller.py | 4 ++++ litex_boards/platforms/arty.py | 6 ++++-- litex_boards/platforms/arty_s7.py | 6 ++++-- litex_boards/platforms/de1soc.py | 4 ++++ litex_boards/platforms/de2_115.py | 4 ++++ litex_boards/platforms/genesys2.py | 3 ++- litex_boards/platforms/kc705.py | 5 +++-- litex_boards/platforms/kx2.py | 5 +++-- litex_boards/platforms/linsn_rv901t.py | 4 ++++ litex_boards/platforms/mimas_a7.py | 5 +++-- litex_boards/platforms/nereid.py | 6 +++--- litex_boards/platforms/netv2.py | 7 ++++++- litex_boards/platforms/nexys4ddr.py | 3 ++- litex_boards/platforms/nexys_video.py | 4 ++-- litex_boards/platforms/pipistrello.py | 4 +++- litex_boards/platforms/sp605.py | 5 +++-- litex_boards/platforms/tagus.py | 4 ++++ litex_boards/platforms/trellisboard.py | 1 - litex_boards/platforms/vc707.py | 5 +++-- litex_boards/platforms/versa_ecp5.py | 1 - 21 files changed, 64 insertions(+), 27 deletions(-) diff --git a/litex_boards/platforms/ac701.py b/litex_boards/platforms/ac701.py index f1645a7b..c8f062cb 100644 --- a/litex_boards/platforms/ac701.py +++ b/litex_boards/platforms/ac701.py @@ -2,7 +2,8 @@ # License: BSD from litex.build.generic_platform import * -from litex.build.xilinx import XilinxPlatform, VivadoProgrammer +from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -222,7 +223,7 @@ class Platform(XilinxPlatform): self.add_platform_command("set_property INTERNAL_VREF 0.750 [get_iobanks 35]") def create_programmer(self): - return VivadoProgrammer() + return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a200t.bit") def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) diff --git a/litex_boards/platforms/aller.py b/litex_boards/platforms/aller.py index 57a39b0f..33890035 100644 --- a/litex_boards/platforms/aller.py +++ b/litex_boards/platforms/aller.py @@ -4,6 +4,7 @@ from litex.build.generic_platform import * from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -116,3 +117,6 @@ class Platform(XilinxPlatform): self.toolchain.additional_commands = \ ["write_cfgmem -force -format bin -interface spix4 -size 16 " "-loadbit \"up 0x0 {build_name}.bit\" -file {build_name}.bin"] + + def create_programmer(self): + return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a200t.bit") diff --git a/litex_boards/platforms/arty.py b/litex_boards/platforms/arty.py index 1e2d8743..3294bf3b 100644 --- a/litex_boards/platforms/arty.py +++ b/litex_boards/platforms/arty.py @@ -3,7 +3,8 @@ # License: BSD from litex.build.generic_platform import * -from litex.build.xilinx import XilinxPlatform, VivadoProgrammer +from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -257,4 +258,5 @@ class Platform(XilinxPlatform): self.add_platform_command("set_property INTERNAL_VREF 0.675 [get_iobanks 34]") def create_programmer(self): - return VivadoProgrammer(flash_part="n25q128-3.3v-spi-x1_x2_x4") + bscan_spi = "bscan_spi_xc7a100t.bit" if "xc7a100t" in self.device else "bscan_spi_xc7a35t.bit" + return OpenOCD("openocd_xilinx_xc7.cfg", bscan_spi) diff --git a/litex_boards/platforms/arty_s7.py b/litex_boards/platforms/arty_s7.py index 2fe63d3e..aaa399ac 100644 --- a/litex_boards/platforms/arty_s7.py +++ b/litex_boards/platforms/arty_s7.py @@ -3,7 +3,8 @@ # License: BSD from litex.build.generic_platform import Pins, Subsignal, IOStandard, Misc -from litex.build.xilinx import XilinxPlatform, VivadoProgrammer +from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -210,4 +211,5 @@ class Platform(XilinxPlatform): self.add_platform_command("set_property INTERNAL_VREF 0.675 [get_iobanks 34]") def create_programmer(self): - return VivadoProgrammer(flash_part="n25q128-3.3v-spi-x1_x2_x4") + bscan_spi = "bscan_spi_xc7s50.bit" if "xc7s50" in self.device else "bscan_spi_xc7a25.bit" + return OpenOCD("openocd_xilinx.cfg", bscan_spi) diff --git a/litex_boards/platforms/de1soc.py b/litex_boards/platforms/de1soc.py index 2b931b17..1cd42fdd 100644 --- a/litex_boards/platforms/de1soc.py +++ b/litex_boards/platforms/de1soc.py @@ -3,6 +3,7 @@ from litex.build.generic_platform import * from litex.build.altera import AlteraPlatform +from litex.build.altera.programmer import USBBlaster # IOs ------------------------------------------------------------------ @@ -41,3 +42,6 @@ class Platform(AlteraPlatform): def __init__(self): AlteraPlatform.__init__(self, "5CSEMA5F31C6", _io) + + def create_programmer(self): + return USBBlaster() diff --git a/litex_boards/platforms/de2_115.py b/litex_boards/platforms/de2_115.py index d61a8180..6158d1c8 100644 --- a/litex_boards/platforms/de2_115.py +++ b/litex_boards/platforms/de2_115.py @@ -3,6 +3,7 @@ from litex.build.generic_platform import * from litex.build.altera import AlteraPlatform +from litex.build.altera.programmer import USBBlaster # IOs ------------------------------------------------------------------ @@ -41,3 +42,6 @@ class Platform(AlteraPlatform): def __init__(self): AlteraPlatform.__init__(self, "EP4CE115F29C7", _io) + + def create_programmer(self): + return USBBlaster() diff --git a/litex_boards/platforms/genesys2.py b/litex_boards/platforms/genesys2.py index 523aa92b..3b392932 100644 --- a/litex_boards/platforms/genesys2.py +++ b/litex_boards/platforms/genesys2.py @@ -3,6 +3,7 @@ from litex.build.generic_platform import * from litex.build.xilinx import XilinxPlatform, VivadoProgrammer +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -116,7 +117,7 @@ class Platform(XilinxPlatform): XilinxPlatform.__init__(self, "xc7k325t-ffg900-2", _io, _connectors, toolchain="vivado") def create_programmer(self): - return VivadoProgrammer() + return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a325t.bit") def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) diff --git a/litex_boards/platforms/kc705.py b/litex_boards/platforms/kc705.py index d1f02a50..3176528f 100644 --- a/litex_boards/platforms/kc705.py +++ b/litex_boards/platforms/kc705.py @@ -3,7 +3,8 @@ # This file is Copyright (c) 2015 Yann Sionneau from litex.build.generic_platform import * -from litex.build.xilinx import XilinxPlatform, VivadoProgrammer +from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -548,7 +549,7 @@ set_property CONFIG_VOLTAGE 2.5 [current_design] self.toolchain.additional_commands = ["write_cfgmem -force -format bin -interface spix4 -size 16 -loadbit \"up 0x0 {build_name}.bit\" -file {build_name}.bin"] def create_programmer(self): - return VivadoProgrammer() + return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a325t.bit") def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) diff --git a/litex_boards/platforms/kx2.py b/litex_boards/platforms/kx2.py index edf3e12a..0fdde5e3 100644 --- a/litex_boards/platforms/kx2.py +++ b/litex_boards/platforms/kx2.py @@ -2,7 +2,8 @@ # License: BSD from litex.build.generic_platform import * -from litex.build.xilinx import XilinxPlatform, VivadoProgrammer +from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -72,4 +73,4 @@ class Platform(XilinxPlatform): XilinxPlatform.__init__(self, " xc7k160tffg676-2", _io, toolchain="vivado") def create_programmer(self): - return VivadoProgrammer() + return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7k160t.bit") diff --git a/litex_boards/platforms/linsn_rv901t.py b/litex_boards/platforms/linsn_rv901t.py index 1ab8ca0a..bbab9ad7 100644 --- a/litex_boards/platforms/linsn_rv901t.py +++ b/litex_boards/platforms/linsn_rv901t.py @@ -7,6 +7,7 @@ from litex.build.generic_platform import * from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -290,3 +291,6 @@ class Platform(XilinxPlatform): def __init__(self): XilinxPlatform.__init__(self, "xc6slx16-2-ftg256", _io, _connectors) + + def create_programmer(self): + return OpenOCD("openocd_xilinx_xc6.cfg", "bscan_spi_xc6slx16.bit") diff --git a/litex_boards/platforms/mimas_a7.py b/litex_boards/platforms/mimas_a7.py index a929f032..d6188d94 100644 --- a/litex_boards/platforms/mimas_a7.py +++ b/litex_boards/platforms/mimas_a7.py @@ -3,7 +3,8 @@ # License: BSD from litex.build.generic_platform import * -from litex.build.xilinx import XilinxPlatform, VivadoProgrammer +from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -182,4 +183,4 @@ class Platform(XilinxPlatform): self.add_platform_command("set_property INTERNAL_VREF 0.675 [get_iobanks 34]") def create_programmer(self): - return VivadoProgrammer(flash_part="n25q128-3.3v-spi-x1_x2_x4") + return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a50t.bit") diff --git a/litex_boards/platforms/nereid.py b/litex_boards/platforms/nereid.py index 227aa0af..490aee83 100644 --- a/litex_boards/platforms/nereid.py +++ b/litex_boards/platforms/nereid.py @@ -3,7 +3,8 @@ # License: BSD from litex.build.generic_platform import * -from litex.build.xilinx import XilinxPlatform, XC3SProg, VivadoProgrammer +from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -400,5 +401,4 @@ set_property CONFIG_VOLTAGE 3.3 [current_design] "-loadbit \"up 0x0 {build_name}.bit\" -file {build_name}.bin"] def create_programmer(self): - return VivadoProgrammer(flash_part="n25q128-3.3v-spi-x1_x2_x4") - + return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7k160t.bit") diff --git a/litex_boards/platforms/netv2.py b/litex_boards/platforms/netv2.py index bb3f91b9..f70da0a1 100644 --- a/litex_boards/platforms/netv2.py +++ b/litex_boards/platforms/netv2.py @@ -2,7 +2,8 @@ # License: BSD from litex.build.generic_platform import * -from litex.build.xilinx import XilinxPlatform, VivadoProgrammer +from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -189,3 +190,7 @@ class Platform(XilinxPlatform): def __init__(self, device="xc7a35t"): assert device in ["xc7a35t", "xc7a100t"] XilinxPlatform.__init__(self, device + "-fgg484-2", _io, toolchain="vivado") + + def create_programmer(self): + bscan_spi = "bscan_spi_xc7a100t.bit" if "xc7a100t" in self.device else "bscan_spi_xc7a35t.bit" + return OpenOCD("openocd_netv2_rpi.cfg", bscan_spi) diff --git a/litex_boards/platforms/nexys4ddr.py b/litex_boards/platforms/nexys4ddr.py index b52ca649..85c29f55 100644 --- a/litex_boards/platforms/nexys4ddr.py +++ b/litex_boards/platforms/nexys4ddr.py @@ -3,6 +3,7 @@ from litex.build.generic_platform import * from litex.build.xilinx import XilinxPlatform, VivadoProgrammer +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -131,4 +132,4 @@ class Platform(XilinxPlatform): self.add_platform_command("set_property INTERNAL_VREF 0.750 [get_iobanks 34]") def create_programmer(self): - return VivadoProgrammer() + return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a100t.bit") diff --git a/litex_boards/platforms/nexys_video.py b/litex_boards/platforms/nexys_video.py index dad949b8..4c86a77a 100644 --- a/litex_boards/platforms/nexys_video.py +++ b/litex_boards/platforms/nexys_video.py @@ -3,6 +3,7 @@ from litex.build.generic_platform import * from litex.build.xilinx import XilinxPlatform, VivadoProgrammer +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -230,9 +231,8 @@ class Platform(XilinxPlatform): "-loadbit \"up 0x0 {build_name}.bit\" -file {build_name}.bin"] self.add_platform_command("set_property INTERNAL_VREF 0.750 [get_iobanks 35]") - def create_programmer(self): - return VivadoProgrammer(flash_part="n25q128-3.3v-spi-x1_x2_x4") + return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a200t.bit") def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) diff --git a/litex_boards/platforms/pipistrello.py b/litex_boards/platforms/pipistrello.py index 0b9d6c90..296258b7 100644 --- a/litex_boards/platforms/pipistrello.py +++ b/litex_boards/platforms/pipistrello.py @@ -7,7 +7,6 @@ from litex.build.generic_platform import * from litex.build.xilinx import XilinxPlatform -from litex.build.xilinx.programmer import XC3SProg from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -151,3 +150,6 @@ class Platform(XilinxPlatform): def __init__(self): XilinxPlatform.__init__(self, "xc6slx45-csg324-3", _io, _connectors) self.toolchain.bitgen_opt += " -g Compress -g ConfigRate:6" + + def create_programmer(self): + return OpenOCD("openocd_xilinx_xc6.cfg", "bscan_spi_xc6slx45.bit") diff --git a/litex_boards/platforms/sp605.py b/litex_boards/platforms/sp605.py index f74636dc..1f3188d6 100644 --- a/litex_boards/platforms/sp605.py +++ b/litex_boards/platforms/sp605.py @@ -3,7 +3,8 @@ from litex.build.generic_platform import * -from litex.build.xilinx import XilinxPlatform, iMPACT +from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD _io = [ ("user_led", 0, Pins("D17"), IOStandard("LVCMOS25")), @@ -161,4 +162,4 @@ class Platform(XilinxPlatform): XilinxPlatform.__init__(self, "xc6slx45t-fgg484-3", _io, _connectors, toolchain="ise") def create_programmer(self): - return iMPACT() + return OpenOCD("openocd_xilinx_xc6.cfg", "bscan_spi_xc6slx45.bit") diff --git a/litex_boards/platforms/tagus.py b/litex_boards/platforms/tagus.py index 6ab6b39b..a5fa4129 100644 --- a/litex_boards/platforms/tagus.py +++ b/litex_boards/platforms/tagus.py @@ -4,6 +4,7 @@ from litex.build.generic_platform import * from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -165,3 +166,6 @@ class Platform(XilinxPlatform): self.toolchain.additional_commands = \ ["write_cfgmem -force -format bin -interface spix4 -size 16 " "-loadbit \"up 0x0 {build_name}.bit\" -file {build_name}.bin"] + + def create_programmer(self): + return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a200t.bit") diff --git a/litex_boards/platforms/trellisboard.py b/litex_boards/platforms/trellisboard.py index 7284b45e..e5dd3862 100644 --- a/litex_boards/platforms/trellisboard.py +++ b/litex_boards/platforms/trellisboard.py @@ -3,7 +3,6 @@ from litex.build.generic_platform import * from litex.build.lattice import LatticePlatform -from litex.build.lattice.programmer import LatticeProgrammer # IOs ---------------------------------------------------------------------------------------------- diff --git a/litex_boards/platforms/vc707.py b/litex_boards/platforms/vc707.py index 0f9e4edb..0e46a248 100644 --- a/litex_boards/platforms/vc707.py +++ b/litex_boards/platforms/vc707.py @@ -4,7 +4,8 @@ # License: BSD from litex.build.generic_platform import * -from litex.build.xilinx import XilinxPlatform, VivadoProgrammer, XC3SProg +from litex.build.xilinx import XilinxPlatform +from litex.build.openocd import OpenOCD # IOs ---------------------------------------------------------------------------------------------- @@ -643,7 +644,7 @@ class Platform(XilinxPlatform): self.add_platform_command("""set_property CONFIG_VOLTAGE 2.5 [current_design]""") def create_programmer(self): - return VivadoProgrammer() + return OpenOCD("openocd_xilinx_xc7.cfg", "xc7vx485t.bit") def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) diff --git a/litex_boards/platforms/versa_ecp5.py b/litex_boards/platforms/versa_ecp5.py index e3b40b41..03f0f1cf 100644 --- a/litex_boards/platforms/versa_ecp5.py +++ b/litex_boards/platforms/versa_ecp5.py @@ -4,7 +4,6 @@ from litex.build.generic_platform import * from litex.build.lattice import LatticePlatform -from litex.build.lattice.programmer import LatticeProgrammer # IOs ----------------------------------------------------------------------------------------------