diff --git a/misoclib/mem/sdram/core/__init__.py b/misoclib/mem/sdram/core/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/misoclib/mem/sdram/lasmicon/__init__.py b/misoclib/mem/sdram/core/lasmicon/__init__.py similarity index 89% rename from misoclib/mem/sdram/lasmicon/__init__.py rename to misoclib/mem/sdram/core/lasmicon/__init__.py index 94735d5b2..5fdd38cda 100644 --- a/misoclib/mem/sdram/lasmicon/__init__.py +++ b/misoclib/mem/sdram/core/lasmicon/__init__.py @@ -1,9 +1,9 @@ from migen.fhdl.std import * from misoclib.mem.sdram.bus import dfi, lasmibus -from misoclib.mem.sdram.lasmicon.refresher import * -from misoclib.mem.sdram.lasmicon.bankmachine import * -from misoclib.mem.sdram.lasmicon.multiplexer import * +from misoclib.mem.sdram.core.lasmicon.refresher import * +from misoclib.mem.sdram.core.lasmicon.bankmachine import * +from misoclib.mem.sdram.core.lasmicon.multiplexer import * class LASMIcon(Module): def __init__(self, phy, geom_settings, timing_settings): diff --git a/misoclib/mem/sdram/lasmicon/bankmachine.py b/misoclib/mem/sdram/core/lasmicon/bankmachine.py similarity index 98% rename from misoclib/mem/sdram/lasmicon/bankmachine.py rename to misoclib/mem/sdram/core/lasmicon/bankmachine.py index 3ee6c0832..3397bb36f 100644 --- a/misoclib/mem/sdram/lasmicon/bankmachine.py +++ b/misoclib/mem/sdram/core/lasmicon/bankmachine.py @@ -4,7 +4,7 @@ from migen.genlib.fsm import FSM, NextState from migen.genlib.misc import optree from migen.genlib.fifo import SyncFIFO -from misoclib.mem.sdram.lasmicon.multiplexer import * +from misoclib.mem.sdram.core.lasmicon.multiplexer import * class _AddressSlicer: def __init__(self, col_a, address_align): diff --git a/misoclib/mem/sdram/lasmicon/crossbar.py b/misoclib/mem/sdram/core/lasmicon/crossbar.py similarity index 100% rename from misoclib/mem/sdram/lasmicon/crossbar.py rename to misoclib/mem/sdram/core/lasmicon/crossbar.py diff --git a/misoclib/mem/sdram/lasmicon/multiplexer.py b/misoclib/mem/sdram/core/lasmicon/multiplexer.py similarity index 99% rename from misoclib/mem/sdram/lasmicon/multiplexer.py rename to misoclib/mem/sdram/core/lasmicon/multiplexer.py index 3f977efb6..c896480a9 100644 --- a/misoclib/mem/sdram/lasmicon/multiplexer.py +++ b/misoclib/mem/sdram/core/lasmicon/multiplexer.py @@ -4,7 +4,7 @@ from migen.genlib.misc import optree from migen.genlib.fsm import FSM, NextState from migen.bank.description import AutoCSR -from misoclib.mem.sdram.lasmicon.perf import Bandwidth +from misoclib.mem.sdram.core.lasmicon.perf import Bandwidth class CommandRequest: def __init__(self, a, ba): diff --git a/misoclib/mem/sdram/lasmicon/perf.py b/misoclib/mem/sdram/core/lasmicon/perf.py similarity index 100% rename from misoclib/mem/sdram/lasmicon/perf.py rename to misoclib/mem/sdram/core/lasmicon/perf.py diff --git a/misoclib/mem/sdram/lasmicon/refresher.py b/misoclib/mem/sdram/core/lasmicon/refresher.py similarity index 95% rename from misoclib/mem/sdram/lasmicon/refresher.py rename to misoclib/mem/sdram/core/lasmicon/refresher.py index 6313b2a15..e9c9d13a3 100644 --- a/misoclib/mem/sdram/lasmicon/refresher.py +++ b/misoclib/mem/sdram/core/lasmicon/refresher.py @@ -2,7 +2,7 @@ from migen.fhdl.std import * from migen.genlib.misc import timeline from migen.genlib.fsm import FSM -from misoclib.mem.sdram.lasmicon.multiplexer import * +from misoclib.mem.sdram.core.lasmicon.multiplexer import * class Refresher(Module): def __init__(self, a, ba, tRP, tREFI, tRFC): diff --git a/misoclib/mem/sdram/minicon/__init__.py b/misoclib/mem/sdram/core/minicon/__init__.py similarity index 100% rename from misoclib/mem/sdram/minicon/__init__.py rename to misoclib/mem/sdram/core/minicon/__init__.py diff --git a/misoclib/mem/sdram/test/bankmachine_tb.py b/misoclib/mem/sdram/test/bankmachine_tb.py index 12bdcd204..12ae5da0a 100644 --- a/misoclib/mem/sdram/test/bankmachine_tb.py +++ b/misoclib/mem/sdram/test/bankmachine_tb.py @@ -2,7 +2,7 @@ from migen.fhdl.std import * from migen.sim.generic import run_simulation from misoclib.mem.sdram.bus import lasmibus -from misoclib.mem.sdram.lasmicon.bankmachine import * +from misoclib.mem.sdram.core.lasmicon.bankmachine import * from common import sdram_phy, sdram_geom, sdram_timing, CommandLogger diff --git a/misoclib/mem/sdram/test/lasmicon_df_tb.py b/misoclib/mem/sdram/test/lasmicon_df_tb.py index 7f2f886b8..e06722f0c 100644 --- a/misoclib/mem/sdram/test/lasmicon_df_tb.py +++ b/misoclib/mem/sdram/test/lasmicon_df_tb.py @@ -2,7 +2,7 @@ from migen.fhdl.std import * from migen.sim.generic import run_simulation from misoclib.mem.sdram.bus import lasmibus -from misoclib.mem.sdram.lasmicon import * +from misoclib.mem.sdram.core.lasmicon import * from misoclib.mem.sdram.frontend import dma_lasmi from common import sdram_phy, sdram_geom, sdram_timing, DFILogger diff --git a/misoclib/mem/sdram/test/lasmicon_tb.py b/misoclib/mem/sdram/test/lasmicon_tb.py index af792bbfd..a102b07c5 100644 --- a/misoclib/mem/sdram/test/lasmicon_tb.py +++ b/misoclib/mem/sdram/test/lasmicon_tb.py @@ -2,7 +2,7 @@ from migen.fhdl.std import * from migen.sim.generic import run_simulation from misoclib.mem.sdram.bus import lasmibus -from misoclib.mem.sdram.lasmicon import * +from misoclib.mem.sdram.core.lasmicon import * from common import sdram_phy, sdram_geom, sdram_timing, DFILogger diff --git a/misoclib/mem/sdram/test/lasmicon_wb.py b/misoclib/mem/sdram/test/lasmicon_wb.py index 53fc7b876..978655dcb 100644 --- a/misoclib/mem/sdram/test/lasmicon_wb.py +++ b/misoclib/mem/sdram/test/lasmicon_wb.py @@ -4,7 +4,7 @@ from migen.bus.transactions import * from migen.sim.generic import run_simulation from misoclib.mem.sdram.bus import lasmibus -from misoclib.mem.sdram.lasmicon import * +from misoclib.mem.sdram.core.lasmicon import * from misoclib.mem.sdram.frontend import wishbone2lasmi from common import sdram_phy, sdram_geom, sdram_timing, DFILogger diff --git a/misoclib/mem/sdram/test/minicon_tb.py b/misoclib/mem/sdram/test/minicon_tb.py index abfb5e035..d309e669d 100644 --- a/misoclib/mem/sdram/test/minicon_tb.py +++ b/misoclib/mem/sdram/test/minicon_tb.py @@ -5,7 +5,7 @@ from migen.sim.generic import Simulator from migen.sim import icarus from mibuild.platforms import papilio_pro as board from misoclib import sdram -from misoclib.mem.sdram.minicon import Minicon +from misoclib.mem.sdram.core.minicon import Minicon from misoclib.mem.sdram.phy import gensdrphy from itertools import chain from os.path import isfile diff --git a/misoclib/mem/sdram/test/refresher.py b/misoclib/mem/sdram/test/refresher.py index 7845bf904..00caa497f 100644 --- a/misoclib/mem/sdram/test/refresher.py +++ b/misoclib/mem/sdram/test/refresher.py @@ -3,7 +3,7 @@ from random import Random from migen.fhdl.std import * from migen.sim.generic import run_simulation -from misoclib.mem.sdram.lasmicon.refresher import * +from misoclib.mem.sdram.core.lasmicon.refresher import * from common import CommandLogger diff --git a/misoclib/soc/sdram.py b/misoclib/soc/sdram.py index 5f49af59a..62c9b70c9 100644 --- a/misoclib/soc/sdram.py +++ b/misoclib/soc/sdram.py @@ -3,8 +3,8 @@ from migen.bus import wishbone, csr from misoclib.mem.sdram.bus import dfi, lasmibus from misoclib.mem.sdram.phy import dfii -from misoclib.mem.sdram import minicon, lasmicon -from misoclib.mem.sdram.lasmicon import crossbar +from misoclib.mem.sdram.core import minicon, lasmicon +from misoclib.mem.sdram.core.lasmicon import crossbar from misoclib.mem.sdram.frontend import memtest, wishbone2lasmi from misoclib.soc import SoC, mem_decoder