diff --git a/.gitignore b/litex/soc/.gitignore similarity index 100% rename from .gitignore rename to litex/soc/.gitignore diff --git a/.gitmodules b/litex/soc/.gitmodules similarity index 100% rename from .gitmodules rename to litex/soc/.gitmodules diff --git a/.travis.yml b/litex/soc/.travis.yml similarity index 100% rename from .travis.yml rename to litex/soc/.travis.yml diff --git a/CONTRIBUTING.rst b/litex/soc/CONTRIBUTING.rst similarity index 100% rename from CONTRIBUTING.rst rename to litex/soc/CONTRIBUTING.rst diff --git a/LICENSE b/litex/soc/LICENSE similarity index 100% rename from LICENSE rename to litex/soc/LICENSE diff --git a/MANIFEST.in b/litex/soc/MANIFEST.in similarity index 100% rename from MANIFEST.in rename to litex/soc/MANIFEST.in diff --git a/README b/litex/soc/README similarity index 100% rename from README rename to litex/soc/README diff --git a/conda/misoc/bld.bat b/litex/soc/conda/misoc/bld.bat similarity index 100% rename from conda/misoc/bld.bat rename to litex/soc/conda/misoc/bld.bat diff --git a/conda/misoc/meta.yaml b/litex/soc/conda/misoc/meta.yaml similarity index 100% rename from conda/misoc/meta.yaml rename to litex/soc/conda/misoc/meta.yaml diff --git a/misoc/__init__.py b/litex/soc/misoc/__init__.py similarity index 100% rename from misoc/__init__.py rename to litex/soc/misoc/__init__.py diff --git a/misoc/cores/__init__.py b/litex/soc/misoc/cores/__init__.py similarity index 100% rename from misoc/cores/__init__.py rename to litex/soc/misoc/cores/__init__.py diff --git a/misoc/cores/dfii.py b/litex/soc/misoc/cores/dfii.py similarity index 100% rename from misoc/cores/dfii.py rename to litex/soc/misoc/cores/dfii.py diff --git a/misoc/cores/dvi_sampler/__init__.py b/litex/soc/misoc/cores/dvi_sampler/__init__.py similarity index 100% rename from misoc/cores/dvi_sampler/__init__.py rename to litex/soc/misoc/cores/dvi_sampler/__init__.py diff --git a/misoc/cores/dvi_sampler/analysis.py b/litex/soc/misoc/cores/dvi_sampler/analysis.py similarity index 100% rename from misoc/cores/dvi_sampler/analysis.py rename to litex/soc/misoc/cores/dvi_sampler/analysis.py diff --git a/misoc/cores/dvi_sampler/chansync.py b/litex/soc/misoc/cores/dvi_sampler/chansync.py similarity index 100% rename from misoc/cores/dvi_sampler/chansync.py rename to litex/soc/misoc/cores/dvi_sampler/chansync.py diff --git a/misoc/cores/dvi_sampler/charsync.py b/litex/soc/misoc/cores/dvi_sampler/charsync.py similarity index 100% rename from misoc/cores/dvi_sampler/charsync.py rename to litex/soc/misoc/cores/dvi_sampler/charsync.py diff --git a/misoc/cores/dvi_sampler/clocking.py b/litex/soc/misoc/cores/dvi_sampler/clocking.py similarity index 100% rename from misoc/cores/dvi_sampler/clocking.py rename to litex/soc/misoc/cores/dvi_sampler/clocking.py diff --git a/misoc/cores/dvi_sampler/common.py b/litex/soc/misoc/cores/dvi_sampler/common.py similarity index 100% rename from misoc/cores/dvi_sampler/common.py rename to litex/soc/misoc/cores/dvi_sampler/common.py diff --git a/misoc/cores/dvi_sampler/core.py b/litex/soc/misoc/cores/dvi_sampler/core.py similarity index 100% rename from misoc/cores/dvi_sampler/core.py rename to litex/soc/misoc/cores/dvi_sampler/core.py diff --git a/misoc/cores/dvi_sampler/datacapture.py b/litex/soc/misoc/cores/dvi_sampler/datacapture.py similarity index 100% rename from misoc/cores/dvi_sampler/datacapture.py rename to litex/soc/misoc/cores/dvi_sampler/datacapture.py diff --git a/misoc/cores/dvi_sampler/debug.py b/litex/soc/misoc/cores/dvi_sampler/debug.py similarity index 100% rename from misoc/cores/dvi_sampler/debug.py rename to litex/soc/misoc/cores/dvi_sampler/debug.py diff --git a/misoc/cores/dvi_sampler/decoding.py b/litex/soc/misoc/cores/dvi_sampler/decoding.py similarity index 100% rename from misoc/cores/dvi_sampler/decoding.py rename to litex/soc/misoc/cores/dvi_sampler/decoding.py diff --git a/misoc/cores/dvi_sampler/dma.py b/litex/soc/misoc/cores/dvi_sampler/dma.py similarity index 100% rename from misoc/cores/dvi_sampler/dma.py rename to litex/soc/misoc/cores/dvi_sampler/dma.py diff --git a/misoc/cores/dvi_sampler/edid.py b/litex/soc/misoc/cores/dvi_sampler/edid.py similarity index 100% rename from misoc/cores/dvi_sampler/edid.py rename to litex/soc/misoc/cores/dvi_sampler/edid.py diff --git a/misoc/cores/dvi_sampler/wer.py b/litex/soc/misoc/cores/dvi_sampler/wer.py similarity index 100% rename from misoc/cores/dvi_sampler/wer.py rename to litex/soc/misoc/cores/dvi_sampler/wer.py diff --git a/misoc/cores/framebuffer/__init__.py b/litex/soc/misoc/cores/framebuffer/__init__.py similarity index 100% rename from misoc/cores/framebuffer/__init__.py rename to litex/soc/misoc/cores/framebuffer/__init__.py diff --git a/misoc/cores/framebuffer/core.py b/litex/soc/misoc/cores/framebuffer/core.py similarity index 100% rename from misoc/cores/framebuffer/core.py rename to litex/soc/misoc/cores/framebuffer/core.py diff --git a/misoc/cores/framebuffer/dvi.py b/litex/soc/misoc/cores/framebuffer/dvi.py similarity index 100% rename from misoc/cores/framebuffer/dvi.py rename to litex/soc/misoc/cores/framebuffer/dvi.py diff --git a/misoc/cores/framebuffer/format.py b/litex/soc/misoc/cores/framebuffer/format.py similarity index 100% rename from misoc/cores/framebuffer/format.py rename to litex/soc/misoc/cores/framebuffer/format.py diff --git a/misoc/cores/framebuffer/phy.py b/litex/soc/misoc/cores/framebuffer/phy.py similarity index 100% rename from misoc/cores/framebuffer/phy.py rename to litex/soc/misoc/cores/framebuffer/phy.py diff --git a/misoc/cores/gpio.py b/litex/soc/misoc/cores/gpio.py similarity index 100% rename from misoc/cores/gpio.py rename to litex/soc/misoc/cores/gpio.py diff --git a/misoc/cores/identifier.py b/litex/soc/misoc/cores/identifier.py similarity index 100% rename from misoc/cores/identifier.py rename to litex/soc/misoc/cores/identifier.py diff --git a/misoc/cores/lasmicon/__init__.py b/litex/soc/misoc/cores/lasmicon/__init__.py similarity index 100% rename from misoc/cores/lasmicon/__init__.py rename to litex/soc/misoc/cores/lasmicon/__init__.py diff --git a/misoc/cores/lasmicon/bankmachine.py b/litex/soc/misoc/cores/lasmicon/bankmachine.py similarity index 100% rename from misoc/cores/lasmicon/bankmachine.py rename to litex/soc/misoc/cores/lasmicon/bankmachine.py diff --git a/misoc/cores/lasmicon/core.py b/litex/soc/misoc/cores/lasmicon/core.py similarity index 100% rename from misoc/cores/lasmicon/core.py rename to litex/soc/misoc/cores/lasmicon/core.py diff --git a/misoc/cores/lasmicon/multiplexer.py b/litex/soc/misoc/cores/lasmicon/multiplexer.py similarity index 100% rename from misoc/cores/lasmicon/multiplexer.py rename to litex/soc/misoc/cores/lasmicon/multiplexer.py diff --git a/misoc/cores/lasmicon/perf.py b/litex/soc/misoc/cores/lasmicon/perf.py similarity index 100% rename from misoc/cores/lasmicon/perf.py rename to litex/soc/misoc/cores/lasmicon/perf.py diff --git a/misoc/cores/lasmicon/refresher.py b/litex/soc/misoc/cores/lasmicon/refresher.py similarity index 100% rename from misoc/cores/lasmicon/refresher.py rename to litex/soc/misoc/cores/lasmicon/refresher.py diff --git a/misoc/cores/lasmicon/test_bankmachine.py b/litex/soc/misoc/cores/lasmicon/test_bankmachine.py similarity index 100% rename from misoc/cores/lasmicon/test_bankmachine.py rename to litex/soc/misoc/cores/lasmicon/test_bankmachine.py diff --git a/misoc/cores/lasmicon/test_common.py b/litex/soc/misoc/cores/lasmicon/test_common.py similarity index 100% rename from misoc/cores/lasmicon/test_common.py rename to litex/soc/misoc/cores/lasmicon/test_common.py diff --git a/misoc/cores/lasmicon/test_df.py b/litex/soc/misoc/cores/lasmicon/test_df.py similarity index 100% rename from misoc/cores/lasmicon/test_df.py rename to litex/soc/misoc/cores/lasmicon/test_df.py diff --git a/misoc/cores/lasmicon/test_lasmi.py b/litex/soc/misoc/cores/lasmicon/test_lasmi.py similarity index 100% rename from misoc/cores/lasmicon/test_lasmi.py rename to litex/soc/misoc/cores/lasmicon/test_lasmi.py diff --git a/misoc/cores/lasmicon/test_refresher.py b/litex/soc/misoc/cores/lasmicon/test_refresher.py similarity index 100% rename from misoc/cores/lasmicon/test_refresher.py rename to litex/soc/misoc/cores/lasmicon/test_refresher.py diff --git a/misoc/cores/lasmicon/test_wb.py b/litex/soc/misoc/cores/lasmicon/test_wb.py similarity index 100% rename from misoc/cores/lasmicon/test_wb.py rename to litex/soc/misoc/cores/lasmicon/test_wb.py diff --git a/misoc/cores/liteeth_mini/LICENSE b/litex/soc/misoc/cores/liteeth_mini/LICENSE similarity index 100% rename from misoc/cores/liteeth_mini/LICENSE rename to litex/soc/misoc/cores/liteeth_mini/LICENSE diff --git a/misoc/cores/liteeth_mini/README b/litex/soc/misoc/cores/liteeth_mini/README similarity index 100% rename from misoc/cores/liteeth_mini/README rename to litex/soc/misoc/cores/liteeth_mini/README diff --git a/misoc/cores/liteeth_mini/__init__.py b/litex/soc/misoc/cores/liteeth_mini/__init__.py similarity index 100% rename from misoc/cores/liteeth_mini/__init__.py rename to litex/soc/misoc/cores/liteeth_mini/__init__.py diff --git a/misoc/cores/liteeth_mini/common.py b/litex/soc/misoc/cores/liteeth_mini/common.py similarity index 100% rename from misoc/cores/liteeth_mini/common.py rename to litex/soc/misoc/cores/liteeth_mini/common.py diff --git a/misoc/cores/liteeth_mini/mac/__init__.py b/litex/soc/misoc/cores/liteeth_mini/mac/__init__.py similarity index 100% rename from misoc/cores/liteeth_mini/mac/__init__.py rename to litex/soc/misoc/cores/liteeth_mini/mac/__init__.py diff --git a/misoc/cores/liteeth_mini/mac/core/__init__.py b/litex/soc/misoc/cores/liteeth_mini/mac/core/__init__.py similarity index 100% rename from misoc/cores/liteeth_mini/mac/core/__init__.py rename to litex/soc/misoc/cores/liteeth_mini/mac/core/__init__.py diff --git a/misoc/cores/liteeth_mini/mac/core/crc.py b/litex/soc/misoc/cores/liteeth_mini/mac/core/crc.py similarity index 100% rename from misoc/cores/liteeth_mini/mac/core/crc.py rename to litex/soc/misoc/cores/liteeth_mini/mac/core/crc.py diff --git a/misoc/cores/liteeth_mini/mac/core/gap.py b/litex/soc/misoc/cores/liteeth_mini/mac/core/gap.py similarity index 100% rename from misoc/cores/liteeth_mini/mac/core/gap.py rename to litex/soc/misoc/cores/liteeth_mini/mac/core/gap.py diff --git a/misoc/cores/liteeth_mini/mac/core/last_be.py b/litex/soc/misoc/cores/liteeth_mini/mac/core/last_be.py similarity index 100% rename from misoc/cores/liteeth_mini/mac/core/last_be.py rename to litex/soc/misoc/cores/liteeth_mini/mac/core/last_be.py diff --git a/misoc/cores/liteeth_mini/mac/core/padding.py b/litex/soc/misoc/cores/liteeth_mini/mac/core/padding.py similarity index 100% rename from misoc/cores/liteeth_mini/mac/core/padding.py rename to litex/soc/misoc/cores/liteeth_mini/mac/core/padding.py diff --git a/misoc/cores/liteeth_mini/mac/core/preamble.py b/litex/soc/misoc/cores/liteeth_mini/mac/core/preamble.py similarity index 100% rename from misoc/cores/liteeth_mini/mac/core/preamble.py rename to litex/soc/misoc/cores/liteeth_mini/mac/core/preamble.py diff --git a/misoc/cores/liteeth_mini/mac/frontend/__init__.py b/litex/soc/misoc/cores/liteeth_mini/mac/frontend/__init__.py similarity index 100% rename from misoc/cores/liteeth_mini/mac/frontend/__init__.py rename to litex/soc/misoc/cores/liteeth_mini/mac/frontend/__init__.py diff --git a/misoc/cores/liteeth_mini/mac/frontend/sram.py b/litex/soc/misoc/cores/liteeth_mini/mac/frontend/sram.py similarity index 100% rename from misoc/cores/liteeth_mini/mac/frontend/sram.py rename to litex/soc/misoc/cores/liteeth_mini/mac/frontend/sram.py diff --git a/misoc/cores/liteeth_mini/mac/frontend/wishbone.py b/litex/soc/misoc/cores/liteeth_mini/mac/frontend/wishbone.py similarity index 100% rename from misoc/cores/liteeth_mini/mac/frontend/wishbone.py rename to litex/soc/misoc/cores/liteeth_mini/mac/frontend/wishbone.py diff --git a/misoc/cores/liteeth_mini/phy/__init__.py b/litex/soc/misoc/cores/liteeth_mini/phy/__init__.py similarity index 100% rename from misoc/cores/liteeth_mini/phy/__init__.py rename to litex/soc/misoc/cores/liteeth_mini/phy/__init__.py diff --git a/misoc/cores/liteeth_mini/phy/gmii.py b/litex/soc/misoc/cores/liteeth_mini/phy/gmii.py similarity index 100% rename from misoc/cores/liteeth_mini/phy/gmii.py rename to litex/soc/misoc/cores/liteeth_mini/phy/gmii.py diff --git a/misoc/cores/liteeth_mini/phy/gmii_mii.py b/litex/soc/misoc/cores/liteeth_mini/phy/gmii_mii.py similarity index 100% rename from misoc/cores/liteeth_mini/phy/gmii_mii.py rename to litex/soc/misoc/cores/liteeth_mini/phy/gmii_mii.py diff --git a/misoc/cores/liteeth_mini/phy/loopback.py b/litex/soc/misoc/cores/liteeth_mini/phy/loopback.py similarity index 100% rename from misoc/cores/liteeth_mini/phy/loopback.py rename to litex/soc/misoc/cores/liteeth_mini/phy/loopback.py diff --git a/misoc/cores/liteeth_mini/phy/mii.py b/litex/soc/misoc/cores/liteeth_mini/phy/mii.py similarity index 100% rename from misoc/cores/liteeth_mini/phy/mii.py rename to litex/soc/misoc/cores/liteeth_mini/phy/mii.py diff --git a/misoc/cores/liteeth_mini/phy/s6rgmii.py b/litex/soc/misoc/cores/liteeth_mini/phy/s6rgmii.py similarity index 100% rename from misoc/cores/liteeth_mini/phy/s6rgmii.py rename to litex/soc/misoc/cores/liteeth_mini/phy/s6rgmii.py diff --git a/misoc/cores/lm32/__init__.py b/litex/soc/misoc/cores/lm32/__init__.py similarity index 100% rename from misoc/cores/lm32/__init__.py rename to litex/soc/misoc/cores/lm32/__init__.py diff --git a/misoc/cores/lm32/core.py b/litex/soc/misoc/cores/lm32/core.py similarity index 100% rename from misoc/cores/lm32/core.py rename to litex/soc/misoc/cores/lm32/core.py diff --git a/misoc/cores/lm32/verilog/lm32_config.v b/litex/soc/misoc/cores/lm32/verilog/lm32_config.v similarity index 100% rename from misoc/cores/lm32/verilog/lm32_config.v rename to litex/soc/misoc/cores/lm32/verilog/lm32_config.v diff --git a/misoc/cores/minicon/__init__.py b/litex/soc/misoc/cores/minicon/__init__.py similarity index 100% rename from misoc/cores/minicon/__init__.py rename to litex/soc/misoc/cores/minicon/__init__.py diff --git a/misoc/cores/minicon/core.py b/litex/soc/misoc/cores/minicon/core.py similarity index 100% rename from misoc/cores/minicon/core.py rename to litex/soc/misoc/cores/minicon/core.py diff --git a/misoc/cores/minicon/test.py b/litex/soc/misoc/cores/minicon/test.py similarity index 100% rename from misoc/cores/minicon/test.py rename to litex/soc/misoc/cores/minicon/test.py diff --git a/misoc/cores/mor1kx/__init__.py b/litex/soc/misoc/cores/mor1kx/__init__.py similarity index 100% rename from misoc/cores/mor1kx/__init__.py rename to litex/soc/misoc/cores/mor1kx/__init__.py diff --git a/misoc/cores/mor1kx/core.py b/litex/soc/misoc/cores/mor1kx/core.py similarity index 100% rename from misoc/cores/mor1kx/core.py rename to litex/soc/misoc/cores/mor1kx/core.py diff --git a/misoc/cores/mxcrg.v b/litex/soc/misoc/cores/mxcrg.v similarity index 100% rename from misoc/cores/mxcrg.v rename to litex/soc/misoc/cores/mxcrg.v diff --git a/misoc/cores/nor_flash_16.py b/litex/soc/misoc/cores/nor_flash_16.py similarity index 100% rename from misoc/cores/nor_flash_16.py rename to litex/soc/misoc/cores/nor_flash_16.py diff --git a/misoc/cores/sdram_model.py b/litex/soc/misoc/cores/sdram_model.py similarity index 100% rename from misoc/cores/sdram_model.py rename to litex/soc/misoc/cores/sdram_model.py diff --git a/misoc/cores/sdram_phy/__init__.py b/litex/soc/misoc/cores/sdram_phy/__init__.py similarity index 100% rename from misoc/cores/sdram_phy/__init__.py rename to litex/soc/misoc/cores/sdram_phy/__init__.py diff --git a/misoc/cores/sdram_phy/gensdrphy.py b/litex/soc/misoc/cores/sdram_phy/gensdrphy.py similarity index 100% rename from misoc/cores/sdram_phy/gensdrphy.py rename to litex/soc/misoc/cores/sdram_phy/gensdrphy.py diff --git a/misoc/cores/sdram_phy/k7ddrphy.py b/litex/soc/misoc/cores/sdram_phy/k7ddrphy.py similarity index 100% rename from misoc/cores/sdram_phy/k7ddrphy.py rename to litex/soc/misoc/cores/sdram_phy/k7ddrphy.py diff --git a/misoc/cores/sdram_phy/s6ddrphy.py b/litex/soc/misoc/cores/sdram_phy/s6ddrphy.py similarity index 100% rename from misoc/cores/sdram_phy/s6ddrphy.py rename to litex/soc/misoc/cores/sdram_phy/s6ddrphy.py diff --git a/misoc/cores/sdram_settings.py b/litex/soc/misoc/cores/sdram_settings.py similarity index 100% rename from misoc/cores/sdram_settings.py rename to litex/soc/misoc/cores/sdram_settings.py diff --git a/misoc/cores/sdram_tester.py b/litex/soc/misoc/cores/sdram_tester.py similarity index 100% rename from misoc/cores/sdram_tester.py rename to litex/soc/misoc/cores/sdram_tester.py diff --git a/misoc/cores/spi/__init__.py b/litex/soc/misoc/cores/spi/__init__.py similarity index 100% rename from misoc/cores/spi/__init__.py rename to litex/soc/misoc/cores/spi/__init__.py diff --git a/misoc/cores/spi/core.py b/litex/soc/misoc/cores/spi/core.py similarity index 100% rename from misoc/cores/spi/core.py rename to litex/soc/misoc/cores/spi/core.py diff --git a/misoc/cores/spi/test.py b/litex/soc/misoc/cores/spi/test.py similarity index 100% rename from misoc/cores/spi/test.py rename to litex/soc/misoc/cores/spi/test.py diff --git a/misoc/cores/spi_flash.py b/litex/soc/misoc/cores/spi_flash.py similarity index 100% rename from misoc/cores/spi_flash.py rename to litex/soc/misoc/cores/spi_flash.py diff --git a/misoc/cores/timer.py b/litex/soc/misoc/cores/timer.py similarity index 100% rename from misoc/cores/timer.py rename to litex/soc/misoc/cores/timer.py diff --git a/misoc/cores/uart/__init__.py b/litex/soc/misoc/cores/uart/__init__.py similarity index 100% rename from misoc/cores/uart/__init__.py rename to litex/soc/misoc/cores/uart/__init__.py diff --git a/misoc/cores/uart/core.py b/litex/soc/misoc/cores/uart/core.py similarity index 100% rename from misoc/cores/uart/core.py rename to litex/soc/misoc/cores/uart/core.py diff --git a/misoc/cores/uart/test.py b/litex/soc/misoc/cores/uart/test.py similarity index 100% rename from misoc/cores/uart/test.py rename to litex/soc/misoc/cores/uart/test.py diff --git a/misoc/integration/__init__.py b/litex/soc/misoc/integration/__init__.py similarity index 100% rename from misoc/integration/__init__.py rename to litex/soc/misoc/integration/__init__.py diff --git a/misoc/integration/builder.py b/litex/soc/misoc/integration/builder.py similarity index 100% rename from misoc/integration/builder.py rename to litex/soc/misoc/integration/builder.py diff --git a/misoc/integration/cpu_interface.py b/litex/soc/misoc/integration/cpu_interface.py similarity index 100% rename from misoc/integration/cpu_interface.py rename to litex/soc/misoc/integration/cpu_interface.py diff --git a/misoc/integration/sdram_init.py b/litex/soc/misoc/integration/sdram_init.py similarity index 100% rename from misoc/integration/sdram_init.py rename to litex/soc/misoc/integration/sdram_init.py diff --git a/misoc/integration/soc_core.py b/litex/soc/misoc/integration/soc_core.py similarity index 100% rename from misoc/integration/soc_core.py rename to litex/soc/misoc/integration/soc_core.py diff --git a/misoc/integration/soc_sdram.py b/litex/soc/misoc/integration/soc_sdram.py similarity index 100% rename from misoc/integration/soc_sdram.py rename to litex/soc/misoc/integration/soc_sdram.py diff --git a/misoc/interconnect/__init__.py b/litex/soc/misoc/interconnect/__init__.py similarity index 100% rename from misoc/interconnect/__init__.py rename to litex/soc/misoc/interconnect/__init__.py diff --git a/misoc/interconnect/csr.py b/litex/soc/misoc/interconnect/csr.py similarity index 100% rename from misoc/interconnect/csr.py rename to litex/soc/misoc/interconnect/csr.py diff --git a/misoc/interconnect/csr_bus.py b/litex/soc/misoc/interconnect/csr_bus.py similarity index 100% rename from misoc/interconnect/csr_bus.py rename to litex/soc/misoc/interconnect/csr_bus.py diff --git a/misoc/interconnect/csr_eventmanager.py b/litex/soc/misoc/interconnect/csr_eventmanager.py similarity index 100% rename from misoc/interconnect/csr_eventmanager.py rename to litex/soc/misoc/interconnect/csr_eventmanager.py diff --git a/misoc/interconnect/dfi.py b/litex/soc/misoc/interconnect/dfi.py similarity index 100% rename from misoc/interconnect/dfi.py rename to litex/soc/misoc/interconnect/dfi.py diff --git a/misoc/interconnect/dma_lasmi.py b/litex/soc/misoc/interconnect/dma_lasmi.py similarity index 100% rename from misoc/interconnect/dma_lasmi.py rename to litex/soc/misoc/interconnect/dma_lasmi.py diff --git a/misoc/interconnect/lasmi_bus.py b/litex/soc/misoc/interconnect/lasmi_bus.py similarity index 100% rename from misoc/interconnect/lasmi_bus.py rename to litex/soc/misoc/interconnect/lasmi_bus.py diff --git a/misoc/interconnect/stream.py b/litex/soc/misoc/interconnect/stream.py similarity index 100% rename from misoc/interconnect/stream.py rename to litex/soc/misoc/interconnect/stream.py diff --git a/misoc/interconnect/wishbone.py b/litex/soc/misoc/interconnect/wishbone.py similarity index 100% rename from misoc/interconnect/wishbone.py rename to litex/soc/misoc/interconnect/wishbone.py diff --git a/misoc/interconnect/wishbone2csr.py b/litex/soc/misoc/interconnect/wishbone2csr.py similarity index 100% rename from misoc/interconnect/wishbone2csr.py rename to litex/soc/misoc/interconnect/wishbone2csr.py diff --git a/misoc/interconnect/wishbone2lasmi.py b/litex/soc/misoc/interconnect/wishbone2lasmi.py similarity index 100% rename from misoc/interconnect/wishbone2lasmi.py rename to litex/soc/misoc/interconnect/wishbone2lasmi.py diff --git a/misoc/software/bios/Makefile b/litex/soc/misoc/software/bios/Makefile similarity index 100% rename from misoc/software/bios/Makefile rename to litex/soc/misoc/software/bios/Makefile diff --git a/misoc/software/bios/boot-helper-lm32.S b/litex/soc/misoc/software/bios/boot-helper-lm32.S similarity index 100% rename from misoc/software/bios/boot-helper-lm32.S rename to litex/soc/misoc/software/bios/boot-helper-lm32.S diff --git a/misoc/software/bios/boot-helper-or1k.S b/litex/soc/misoc/software/bios/boot-helper-or1k.S similarity index 100% rename from misoc/software/bios/boot-helper-or1k.S rename to litex/soc/misoc/software/bios/boot-helper-or1k.S diff --git a/misoc/software/bios/boot.c b/litex/soc/misoc/software/bios/boot.c similarity index 100% rename from misoc/software/bios/boot.c rename to litex/soc/misoc/software/bios/boot.c diff --git a/misoc/software/bios/boot.h b/litex/soc/misoc/software/bios/boot.h similarity index 100% rename from misoc/software/bios/boot.h rename to litex/soc/misoc/software/bios/boot.h diff --git a/misoc/software/bios/dataflow.c b/litex/soc/misoc/software/bios/dataflow.c similarity index 100% rename from misoc/software/bios/dataflow.c rename to litex/soc/misoc/software/bios/dataflow.c diff --git a/misoc/software/bios/dataflow.h b/litex/soc/misoc/software/bios/dataflow.h similarity index 100% rename from misoc/software/bios/dataflow.h rename to litex/soc/misoc/software/bios/dataflow.h diff --git a/misoc/software/bios/isr.c b/litex/soc/misoc/software/bios/isr.c similarity index 100% rename from misoc/software/bios/isr.c rename to litex/soc/misoc/software/bios/isr.c diff --git a/misoc/software/bios/linker.ld b/litex/soc/misoc/software/bios/linker.ld similarity index 100% rename from misoc/software/bios/linker.ld rename to litex/soc/misoc/software/bios/linker.ld diff --git a/misoc/software/bios/main.c b/litex/soc/misoc/software/bios/main.c similarity index 100% rename from misoc/software/bios/main.c rename to litex/soc/misoc/software/bios/main.c diff --git a/misoc/software/bios/sdram.c b/litex/soc/misoc/software/bios/sdram.c similarity index 100% rename from misoc/software/bios/sdram.c rename to litex/soc/misoc/software/bios/sdram.c diff --git a/misoc/software/bios/sdram.h b/litex/soc/misoc/software/bios/sdram.h similarity index 100% rename from misoc/software/bios/sdram.h rename to litex/soc/misoc/software/bios/sdram.h diff --git a/misoc/software/bios/sfl.h b/litex/soc/misoc/software/bios/sfl.h similarity index 100% rename from misoc/software/bios/sfl.h rename to litex/soc/misoc/software/bios/sfl.h diff --git a/misoc/software/common.mak b/litex/soc/misoc/software/common.mak similarity index 100% rename from misoc/software/common.mak rename to litex/soc/misoc/software/common.mak diff --git a/misoc/software/include/base/assert.h b/litex/soc/misoc/software/include/base/assert.h similarity index 100% rename from misoc/software/include/base/assert.h rename to litex/soc/misoc/software/include/base/assert.h diff --git a/misoc/software/include/base/console.h b/litex/soc/misoc/software/include/base/console.h similarity index 100% rename from misoc/software/include/base/console.h rename to litex/soc/misoc/software/include/base/console.h diff --git a/misoc/software/include/base/crc.h b/litex/soc/misoc/software/include/base/crc.h similarity index 100% rename from misoc/software/include/base/crc.h rename to litex/soc/misoc/software/include/base/crc.h diff --git a/misoc/software/include/base/ctype.h b/litex/soc/misoc/software/include/base/ctype.h similarity index 100% rename from misoc/software/include/base/ctype.h rename to litex/soc/misoc/software/include/base/ctype.h diff --git a/misoc/software/include/base/endian.h b/litex/soc/misoc/software/include/base/endian.h similarity index 100% rename from misoc/software/include/base/endian.h rename to litex/soc/misoc/software/include/base/endian.h diff --git a/misoc/software/include/base/errno.h b/litex/soc/misoc/software/include/base/errno.h similarity index 100% rename from misoc/software/include/base/errno.h rename to litex/soc/misoc/software/include/base/errno.h diff --git a/misoc/software/include/base/float.h b/litex/soc/misoc/software/include/base/float.h similarity index 100% rename from misoc/software/include/base/float.h rename to litex/soc/misoc/software/include/base/float.h diff --git a/misoc/software/include/base/id.h b/litex/soc/misoc/software/include/base/id.h similarity index 100% rename from misoc/software/include/base/id.h rename to litex/soc/misoc/software/include/base/id.h diff --git a/misoc/software/include/base/inttypes.h b/litex/soc/misoc/software/include/base/inttypes.h similarity index 100% rename from misoc/software/include/base/inttypes.h rename to litex/soc/misoc/software/include/base/inttypes.h diff --git a/misoc/software/include/base/irq.h b/litex/soc/misoc/software/include/base/irq.h similarity index 100% rename from misoc/software/include/base/irq.h rename to litex/soc/misoc/software/include/base/irq.h diff --git a/misoc/software/include/base/limits.h b/litex/soc/misoc/software/include/base/limits.h similarity index 100% rename from misoc/software/include/base/limits.h rename to litex/soc/misoc/software/include/base/limits.h diff --git a/misoc/software/include/base/pthread.h b/litex/soc/misoc/software/include/base/pthread.h similarity index 100% rename from misoc/software/include/base/pthread.h rename to litex/soc/misoc/software/include/base/pthread.h diff --git a/misoc/software/include/base/spiflash.h b/litex/soc/misoc/software/include/base/spiflash.h similarity index 100% rename from misoc/software/include/base/spiflash.h rename to litex/soc/misoc/software/include/base/spiflash.h diff --git a/misoc/software/include/base/spr-defs.h b/litex/soc/misoc/software/include/base/spr-defs.h similarity index 100% rename from misoc/software/include/base/spr-defs.h rename to litex/soc/misoc/software/include/base/spr-defs.h diff --git a/misoc/software/include/base/stdarg.h b/litex/soc/misoc/software/include/base/stdarg.h similarity index 100% rename from misoc/software/include/base/stdarg.h rename to litex/soc/misoc/software/include/base/stdarg.h diff --git a/misoc/software/include/base/stdbool.h b/litex/soc/misoc/software/include/base/stdbool.h similarity index 100% rename from misoc/software/include/base/stdbool.h rename to litex/soc/misoc/software/include/base/stdbool.h diff --git a/misoc/software/include/base/stddef.h b/litex/soc/misoc/software/include/base/stddef.h similarity index 100% rename from misoc/software/include/base/stddef.h rename to litex/soc/misoc/software/include/base/stddef.h diff --git a/misoc/software/include/base/stdint.h b/litex/soc/misoc/software/include/base/stdint.h similarity index 100% rename from misoc/software/include/base/stdint.h rename to litex/soc/misoc/software/include/base/stdint.h diff --git a/misoc/software/include/base/stdio.h b/litex/soc/misoc/software/include/base/stdio.h similarity index 100% rename from misoc/software/include/base/stdio.h rename to litex/soc/misoc/software/include/base/stdio.h diff --git a/misoc/software/include/base/stdlib.h b/litex/soc/misoc/software/include/base/stdlib.h similarity index 100% rename from misoc/software/include/base/stdlib.h rename to litex/soc/misoc/software/include/base/stdlib.h diff --git a/misoc/software/include/base/string.h b/litex/soc/misoc/software/include/base/string.h similarity index 100% rename from misoc/software/include/base/string.h rename to litex/soc/misoc/software/include/base/string.h diff --git a/misoc/software/include/base/system.h b/litex/soc/misoc/software/include/base/system.h similarity index 100% rename from misoc/software/include/base/system.h rename to litex/soc/misoc/software/include/base/system.h diff --git a/misoc/software/include/base/time.h b/litex/soc/misoc/software/include/base/time.h similarity index 100% rename from misoc/software/include/base/time.h rename to litex/soc/misoc/software/include/base/time.h diff --git a/misoc/software/include/base/uart.h b/litex/soc/misoc/software/include/base/uart.h similarity index 100% rename from misoc/software/include/base/uart.h rename to litex/soc/misoc/software/include/base/uart.h diff --git a/misoc/software/include/basec++/algorithm b/litex/soc/misoc/software/include/basec++/algorithm similarity index 100% rename from misoc/software/include/basec++/algorithm rename to litex/soc/misoc/software/include/basec++/algorithm diff --git a/misoc/software/include/basec++/cstddef b/litex/soc/misoc/software/include/basec++/cstddef similarity index 100% rename from misoc/software/include/basec++/cstddef rename to litex/soc/misoc/software/include/basec++/cstddef diff --git a/misoc/software/include/basec++/cstdlib b/litex/soc/misoc/software/include/basec++/cstdlib similarity index 100% rename from misoc/software/include/basec++/cstdlib rename to litex/soc/misoc/software/include/basec++/cstdlib diff --git a/misoc/software/include/basec++/new b/litex/soc/misoc/software/include/basec++/new similarity index 100% rename from misoc/software/include/basec++/new rename to litex/soc/misoc/software/include/basec++/new diff --git a/misoc/software/include/dyld/dlfcn.h b/litex/soc/misoc/software/include/dyld/dlfcn.h similarity index 100% rename from misoc/software/include/dyld/dlfcn.h rename to litex/soc/misoc/software/include/dyld/dlfcn.h diff --git a/misoc/software/include/dyld/dyld.h b/litex/soc/misoc/software/include/dyld/dyld.h similarity index 100% rename from misoc/software/include/dyld/dyld.h rename to litex/soc/misoc/software/include/dyld/dyld.h diff --git a/misoc/software/include/dyld/elf.h b/litex/soc/misoc/software/include/dyld/elf.h similarity index 100% rename from misoc/software/include/dyld/elf.h rename to litex/soc/misoc/software/include/dyld/elf.h diff --git a/misoc/software/include/dyld/link.h b/litex/soc/misoc/software/include/dyld/link.h similarity index 100% rename from misoc/software/include/dyld/link.h rename to litex/soc/misoc/software/include/dyld/link.h diff --git a/misoc/software/include/hw/common.h b/litex/soc/misoc/software/include/hw/common.h similarity index 100% rename from misoc/software/include/hw/common.h rename to litex/soc/misoc/software/include/hw/common.h diff --git a/misoc/software/include/hw/ethmac_mem.h b/litex/soc/misoc/software/include/hw/ethmac_mem.h similarity index 100% rename from misoc/software/include/hw/ethmac_mem.h rename to litex/soc/misoc/software/include/hw/ethmac_mem.h diff --git a/misoc/software/include/hw/flags.h b/litex/soc/misoc/software/include/hw/flags.h similarity index 100% rename from misoc/software/include/hw/flags.h rename to litex/soc/misoc/software/include/hw/flags.h diff --git a/misoc/software/include/net/microudp.h b/litex/soc/misoc/software/include/net/microudp.h similarity index 100% rename from misoc/software/include/net/microudp.h rename to litex/soc/misoc/software/include/net/microudp.h diff --git a/misoc/software/include/net/tftp.h b/litex/soc/misoc/software/include/net/tftp.h similarity index 100% rename from misoc/software/include/net/tftp.h rename to litex/soc/misoc/software/include/net/tftp.h diff --git a/misoc/software/libbase/Makefile b/litex/soc/misoc/software/libbase/Makefile similarity index 100% rename from misoc/software/libbase/Makefile rename to litex/soc/misoc/software/libbase/Makefile diff --git a/misoc/software/libbase/console.c b/litex/soc/misoc/software/libbase/console.c similarity index 100% rename from misoc/software/libbase/console.c rename to litex/soc/misoc/software/libbase/console.c diff --git a/misoc/software/libbase/crc16.c b/litex/soc/misoc/software/libbase/crc16.c similarity index 100% rename from misoc/software/libbase/crc16.c rename to litex/soc/misoc/software/libbase/crc16.c diff --git a/misoc/software/libbase/crc32.c b/litex/soc/misoc/software/libbase/crc32.c similarity index 100% rename from misoc/software/libbase/crc32.c rename to litex/soc/misoc/software/libbase/crc32.c diff --git a/misoc/software/libbase/crt0-lm32.S b/litex/soc/misoc/software/libbase/crt0-lm32.S similarity index 100% rename from misoc/software/libbase/crt0-lm32.S rename to litex/soc/misoc/software/libbase/crt0-lm32.S diff --git a/misoc/software/libbase/crt0-or1k.S b/litex/soc/misoc/software/libbase/crt0-or1k.S similarity index 100% rename from misoc/software/libbase/crt0-or1k.S rename to litex/soc/misoc/software/libbase/crt0-or1k.S diff --git a/misoc/software/libbase/errno.c b/litex/soc/misoc/software/libbase/errno.c similarity index 100% rename from misoc/software/libbase/errno.c rename to litex/soc/misoc/software/libbase/errno.c diff --git a/misoc/software/libbase/exception.c b/litex/soc/misoc/software/libbase/exception.c similarity index 100% rename from misoc/software/libbase/exception.c rename to litex/soc/misoc/software/libbase/exception.c diff --git a/misoc/software/libbase/id.c b/litex/soc/misoc/software/libbase/id.c similarity index 100% rename from misoc/software/libbase/id.c rename to litex/soc/misoc/software/libbase/id.c diff --git a/misoc/software/libbase/libc.c b/litex/soc/misoc/software/libbase/libc.c similarity index 100% rename from misoc/software/libbase/libc.c rename to litex/soc/misoc/software/libbase/libc.c diff --git a/misoc/software/libbase/linker-sdram.ld b/litex/soc/misoc/software/libbase/linker-sdram.ld similarity index 100% rename from misoc/software/libbase/linker-sdram.ld rename to litex/soc/misoc/software/libbase/linker-sdram.ld diff --git a/misoc/software/libbase/qsort.c b/litex/soc/misoc/software/libbase/qsort.c similarity index 100% rename from misoc/software/libbase/qsort.c rename to litex/soc/misoc/software/libbase/qsort.c diff --git a/misoc/software/libbase/spiflash.c b/litex/soc/misoc/software/libbase/spiflash.c similarity index 100% rename from misoc/software/libbase/spiflash.c rename to litex/soc/misoc/software/libbase/spiflash.c diff --git a/misoc/software/libbase/strtod.c b/litex/soc/misoc/software/libbase/strtod.c similarity index 100% rename from misoc/software/libbase/strtod.c rename to litex/soc/misoc/software/libbase/strtod.c diff --git a/misoc/software/libbase/system.c b/litex/soc/misoc/software/libbase/system.c similarity index 100% rename from misoc/software/libbase/system.c rename to litex/soc/misoc/software/libbase/system.c diff --git a/misoc/software/libbase/time.c b/litex/soc/misoc/software/libbase/time.c similarity index 100% rename from misoc/software/libbase/time.c rename to litex/soc/misoc/software/libbase/time.c diff --git a/misoc/software/libbase/uart.c b/litex/soc/misoc/software/libbase/uart.c similarity index 100% rename from misoc/software/libbase/uart.c rename to litex/soc/misoc/software/libbase/uart.c diff --git a/misoc/software/libbase/vsnprintf.c b/litex/soc/misoc/software/libbase/vsnprintf.c similarity index 100% rename from misoc/software/libbase/vsnprintf.c rename to litex/soc/misoc/software/libbase/vsnprintf.c diff --git a/misoc/software/libcompiler_rt/Makefile b/litex/soc/misoc/software/libcompiler_rt/Makefile similarity index 100% rename from misoc/software/libcompiler_rt/Makefile rename to litex/soc/misoc/software/libcompiler_rt/Makefile diff --git a/misoc/software/libdyld/Makefile b/litex/soc/misoc/software/libdyld/Makefile similarity index 100% rename from misoc/software/libdyld/Makefile rename to litex/soc/misoc/software/libdyld/Makefile diff --git a/misoc/software/libdyld/dyld.c b/litex/soc/misoc/software/libdyld/dyld.c similarity index 100% rename from misoc/software/libdyld/dyld.c rename to litex/soc/misoc/software/libdyld/dyld.c diff --git a/misoc/software/libnet/Makefile b/litex/soc/misoc/software/libnet/Makefile similarity index 100% rename from misoc/software/libnet/Makefile rename to litex/soc/misoc/software/libnet/Makefile diff --git a/misoc/software/libnet/microudp.c b/litex/soc/misoc/software/libnet/microudp.c similarity index 100% rename from misoc/software/libnet/microudp.c rename to litex/soc/misoc/software/libnet/microudp.c diff --git a/misoc/software/libnet/tftp.c b/litex/soc/misoc/software/libnet/tftp.c similarity index 100% rename from misoc/software/libnet/tftp.c rename to litex/soc/misoc/software/libnet/tftp.c diff --git a/misoc/software/libunwind/Makefile b/litex/soc/misoc/software/libunwind/Makefile similarity index 100% rename from misoc/software/libunwind/Makefile rename to litex/soc/misoc/software/libunwind/Makefile diff --git a/misoc/software/libunwind/__cxxabi_config.h b/litex/soc/misoc/software/libunwind/__cxxabi_config.h similarity index 100% rename from misoc/software/libunwind/__cxxabi_config.h rename to litex/soc/misoc/software/libunwind/__cxxabi_config.h diff --git a/misoc/software/memtest/Makefile b/litex/soc/misoc/software/memtest/Makefile similarity index 100% rename from misoc/software/memtest/Makefile rename to litex/soc/misoc/software/memtest/Makefile diff --git a/misoc/software/memtest/isr.c b/litex/soc/misoc/software/memtest/isr.c similarity index 100% rename from misoc/software/memtest/isr.c rename to litex/soc/misoc/software/memtest/isr.c diff --git a/misoc/software/memtest/main.c b/litex/soc/misoc/software/memtest/main.c similarity index 100% rename from misoc/software/memtest/main.c rename to litex/soc/misoc/software/memtest/main.c diff --git a/misoc/targets/__init__.py b/litex/soc/misoc/targets/__init__.py similarity index 100% rename from misoc/targets/__init__.py rename to litex/soc/misoc/targets/__init__.py diff --git a/misoc/targets/de0nano.py b/litex/soc/misoc/targets/de0nano.py old mode 100755 new mode 100644 similarity index 100% rename from misoc/targets/de0nano.py rename to litex/soc/misoc/targets/de0nano.py diff --git a/misoc/targets/kc705.py b/litex/soc/misoc/targets/kc705.py old mode 100755 new mode 100644 similarity index 100% rename from misoc/targets/kc705.py rename to litex/soc/misoc/targets/kc705.py diff --git a/misoc/targets/minispartan6.py b/litex/soc/misoc/targets/minispartan6.py old mode 100755 new mode 100644 similarity index 100% rename from misoc/targets/minispartan6.py rename to litex/soc/misoc/targets/minispartan6.py diff --git a/misoc/targets/mlabs_video.py b/litex/soc/misoc/targets/mlabs_video.py old mode 100755 new mode 100644 similarity index 100% rename from misoc/targets/mlabs_video.py rename to litex/soc/misoc/targets/mlabs_video.py diff --git a/misoc/targets/papilio_pro.py b/litex/soc/misoc/targets/papilio_pro.py old mode 100755 new mode 100644 similarity index 100% rename from misoc/targets/papilio_pro.py rename to litex/soc/misoc/targets/papilio_pro.py diff --git a/misoc/targets/pipistrello.py b/litex/soc/misoc/targets/pipistrello.py old mode 100755 new mode 100644 similarity index 100% rename from misoc/targets/pipistrello.py rename to litex/soc/misoc/targets/pipistrello.py diff --git a/misoc/targets/simple.py b/litex/soc/misoc/targets/simple.py old mode 100755 new mode 100644 similarity index 100% rename from misoc/targets/simple.py rename to litex/soc/misoc/targets/simple.py diff --git a/misoc/tools/__init__.py b/litex/soc/misoc/tools/__init__.py similarity index 100% rename from misoc/tools/__init__.py rename to litex/soc/misoc/tools/__init__.py diff --git a/misoc/tools/flterm.py b/litex/soc/misoc/tools/flterm.py similarity index 100% rename from misoc/tools/flterm.py rename to litex/soc/misoc/tools/flterm.py diff --git a/misoc/tools/mkmscimg.py b/litex/soc/misoc/tools/mkmscimg.py old mode 100755 new mode 100644 similarity index 100% rename from misoc/tools/mkmscimg.py rename to litex/soc/misoc/tools/mkmscimg.py diff --git a/setup.py b/litex/soc/setup.py old mode 100755 new mode 100644 similarity index 100% rename from setup.py rename to litex/soc/setup.py diff --git a/misoc/cores/lm32/verilog/submodule b/misoc/cores/lm32/verilog/submodule deleted file mode 160000 index 84b3e3ca0..000000000 --- a/misoc/cores/lm32/verilog/submodule +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 84b3e3ca0ad9535acaef201c1482342871358b08 diff --git a/misoc/cores/mor1kx/verilog b/misoc/cores/mor1kx/verilog deleted file mode 160000 index fb519d011..000000000 --- a/misoc/cores/mor1kx/verilog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fb519d011ae2524e3681f07b206df0a6c03f82a8 diff --git a/misoc/software/compiler_rt b/misoc/software/compiler_rt deleted file mode 160000 index 7f1c97c76..000000000 --- a/misoc/software/compiler_rt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7f1c97c76620a6ee795792e6120d98a7edf81e65 diff --git a/misoc/software/unwinder b/misoc/software/unwinder deleted file mode 160000 index 8b1196692..000000000 --- a/misoc/software/unwinder +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8b1196692d823a090a9879a695050baa7acc39ee