From 0f242629abe1df52d3a49789413d6e6633b2fd9e Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Tue, 6 Sep 2022 19:08:01 +0200 Subject: [PATCH 1/3] targets/sipeed_tang_nano_4k: replacing VideoHDMIPHY by VideoGowinHDMIPHY and adding with-video-terminal arg --- litex_boards/targets/sipeed_tang_nano_4k.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/litex_boards/targets/sipeed_tang_nano_4k.py b/litex_boards/targets/sipeed_tang_nano_4k.py index 7b272a9..0dc3e11 100755 --- a/litex_boards/targets/sipeed_tang_nano_4k.py +++ b/litex_boards/targets/sipeed_tang_nano_4k.py @@ -122,7 +122,7 @@ class BaseSoC(SoCCore): # Video ------------------------------------------------------------------------------------ if with_video_terminal: - self.submodules.videophy = VideoHDMIPHY(platform.request("hdmi"), clock_domain="hdmi") + self.submodules.videophy = VideoGowinHDMIPHY(platform.request("hdmi"), clock_domain="hdmi") self.add_video_colorbars(phy=self.videophy, timings="640x480@75Hz", clock_domain="hdmi") #self.add_video_terminal(phy=self.videophy, timings="640x480@75Hz", clock_domain="hdmi") # FIXME: Free up BRAMs. @@ -142,12 +142,14 @@ def main(): target_group.add_argument("--load", action="store_true", help="Load bitstream.") target_group.add_argument("--flash", action="store_true", help="Flash Bitstream.") target_group.add_argument("--sys-clk-freq",default=27e6, help="System clock frequency.") + target_group.add_argument("--with-video-terminal",action="store_true", help="System clock frequency.") builder_args(parser) soc_core_args(parser) args = parser.parse_args() soc = BaseSoC( sys_clk_freq=int(float(args.sys_clk_freq)), + with_video_terminal=args.with_video_terminal, **soc_core_argdict(args) ) From 4d72c75f49fcd17e10a1d77d3e2c617060511c36 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Tue, 6 Sep 2022 20:19:37 +0200 Subject: [PATCH 2/3] platforms/sipeed_tang_primer_20k: use replace _connectors.extend by add_connector --- litex_boards/platforms/sipeed_tang_primer_20k.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/litex_boards/platforms/sipeed_tang_primer_20k.py b/litex_boards/platforms/sipeed_tang_primer_20k.py index e40e910..9fb2a92 100644 --- a/litex_boards/platforms/sipeed_tang_primer_20k.py +++ b/litex_boards/platforms/sipeed_tang_primer_20k.py @@ -251,11 +251,12 @@ class Platform(GowinPlatform): default_clk_period = 1e9/27e6 def __init__(self, dock="dock", toolchain="gowin"): - if dock == "lite": - _connectors.extend(_dock_lite_connectors) GowinPlatform.__init__(self, "GW2A-LV18PG256C8/I7", _io, _connectors, toolchain=toolchain, devicename="GW2A-18C") self.add_extension(_dock_io if dock == "dock" else _dock_lite_io) + if dock == "lite": + self.add_connector(_dock_lite_connectors) + self.toolchain.options["use_mspi_as_gpio"] = 1 self.toolchain.options["use_sspi_as_gpio"] = 1 self.toolchain.options["use_ready_as_gpio"] = 1 From 1d924436044f66139682da3269d900f19573a495 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Tue, 6 Sep 2022 20:22:32 +0200 Subject: [PATCH 3/3] targets/sipeed_tang_nano_9k: replace VideoHDMIPHY by VideoGowinHDMIPHY --- litex_boards/targets/sipeed_tang_nano_9k.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/litex_boards/targets/sipeed_tang_nano_9k.py b/litex_boards/targets/sipeed_tang_nano_9k.py index 42217e3..d9469cb 100755 --- a/litex_boards/targets/sipeed_tang_nano_9k.py +++ b/litex_boards/targets/sipeed_tang_nano_9k.py @@ -115,7 +115,7 @@ class BaseSoC(SoCCore): # Video ------------------------------------------------------------------------------------ if with_video_terminal: - self.submodules.videophy = VideoHDMIPHY(platform.request("hdmi"), clock_domain="hdmi") + self.submodules.videophy = VideoGowinHDMIPHY(platform.request("hdmi"), clock_domain="hdmi") self.add_video_colorbars(phy=self.videophy, timings="640x480@60Hz", clock_domain="hdmi") #self.add_video_terminal(phy=self.videophy, timings="640x480@75Hz", clock_domain="hdmi") # FIXME: Free up BRAMs.