Merge pull request #144 from gsomlo/gls-genesys2-sdcard

genesys2: LiteSDCard support
This commit is contained in:
enjoy-digital 2021-01-07 08:12:24 +01:00 committed by GitHub
commit a6e867c691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions

View File

@ -68,17 +68,20 @@ _io = [
# SDCard # SDCard
("spisdcard", 0, ("spisdcard", 0,
Subsignal("rst", Pins("AE24")),
Subsignal("clk", Pins("R28")), Subsignal("clk", Pins("R28")),
Subsignal("cs_n", Pins("T30")), Subsignal("cs_n", Pins("T30"), Misc("PULLUP True")),
Subsignal("mosi", Pins("R29"), Misc("PULLUP")), Subsignal("mosi", Pins("R29"), Misc("PULLUP True")),
Subsignal("miso", Pins("R26"), Misc("PULLUP")), Subsignal("miso", Pins("R26"), Misc("PULLUP True")),
Misc("SLEW=FAST"), Misc("SLEW=FAST"),
IOStandard("LVCMOS33") IOStandard("LVCMOS33")
), ),
("sdcard", 0, ("sdcard", 0,
Subsignal("clk", Pins("R28")), Subsignal("rst", Pins("AE24"), Misc("PULLUP True")),
Subsignal("cmd", Pins("R29"), Misc("PULLUP True")),
Subsignal("data", Pins("R26 R30 P29 T30"), Misc("PULLUP True")), Subsignal("data", Pins("R26 R30 P29 T30"), Misc("PULLUP True")),
Subsignal("cmd", Pins("R29"), Misc("PULLUP True")),
Subsignal("clk", Pins("R28")),
Subsignal("cd", Pins("P28")),
Misc("SLEW=FAST"), Misc("SLEW=FAST"),
IOStandard("LVCMOS33") IOStandard("LVCMOS33")
), ),

View File

@ -103,6 +103,8 @@ def main():
parser.add_argument("--sys-clk-freq", default=100e6, help="System clock frequency (default: 100MHz)") parser.add_argument("--sys-clk-freq", default=100e6, help="System clock frequency (default: 100MHz)")
parser.add_argument("--with-ethernet", action="store_true", help="Enable Ethernet support") parser.add_argument("--with-ethernet", action="store_true", help="Enable Ethernet support")
parser.add_argument("--with-etherbone", action="store_true", help="Enable Etherbone support") parser.add_argument("--with-etherbone", action="store_true", help="Enable Etherbone support")
parser.add_argument("--with-spi-sdcard", action="store_true", help="Enable SPI-mode SDCard support")
parser.add_argument("--with-sdcard", action="store_true", help="Enable SDCard support")
builder_args(parser) builder_args(parser)
soc_sdram_args(parser) soc_sdram_args(parser)
args = parser.parse_args() args = parser.parse_args()
@ -114,6 +116,11 @@ def main():
with_etherbone = args.with_etherbone, with_etherbone = args.with_etherbone,
**soc_sdram_argdict(args) **soc_sdram_argdict(args)
) )
assert not (args.with_spi_sdcard and args.with_sdcard)
if args.with_spi_sdcard:
soc.add_spi_sdcard()
if args.with_sdcard:
soc.add_sdcard()
builder = Builder(soc, **builder_argdict(args)) builder = Builder(soc, **builder_argdict(args))
builder.build(run=args.build) builder.build(run=args.build)