Merge pull request #756 from trabucayre/colognechip_gatemate_evb_a2

targets,platforms/colognechip_gatemate_evb: added A2 variant via --device arg, switch toolchain to peppercorn

Author: enjoy-digital

docs/boards_inventory.md

@@ -43,7 +43,7 @@ python3 .github/scripts/generate_board_inventory.py --write
 | `bochenjingxin_kintex7_basec` | bochenjingxin_kintex7_basec | vivado | `125000000.0` | - | included |
 | `brisbaneSilicon_brs_100_gw1nr9` | brisbaneSilicon_brs_100_gw1nr9 | gowin | `27000000.0` | - | included |
 | `camlink_4k` | camlink_4k | trellis | `81000000.0` | - | included |
-| `colognechip_gatemate_evb` | colognechip_gatemate_evb | colognechip | `24000000.0` | SDCard, SPI SDCard, SPI Flash | included |
+| `colognechip_gatemate_evb` | colognechip_gatemate_evb | peppercorn | `24000000.0` | SDCard, SPI SDCard, SPI Flash | included |
 | `colorlight_5a_75x` | colorlight_5a_75b, colorlight_5a_75e, colorlight_i5a_907 | trellis | `60000000.0` | Ethernet, Etherbone, SPI Flash | included |
 | `colorlight_i5` | colorlight_i5 | trellis | `60000000.0` | Ethernet, Etherbone, SDCard, SPI SDCard, Video Terminal, Video Framebuffer | included |
 | `colorlight_i9plus` | colorlight_i9plus | vivado | `100000000.0` | Ethernet, Etherbone, SPI Flash | included |

litex_boards/platforms/colognechip_gatemate_evb.py

@@ -147,11 +147,11 @@ class Platform(CologneChipPlatform):
     default_clk_name   = "clk10"
     default_clk_period = 1e9/10e6
 
-    def __init__(self, toolchain="colognechip"):
-        CologneChipPlatform.__init__(self, "CCGM1A1", _io, _connectors, toolchain=toolchain)
+    def __init__(self, toolchain="peppercorn", device="A1"):
+        CologneChipPlatform.__init__(self, f"CCGM1{device}", _io, _connectors, toolchain=toolchain)
 
     def create_programmer(self):
-        return OpenFPGALoader("gatemate_evb_jtag")
+        return OpenFPGALoader("gatemate_evb_jtag", index_chain=0)
 
     def do_finalize(self, fragment):
         CologneChipPlatform.do_finalize(self, fragment)

litex_boards/targets/colognechip_gatemate_evb.py

@@ -51,12 +51,12 @@ def __init__(self, platform, sys_clk_freq):
 # BaseSoC ------------------------------------------------------------------------------------------
 
 class BaseSoC(SoCCore):
-    def __init__(self, sys_clk_freq=48e6, toolchain="colognechip",
+    def __init__(self, device="A1", sys_clk_freq=48e6, toolchain="peppercorn",
         with_l2_cache   = False,
         with_led_chaser = True,
         with_spi_flash  = True,
         **kwargs):
-        platform = colognechip_gatemate_evb.Platform(toolchain)
+        platform = colognechip_gatemate_evb.Platform(toolchain, device)
 
         # USBUART PMOD as Serial--------------------------------------------------------------------
         platform.add_extension(colognechip_gatemate_evb.usb_pmod_io("PMODB"))
@@ -120,6 +120,7 @@ def __init__(self, sys_clk_freq=48e6, toolchain="colognechip",
 def main():
     from litex.build.parser import LiteXArgumentParser
     parser = LiteXArgumentParser(platform=colognechip_gatemate_evb.Platform, description="LiteX SoC on Gatemate EVB")
+    parser.add_target_argument("--device",         default="A1",             help="FPGA device (A1, A2).")
     parser.add_target_argument("--sys-clk-freq",   default=24e6, type=float, help="System clock frequency.")
     parser.add_target_argument("--flash",          action="store_true",      help="Flash bitstream.")
     parser.add_target_argument("--with-spi-flash", action="store_true",      help="Enable memory-mapped SPI flash.")
@@ -129,6 +130,7 @@ def main():
     args = parser.parse_args()
 
     soc = BaseSoC(
+        device         = args.device,
         sys_clk_freq   = args.sys_clk_freq,
         toolchain      = args.toolchain,
         with_spi_flash = args.with_spi_flash,