tang_nano_9k: Fix HyperRAM integration.

This commit is contained in:
Florent Kermarrec 2022-01-24 18:35:12 +01:00
parent 787f44e7d9
commit cc1b46f106

View file

@ -48,7 +48,7 @@ class _CRG(Module):
# BaseSoC ------------------------------------------------------------------------------------------ # BaseSoC ------------------------------------------------------------------------------------------
class BaseSoC(SoCCore): class BaseSoC(SoCCore):
def __init__(self, sys_clk_freq=int(27e6), bios_flash_offset=0x0, def __init__(self, sys_clk_freq=int(27e6), bios_flash_offset=0x0,
with_led_chaser=True, **kwargs): with_led_chaser=True, **kwargs):
platform = tang_nano_9k.Platform() platform = tang_nano_9k.Platform()
@ -76,28 +76,28 @@ class BaseSoC(SoCCore):
) )
self.cpu.set_reset_address(self.bus.regions["rom"].origin) self.cpu.set_reset_address(self.bus.regions["rom"].origin)
# HyperRam --------------------------------------------------------------------------------- # HyperRAM ---------------------------------------------------------------------------------
dq = platform.request("IO_psram_dq") if not self.integrated_main_ram_size:
rwds = platform.request("IO_psram_rwds") # TODO: Use second 32Mbit PSRAM chip.
reset_n = platform.request("O_psram_reset_n") dq = platform.request("IO_psram_dq")
cs_n = platform.request("O_psram_cs_n") rwds = platform.request("IO_psram_rwds")
ck = platform.request("O_psram_ck") reset_n = platform.request("O_psram_reset_n")
ck_n = platform.request("O_psram_ck_n") cs_n = platform.request("O_psram_cs_n")
class HyperRAMPads: ck = platform.request("O_psram_ck")
def __init__(self, n): ck_n = platform.request("O_psram_ck_n")
self.clk = Signal() class HyperRAMPads:
self.rst_n = reset_n[n] def __init__(self, n):
self.dq = dq[8*n:8*(n+1)] self.clk = Signal()
self.cs_n = cs_n[n] self.rst_n = reset_n[n]
self.rwds = rwds[n] self.dq = dq[8*n:8*(n+1)]
self.cs_n = cs_n[n]
self.rwds = rwds[n]
hyperram_pads = HyperRAMPads(0) hyperram_pads = HyperRAMPads(0)
self.comb += ck[0].eq(hyperram_pads.clk) self.comb += ck[0].eq(hyperram_pads.clk)
self.comb += ck_n[0].eq(~hyperram0_pads.clk) self.comb += ck_n[0].eq(~hyperram_pads.clk)
self.submodules.hyperram0 = HyperRAM(hyperram_pads) self.submodules.hyperram = HyperRAM(hyperram_pads)
self.bus.add_slave("main_ram", slave=self.hyperram.bus, self.bus.add_slave("main_ram", slave=self.hyperram.bus, region=SoCRegion(origin=self.mem_map["main_ram"], size=4*mB))
region=SoCRegion(origin=self.mem_map["main_ram"], size=4*mB))
# TODO: utilize another 32Mbit PSRAM chip
# Leds ------------------------------------------------------------------------------------- # Leds -------------------------------------------------------------------------------------
if with_led_chaser: if with_led_chaser: