mirror of
https://github.com/saymrwulf/litex-boards.git
synced 2026-11-20 09:52:57 +00:00
sipeed_tang_primer_20k: Add Video (Colorbars), compiles but does not seems to be working.
This commit is contained in:
parent
12b8063941
commit
abe08a96aa
2 changed files with 50 additions and 11 deletions
|
|
@ -111,12 +111,29 @@ _connectors = [
|
||||||
|
|
||||||
_dock_io = [
|
_dock_io = [
|
||||||
# Leds
|
# Leds
|
||||||
("user_led", 0, Pins( "CARD1:44"), IOStandard("LVCMOS33")),
|
("user_led", 0, Pins( "CARD1:44"), IOStandard("LVCMOS18")),
|
||||||
("user_led", 1, Pins( "CARD1:46"), IOStandard("LVCMOS33")),
|
("user_led", 1, Pins( "CARD1:46"), IOStandard("LVCMOS18")),
|
||||||
("user_led", 3, Pins( "CARD1:40"), IOStandard("LVCMOS33")),
|
("user_led", 3, Pins( "CARD1:40"), IOStandard("LVCMOS18")),
|
||||||
("user_led", 2, Pins( "CARD1:42"), IOStandard("LVCMOS33")),
|
("user_led", 2, Pins( "CARD1:42"), IOStandard("LVCMOS18")),
|
||||||
("user_led", 4, Pins( "CARD1:98"), IOStandard("LVCMOS33")),
|
("user_led", 4, Pins( "CARD1:98"), IOStandard("LVCMOS18")),
|
||||||
("user_led", 5, Pins("CARD1:136"), IOStandard("LVCMOS33")),
|
("user_led", 5, Pins("CARD1:136"), IOStandard("LVCMOS18")),
|
||||||
|
|
||||||
|
# HDMI.
|
||||||
|
("hdmi", 0,
|
||||||
|
Subsignal("clk_p", Pins("CARD1:132")),
|
||||||
|
Subsignal("clk_n", Pins("CARD1:130")),
|
||||||
|
Subsignal("data0_p", Pins("CARD1:50")), # Inverted.
|
||||||
|
Subsignal("data0_n", Pins("CARD1:52")),
|
||||||
|
Subsignal("data1_p", Pins("CARD1:62")), # Inverted.
|
||||||
|
Subsignal("data1_n", Pins("CARD1:64")),
|
||||||
|
Subsignal("data2_p", Pins("CARD1:68")), # Inverted.
|
||||||
|
Subsignal("data2_n", Pins("CARD1:70")),
|
||||||
|
Subsignal("hdp", Pins("CARD1:154"), IOStandard("LVCMOS18")),
|
||||||
|
Subsignal("cec", Pins("CARD1:152"), IOStandard("LVCMOS18")),
|
||||||
|
Subsignal("sda", Pins("CARD1:95"), IOStandard("LVCMOS18")),
|
||||||
|
Subsignal("scl", Pins("CARD1:97"), IOStandard("LVCMOS18")),
|
||||||
|
Misc("PULL_MODE=NONE"),
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
# Platform -----------------------------------------------------------------------------------------
|
# Platform -----------------------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ from litex.soc.integration.soc_core import *
|
||||||
from litex.soc.integration.soc import SoCRegion
|
from litex.soc.integration.soc import SoCRegion
|
||||||
from litex.soc.integration.builder import *
|
from litex.soc.integration.builder import *
|
||||||
from litex.soc.cores.led import LedChaser
|
from litex.soc.cores.led import LedChaser
|
||||||
|
from litex.soc.cores.video import *
|
||||||
|
|
||||||
from litex_boards.platforms import sipeed_tang_primer_20k
|
from litex_boards.platforms import sipeed_tang_primer_20k
|
||||||
|
|
||||||
|
|
@ -25,7 +26,7 @@ mB = 1024*kB
|
||||||
# CRG ----------------------------------------------------------------------------------------------
|
# CRG ----------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
class _CRG(Module):
|
class _CRG(Module):
|
||||||
def __init__(self, platform, sys_clk_freq):
|
def __init__(self, platform, sys_clk_freq, with_video_pll=False):
|
||||||
self.rst = Signal()
|
self.rst = Signal()
|
||||||
self.clock_domains.cd_sys = ClockDomain()
|
self.clock_domains.cd_sys = ClockDomain()
|
||||||
self.clock_domains.cd_por = ClockDomain()
|
self.clock_domains.cd_por = ClockDomain()
|
||||||
|
|
@ -48,14 +49,27 @@ class _CRG(Module):
|
||||||
self.sync.por += If(~por_done, por_count.eq(por_count - 1))
|
self.sync.por += If(~por_done, por_count.eq(por_count - 1))
|
||||||
self.comb += pll.reset.eq(~por_done)
|
self.comb += pll.reset.eq(~por_done)
|
||||||
|
|
||||||
|
# Video PLL
|
||||||
|
if with_video_pll:
|
||||||
|
self.submodules.video_pll = video_pll = GW2APLL(devicename=platform.devicename, device=platform.device)
|
||||||
|
video_pll.register_clkin(clk27, 27e6)
|
||||||
|
self.clock_domains.cd_hdmi = ClockDomain()
|
||||||
|
self.clock_domains.cd_hdmi5x = ClockDomain()
|
||||||
|
video_pll.create_clkout(self.cd_hdmi5x, 125e6)
|
||||||
|
self.specials += Instance("CLKDIV",
|
||||||
|
p_DIV_MODE= "5",
|
||||||
|
i_HCLKIN = self.cd_hdmi5x.clk,
|
||||||
|
o_CLKOUT = self.cd_hdmi.clk
|
||||||
|
)
|
||||||
|
|
||||||
# BaseSoC ------------------------------------------------------------------------------------------
|
# BaseSoC ------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
class BaseSoC(SoCCore):
|
class BaseSoC(SoCCore):
|
||||||
def __init__(self, sys_clk_freq=int(48e6), with_spi_flash=False, with_led_chaser=True, **kwargs):
|
def __init__(self, sys_clk_freq=int(48e6), with_spi_flash=False, with_led_chaser=True, with_video_terminal=False, **kwargs):
|
||||||
platform = sipeed_tang_primer_20k.Platform()
|
platform = sipeed_tang_primer_20k.Platform()
|
||||||
|
|
||||||
# CRG --------------------------------------------------------------------------------------
|
# CRG --------------------------------------------------------------------------------------
|
||||||
self.submodules.crg = _CRG(platform, sys_clk_freq)
|
self.submodules.crg = _CRG(platform, sys_clk_freq, with_video_pll=with_video_terminal)
|
||||||
|
|
||||||
# SoCCore ----------------------------------------------------------------------------------
|
# SoCCore ----------------------------------------------------------------------------------
|
||||||
SoCCore.__init__(self, platform, sys_clk_freq, ident="LiteX SoC on Tang Primer 20K", **kwargs)
|
SoCCore.__init__(self, platform, sys_clk_freq, ident="LiteX SoC on Tang Primer 20K", **kwargs)
|
||||||
|
|
@ -66,6 +80,12 @@ class BaseSoC(SoCCore):
|
||||||
from litespi.opcodes import SpiNorFlashOpCodes as Codes
|
from litespi.opcodes import SpiNorFlashOpCodes as Codes
|
||||||
self.add_spi_flash(mode="1x", module=SpiFlashModule(Codes.READ_1_1_1))
|
self.add_spi_flash(mode="1x", module=SpiFlashModule(Codes.READ_1_1_1))
|
||||||
|
|
||||||
|
# Video ------------------------------------------------------------------------------------
|
||||||
|
if with_video_terminal:
|
||||||
|
self.submodules.videophy = VideoHDMIPHY(platform.request("hdmi"), clock_domain="hdmi", pn_swap=["r", "g", "b"])
|
||||||
|
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: Un-tested.
|
||||||
|
|
||||||
# Leds -------------------------------------------------------------------------------------
|
# Leds -------------------------------------------------------------------------------------
|
||||||
if with_led_chaser:
|
if with_led_chaser:
|
||||||
self.submodules.leds = LedChaser(
|
self.submodules.leds = LedChaser(
|
||||||
|
|
@ -87,13 +107,15 @@ def main():
|
||||||
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", help="Enable SDCard support.")
|
sdopts.add_argument("--with-sdcard", action="store_true", help="Enable SDCard support.")
|
||||||
target_group.add_argument("--with-spi-flash", action="store_true", help="Enable SPI Flash (MMAPed).")
|
target_group.add_argument("--with-spi-flash", action="store_true", help="Enable SPI Flash (MMAPed).")
|
||||||
|
target_group.add_argument("--with-video-terminal", action="store_true", help="Enable Video Terminal (HDMI).")
|
||||||
builder_args(parser)
|
builder_args(parser)
|
||||||
soc_core_args(parser)
|
soc_core_args(parser)
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
soc = BaseSoC(
|
soc = BaseSoC(
|
||||||
sys_clk_freq = int(float(args.sys_clk_freq)),
|
sys_clk_freq = int(float(args.sys_clk_freq)),
|
||||||
with_spi_flash = args.with_spi_flash,
|
with_spi_flash = args.with_spi_flash,
|
||||||
|
with_video_terminal = args.with_video_terminal,
|
||||||
**soc_core_argdict(args)
|
**soc_core_argdict(args)
|
||||||
)
|
)
|
||||||
if args.with_spi_sdcard:
|
if args.with_spi_sdcard:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue