Hardware
/
litex-boards
mirror of https://github.com/litex-hub/litex-boards.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #501 from mntmn/master 

mnt_rkx7: RGB and USB fix, add HDMI terminal
This commit is contained in:
enjoy-digital 2023-05-05 09:37:40 +02:00 committed by GitHub
parent 9c222454cc a9e3e3c050
commit 6144966d24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
litex_boards/platforms/mnt_rkx7.py
View File

@ -154,9 +154,9 @@ _io = [
Subsignal("de", Pins("AA15")), Subsignal("de", Pins("AA15")),
Subsignal("hsync", Pins("AB15")), # hsync_n for negative Subsignal("hsync", Pins("AB15")), # hsync_n for negative
Subsignal("vsync", Pins("AB16")), # vsync_n for negative Subsignal("vsync", Pins("AB16")), # vsync_n for negative
Subsignal("b", Pins("AF14 AF15 AE15 AE16 AF17 AE17 AA14 AF18")), # [16:23] Subsignal("r", Pins("AF14 AF15 AE15 AE16 AF17 AE17 AA14 AF18")), # [16:23]
Subsignal("g", Pins("AD15 AE18 AD16 AF19 AC16 AD14 AC17 AC14")), # [8:15] Subsignal("g", Pins("AD15 AE18 AD16 AF19 AC16 AD14 AC17 AC14")), # [8:15]
Subsignal("r", Pins("AB14 Y15 AA17 AA18 Y16 AF20 AD20 AB17")), # [0:7] Subsignal("b", Pins("AB14 Y15 AA17 AA18 Y16 AF20 AD20 AB17")), # [0:7]
IOStandard("LVCMOS18"), Misc("DRIVE=4"), IOStandard("LVCMOS18"), Misc("DRIVE=4"),
), ),

17
litex_boards/targets/mnt_rkx7.py
View File

@ -41,6 +41,7 @@ class _CRG(LiteXModule):
self.cd_idelay = ClockDomain() self.cd_idelay = ClockDomain()
self.cd_dvi = ClockDomain(reset_less=True) self.cd_dvi = ClockDomain(reset_less=True)
self.cd_usb = ClockDomain() self.cd_usb = ClockDomain()
self.cd_hdmi = ClockDomain(reset_less=True)
clkin = platform.request("clk100") clkin = platform.request("clk100")
@ -55,12 +56,15 @@ class _CRG(LiteXModule):
platform.add_false_path_constraints(self.cd_sys.clk, pll.clkin) platform.add_false_path_constraints(self.cd_sys.clk, pll.clkin)
# USB clock # USB clock
pll.create_clkout(self.cd_usb, 48e6) pll.create_clkout(self.cd_usb, int(48e6))
# HDMI 640x480 clock
pll.create_clkout(self.cd_hdmi, int(25e6))
self.pll2 = pll2 = S7MMCM(speedgrade=-2) self.pll2 = pll2 = S7MMCM(speedgrade=-2)
self.comb += pll2.reset.eq(self.rst) self.comb += pll2.reset.eq(self.rst)
pll2.register_clkin(clkin, 100e6) pll2.register_clkin(clkin, 100e6)
# DVI/HDMI pixel clock # DVI pixel clock
pll2.create_clkout(self.cd_dvi, 80e6) # display wants 162e6, but we can underclock pll2.create_clkout(self.cd_dvi, 80e6) # display wants 162e6, but we can underclock
platform.add_false_path_constraints(self.cd_sys.clk, pll2.clkin) platform.add_false_path_constraints(self.cd_sys.clk, pll2.clkin)
@ -79,7 +83,7 @@ class BaseSoC(SoCCore):
with_ethernet = True, with_ethernet = True,
with_etherbone = False, with_etherbone = False,
with_spi_flash = True, with_spi_flash = True,
with_usb_host = False, with_usb_host = True,
**kwargs): **kwargs):
platform = mnt_rkx7.Platform() platform = mnt_rkx7.Platform()
@ -161,8 +165,9 @@ class BaseSoC(SoCCore):
self.add_video_framebuffer(phy=self.videophy, timings=video_timings, clock_domain="dvi") self.add_video_framebuffer(phy=self.videophy, timings=video_timings, clock_domain="dvi")
# HDMI ------------------------------------------------------------------------------------- # HDMI -------------------------------------------------------------------------------------
# Untested: 2x VideoDVIPHYs and framebuffers in parallel # Untested: 2x framebuffers in parallel
#self.videophy = VideoDVIPHY(platform.request("hdmi"), clock_domain="dvi") self.videophy_hdmi = VideoDVIPHY(platform.request("hdmi"), clock_domain="hdmi")
self.add_video_terminal(phy=self.videophy_hdmi, timings="640x480@75Hz", clock_domain="hdmi")
# USB Host --------------------------------------------------------------------------------- # USB Host ---------------------------------------------------------------------------------
if with_usb_host: if with_usb_host:
@ -201,7 +206,7 @@ def main():
parser = LiteXArgumentParser(platform=mnt_rkx7.Platform, description="LiteX SoC on MNT-RKX7.") parser = LiteXArgumentParser(platform=mnt_rkx7.Platform, description="LiteX SoC on MNT-RKX7.")
parser.add_target_argument("--sys-clk-freq", default=100e6, type=float, help="System clock frequency.") parser.add_target_argument("--sys-clk-freq", default=100e6, type=float, help="System clock frequency.")
parser.add_target_argument("--with-spi-flash", action="store_true", default=True, help="Enable SPI Flash (MMAPed).") parser.add_target_argument("--with-spi-flash", action="store_true", default=True, help="Enable SPI Flash (MMAPed).")
parser.add_target_argument("--with-usb-host", action="store_true", default=False, help="Enable USB host support.") parser.add_target_argument("--with-usb-host", action="store_true", default=True, help="Enable USB host support.")
sdopts = parser.target_group.add_mutually_exclusive_group() sdopts = parser.target_group.add_mutually_exclusive_group()
sdopts.add_argument("--with-spi-sdcard", action="store_true", help="Enable SPI-mode SDCard support.") sdopts.add_argument("--with-spi-sdcard", action="store_true", help="Enable SPI-mode SDCard support.")
sdopts.add_argument("--with-sdcard", action="store_true", default=True, help="Enable SDCard support.") sdopts.add_argument("--with-sdcard", action="store_true", default=True, help="Enable SDCard support.")