Skip to content

Commit

Permalink
targets/hyperram: Switch Hyperram memory mode to rwx (required with V…
Browse files Browse the repository at this point in the history
…exiiRiscv).
  • Loading branch information
enjoy-digital committed Sep 4, 2024
1 parent 185f8d5 commit c8603be
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def __init__(self, *, sys_clk_freq=100e6, iodelay_clk_freq=200e6,
# HyperRAM ---------------------------------------------------------------------------------
if with_hyperram:
self.hyperram = HyperRAM(platform.request("hyperram"), sys_clk_freq=sys_clk_freq)
self.bus.add_slave("hyperram", slave=self.hyperram.bus, region=SoCRegion(origin=0x20000000, size=8 * MEGABYTE))
self.bus.add_slave("hyperram", slave=self.hyperram.bus, region=SoCRegion(origin=0x20000000, size=8 * MEGABYTE, mode="rwx"))

# SD Card ----------------------------------------------------------------------------------
if with_sdcard:
Expand Down
2 changes: 1 addition & 1 deletion litex_boards/targets/antmicro_lpddr4_test_board.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def __init__(self, *, sys_clk_freq=50e6, iodelay_clk_freq=200e6,
# HyperRAM ---------------------------------------------------------------------------------
if with_hyperram:
self.hyperram = HyperRAM(platform.request("hyperram"), sys_clk_freq=sys_clk_freq)
self.bus.add_slave("hyperram", slave=self.hyperram.bus, region=SoCRegion(origin=0x20000000, size=8 * MEGABYTE))
self.bus.add_slave("hyperram", slave=self.hyperram.bus, region=SoCRegion(origin=0x20000000, size=8 * MEGABYTE, mode="rwx"))

# SD Card ----------------------------------------------------------------------------------
if with_sdcard:
Expand Down
2 changes: 1 addition & 1 deletion litex_boards/targets/efinix_titanium_ti60_f225_dev_kit.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def __init__(self, sys_clk_freq=200e6,

# HyperRAM Bus/Slave Interface.
hyperram_bus = wishbone.Interface(data_width=32, address_width=32, addressing="word")
self.bus.add_slave(name="main_ram", slave=hyperram_bus, region=SoCRegion(origin=0x40000000, size=hyperram_size))
self.bus.add_slave(name="main_ram", slave=hyperram_bus, region=SoCRegion(origin=0x40000000, size=hyperram_size, mode="rwx"))

# HyperRAM L2 Cache.
hyperram_cache = wishbone.Cache(
Expand Down
3 changes: 1 addition & 2 deletions litex_boards/targets/lattice_crosslink_nx_vip.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ def __init__(self, sys_clk_freq=75e6, toolchain="radiant",
size = 8 * MEGABYTE
hr_pads = platform.request("hyperram", int(hyperram))
self.hyperram = HyperRAM(hr_pads, sys_clk_freq=sys_clk_freq)
self.bus.add_slave("sram", slave=self.hyperram.bus, region=SoCRegion(origin=self.mem_map["sram"],
size=size))
self.bus.add_slave("sram", slave=self.hyperram.bus, region=SoCRegion(origin=self.mem_map["sram"], size=size, mode="rwx"))

# Leds -------------------------------------------------------------------------------------
if with_led_chaser:
Expand Down
2 changes: 1 addition & 1 deletion litex_boards/targets/sipeed_tang_nano_4k.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def __init__(self):
self.comb += platform.request("O_hpram_ck").eq(hyperram_pads.clk)
self.comb += platform.request("O_hpram_ck_n").eq(~hyperram_pads.clk)
self.hyperram = HyperRAM(hyperram_pads, sys_clk_freq=sys_clk_freq)
self.bus.add_slave("main_ram", slave=self.hyperram.bus, region=SoCRegion(origin=0x40000000, size=8 * MEGABYTE))
self.bus.add_slave("main_ram", slave=self.hyperram.bus, region=SoCRegion(origin=0x40000000, size=8 * MEGABYTE, mode="rwx"))

# Video ------------------------------------------------------------------------------------
if with_video_terminal:
Expand Down
2 changes: 1 addition & 1 deletion litex_boards/targets/sipeed_tang_nano_9k.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def __init__(self, n):
os.system("mv hyperbus.py.txt hyperbus.py")
from hyperbus import HyperRAM
self.hyperram = HyperRAM(hyperram_pads)
self.bus.add_slave("main_ram", slave=self.hyperram.bus, region=SoCRegion(origin=self.mem_map["main_ram"], size=4 * MEGABYTE))
self.bus.add_slave("main_ram", slave=self.hyperram.bus, region=SoCRegion(origin=self.mem_map["main_ram"], size=4 * MEGABYTE, mode="rwx"))

# Video ------------------------------------------------------------------------------------
if with_video_terminal:
Expand Down
2 changes: 1 addition & 1 deletion litex_boards/targets/trenz_c10lprefkit.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def __init__(self, sys_clk_freq=50e6,

# HyperRam ---------------------------------------------------------------------------------
self.hyperram = HyperRAM(platform.request("hyperram"), sys_clk_freq=sys_clk_freq)
self.bus.add_slave("hyperram", slave=self.hyperram.bus, region=SoCRegion(origin=0x20000000, size=8 * MEGABYTE))
self.bus.add_slave("hyperram", slave=self.hyperram.bus, region=SoCRegion(origin=0x20000000, size=8 * MEGABYTE, mode="rwx"))

# SDR SDRAM --------------------------------------------------------------------------------
if not self.integrated_main_ram_size:
Expand Down
2 changes: 1 addition & 1 deletion litex_boards/targets/trenz_te0725.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def __init__(self, sys_clk_freq=100e6, with_led_chaser=True, **kwargs):
size = int((64 * MEGABYTE) / 8)
hr_pads = platform.request("hyperram", 0)
self.hyperram = HyperRAM(hr_pads, sys_clk_freq=sys_clk_freq)
self.bus.add_slave("hyperram", slave=self.hyperram.bus, region=SoCRegion(origin=0x20000000, size=size))
self.bus.add_slave("hyperram", slave=self.hyperram.bus, region=SoCRegion(origin=0x20000000, size=size, mode="rwx"))

# Leds -------------------------------------------------------------------------------------
if with_led_chaser:
Expand Down

0 comments on commit c8603be

Please sign in to comment.