Merge pull request #41 from shenki/mimasv2

Mimasv2 build fixes

.gitmodules

@@ -7,9 +7,6 @@
 [submodule "third_party/liteeth"]
 	path = third_party/liteeth
 	url = https://github.com/enjoy-digital/liteeth.git
-[submodule "third_party/litejpeg"]
-	path = third_party/litejpeg
-	url = https://github.com/enjoy-digital/litejpeg.git
 [submodule "third_party/litepcie"]
 	path = third_party/litepcie
 	url = https://github.com/enjoy-digital/litepcie.git

Makefile

@@ -65,7 +65,7 @@ image-load: image-load-$(PLATFORM)
 
 # Gateware
 # --------------------------------------
-GATEWARE_MODULES=litex litedram liteeth litejpeg litepcie litesata litescope liteusb litevideo litex
+GATEWARE_MODULES=litex litedram liteeth litepcie litesata litescope liteusb litevideo litex
 gateware-submodules: $(addsuffix /.git,$(addprefix third_party/,$(GATEWARE_MODULES)))
 	@true
 

platforms/mimasv2.py

@@ -15,8 +15,7 @@
     ("spiflash", 0,
         Subsignal("cs_n", Pins("V3")),
         Subsignal("clk", Pins("R15")),
-#        Subsignal("mosi", Pins("T13")),
-        Subsignal("dq", Pins("T13")),
+        Subsignal("mosi", Pins("T13")),
         Subsignal("miso", Pins("R13"), Misc("PULLUP")),
         IOStandard("LVCMOS33"), Misc("SLEW=FAST")),
 

scripts/settings.sh

@@ -23,7 +23,6 @@ LITE_REPOS="
 	litex
 	litedram
 	liteeth
-	litejpeg
 	litepcie
 	litesata
 	litescope

targets/mimasv2/base.py

@@ -196,8 +196,7 @@ def __init__(self, platform, **kwargs):
         self.submodules.spiflash = spi_flash.SpiFlashSingle(
             platform.request("spiflash"),
             dummy=platform.spiflash_read_dummy_bits,
-            div=platform.spiflash_clock_div,
-            with_bitbang=False)
+            div=platform.spiflash_clock_div)
         self.add_constant("SPIFLASH_PAGE_SIZE", platform.spiflash_page_size)
         self.add_constant("SPIFLASH_SECTOR_SIZE", platform.spiflash_sector_size)