ego1: Switch to VideoTerminal (LiteVideo is no longer provided by default with LiteX).

This commit is contained in:
Florent Kermarrec 2021-10-27 16:29:46 +02:00
parent 91818bc5f0
commit 207afb98fc
2 changed files with 15 additions and 24 deletions

View file

@ -97,9 +97,9 @@ _io = [
# VGA # VGA
("vga", 0, ("vga", 0,
Subsignal("red", Pins("F5 C6 C5 B7")), Subsignal("r", Pins("F5 C6 C5 B7")),
Subsignal("green", Pins("B6 A6 A5 D8")), Subsignal("g", Pins("B6 A6 A5 D8")),
Subsignal("blue", Pins("C7 E6 E5 E7")), Subsignal("b", Pins("C7 E6 E5 E7")),
Subsignal("hsync", Pins("D7")), Subsignal("hsync", Pins("D7")),
Subsignal("vsync", Pins("C4")), Subsignal("vsync", Pins("C4")),
IOStandard("LVCMOS33") IOStandard("LVCMOS33")

View file

@ -19,8 +19,7 @@ from litex.soc.integration.soc import SoCRegion
from litex.soc.integration.soc_core import * from litex.soc.integration.soc_core import *
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 VideoVGAPHY
from litevideo.terminal.core import Terminal
# CRG ---------------------------------------------------------------------------------------------- # CRG ----------------------------------------------------------------------------------------------
@ -39,7 +38,7 @@ class _CRG(Module):
# BaseSoC ------------------------------------------------------------------------------------------ # BaseSoC ------------------------------------------------------------------------------------------
class BaseSoC(SoCCore): class BaseSoC(SoCCore):
def __init__(self, sys_clk_freq=int(100e6), with_led_chaser=True, with_vga=False, **kwargs): def __init__(self, sys_clk_freq=int(100e6), with_led_chaser=True, with_video_terminal=False, **kwargs):
platform = ego1.Platform() platform = ego1.Platform()
# SoCCore ---------------------------------------------------------------------------------- # SoCCore ----------------------------------------------------------------------------------
@ -52,17 +51,9 @@ class BaseSoC(SoCCore):
self.submodules.crg = _CRG(platform, sys_clk_freq) self.submodules.crg = _CRG(platform, sys_clk_freq)
# VGA terminal ----------------------------------------------------------------------------- # VGA terminal -----------------------------------------------------------------------------
if with_vga: if with_video_terminal:
self.submodules.terminal = terminal = Terminal() self.submodules.videophy = VideoVGAPHY(platform.request("vga"), clock_domain="vga")
self.bus.add_slave("terminal", self.terminal.bus, region=SoCRegion(origin=0x30000000, size=0x10000)) self.add_video_terminal(phy=self.videophy, timings="640x480@75Hz", clock_domain="vga")
vga_pads = platform.request("vga")
self.comb += [
vga_pads.vsync.eq(terminal.vsync),
vga_pads.hsync.eq(terminal.hsync),
vga_pads.red.eq(terminal.red[4:8]),
vga_pads.green.eq(terminal.green[4:8]),
vga_pads.blue.eq(terminal.blue[4:8])
]
# Leds ------------------------------------------------------------------------------------- # Leds -------------------------------------------------------------------------------------
if with_led_chaser: if with_led_chaser:
@ -78,7 +69,7 @@ def main():
parser.add_argument("--build", action="store_true", help="Build bitstream") parser.add_argument("--build", action="store_true", help="Build bitstream")
parser.add_argument("--load", action="store_true", help="Load bitstream") parser.add_argument("--load", action="store_true", help="Load bitstream")
parser.add_argument("--flash", action="store_true", help="Flash bitstream") parser.add_argument("--flash", action="store_true", help="Flash bitstream")
parser.add_argument("--with-vga", action="store_true", help="Enagle VGA Terminal") parser.add_argument("--with-video-terminal", action="store_true", help="Enable Video Terminal")
parser.add_argument("--sys-clk-freq", default=100e6, help="System clock frequency (default: 100MHz)") parser.add_argument("--sys-clk-freq", default=100e6, help="System clock frequency (default: 100MHz)")
builder_args(parser) builder_args(parser)
@ -88,7 +79,7 @@ def main():
soc = BaseSoC( soc = BaseSoC(
sys_clk_freq = int(float(args.sys_clk_freq)), sys_clk_freq = int(float(args.sys_clk_freq)),
with_vga = args.with_vga, with_video_terminal = args.with_video_terminal,
**soc_core_argdict(args) **soc_core_argdict(args)
) )