add support for litesdcard

.gitmodules

@@ -52,3 +52,6 @@
 [submodule "third_party/litei2c"]
 	path = third_party/litei2c
 	url = https://github.com/litex-hub/litei2c
+[submodule "third_party/litesdcard"]
+	path = third_party/litesdcard
+	url = https://github.com/enjoy-digital/litesdcard.git

README.md

@@ -63,6 +63,8 @@ Build options
 | --sys-clk-freq | System clock frequency |
 | --with_spi | Enable SPI |
 | --with_spi_flash | Enable SPI flash |
+| --with-sdcard | Enable SD card via [LiteSDCard](https://github.com/enjoy-digital/litesdcard) |
+| --sdcard-adapter | Select SD card PMOD adapter |
 | --with_i2c | Enable I2C (bitbang driver) |
 | --with_litei2c | Enable I2C via [LiteI2C](https://github.com/litex-hub/litei2c) |
 | --with_pwm | Enable PWM |

init

@@ -1,7 +1,7 @@
 export PATH="${PWD}/third_party/litex/litex/tools:$PATH"
 export PATH="${PWD}/tools/conda/bin:$PATH"
 
-directories=(litedram liteeth litei2c liteiclink litepcie litespi litesata litescope litevideo litex litex-boards litex-renode migen nmigen pythondata-cpu-vexriscv pythondata-software-compiler_rt pythondata-software-picolibc)
+directories=(litedram liteeth litei2c liteiclink litepcie litespi litesata litesdcard litescope litevideo litex litex-boards litex-renode migen nmigen pythondata-cpu-vexriscv pythondata-software-compiler_rt pythondata-software-picolibc)
 
 for directory in "${directories[@]}";
 do

make.py

@@ -84,6 +84,8 @@ def main():
     parser.add_argument("--spi-data-width", type=int, default=8,      help="SPI data width (maximum transfered bits per xfer, Arty target only)")
     parser.add_argument("--spi-clk-freq",   type=int, default=1e6,    help="SPI clock frequency (Arty target only)")
     parser.add_argument("--spi_flash_rate", default="1:1", help="SPI flash rate, can be 1:1 or 1:2 (Arty target only)")
+    parser.add_argument("--with-sdcard", action="store_true", help="Enable SDCard support.")
+    parser.add_argument("--sdcard-adapter", default="digilent", help="SDCard PMOD adapter (digilent or numato).")
     parser.add_argument("--with_mmcm", action="store_true", help="Enable mmcm (Arty target only)")
     parser.add_argument("--with_watchdog", action="store_true", help="Enable watchdog")
     parser.add_argument("--watchdog_width", type=int, default=32, help="Watchdog width")
@@ -106,6 +108,7 @@ def main():
         args.with_pwm = True
         args.with_mmcm = True
         args.with_watchdog = True
+        args.with_sdcard = True
 
     if args.board == "all":
         board_names = list(supported_boards.keys())
@@ -163,6 +166,10 @@ def main():
                     print("Adding mmcm implicitly, cause i2s core needs special clk signals")
                     soc.add_mmcm(board.mmcm_freq)
                 soc.add_i2s()
+            if args.with_sdcard:
+                from litex_boards.platforms import digilent_arty
+                soc.platform.add_extension(digilent_arty._numato_sdcard_pmod_io if args.sdcard_adapter == "numato" else digilent_arty._sdcard_pmod_io)
+                soc.add_sdcard()
 
         build_dir = os.path.join("build", board.bitstream_name)
 

soc_zephyr.py

@@ -40,7 +40,6 @@ class _SoCZephyr(soc_cls):
             "spi":        4, # addr: 0xe0002000
             "timer0":     5, # addr: 0xe0002800
             "sdram":      6, # addr: 0xe0003000
-            "uartphy":    7, # addr: 0xe0004000
             "mmcm":       9, # addr: 0xe0004800
             "i2c0":       10, # addr: 0xe0005000
             "rgb_led_r0": 14, # addr: 0xe0007000
@@ -52,12 +51,14 @@ class _SoCZephyr(soc_cls):
             "spiflash":   24, # addr: 0xe000c000
             "watchdog0":  26, # addr: 0xe000d000
             "litei2c":    27, # addr: 0xe000d800
+            "sdcard":     29, # addr: 0xe000e000
         }}
 
         interrupt_map = {**soc_cls.interrupt_map, **{
             "timer0":     1,
             "uart":       2,
             "ethmac":     3,
+            "sdcard":     5,
             "i2s_rx":     6,
             "i2s_tx":     7,
             "watchdog0":  8,