From e52d6aca5f499d4246b368aaecf58109a33e12ce Mon Sep 17 00:00:00 2001
From: rob-ng15 <58272847+rob-ng15@users.noreply.github.com>
Date: Mon, 8 Jun 2020 11:05:36 +0100
Subject: [PATCH] Use 128mb sdram, uart via i/o port on i/o board and vga
 terminal via i/o board

---
 litex_boards/platforms/de10nano.py | 64 +++++++++++++++++-------------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/litex_boards/platforms/de10nano.py b/litex_boards/platforms/de10nano.py
index 75ac273..ac634a6 100644
--- a/litex_boards/platforms/de10nano.py
+++ b/litex_boards/platforms/de10nano.py
@@ -18,6 +18,8 @@ _io = [
     ("user_led", 3, Pins("V15"),  IOStandard("3.3-V LVTTL")),
     ("user_led", 4, Pins("AF26"), IOStandard("3.3-V LVTTL")),
     ("user_led", 5, Pins("AE26"), IOStandard("3.3-V LVTTL")),
+    ("user_led", 6, Pins("Y16"), IOStandard("3.3-V LVTTL")),
+    ("user_led", 7, Pins("AA23"), IOStandard("3.3-V LVTTL")),
 
     ("key", 0, Pins("AH17"), IOStandard("3.3-V LVTTL")),
     ("key", 1, Pins("AH16"), IOStandard("3.3-V LVTTL")),
@@ -27,11 +29,17 @@ _io = [
     ("user_sw", 2, Pins("W21"), IOStandard("3.3-V LVTTL")),
     ("user_sw", 3, Pins("W20"), IOStandard("3.3-V LVTTL")),
 
+# uncomment appropriate serial for board
     ("serial", 0,
-        Subsignal("tx", Pins("AF13"), IOStandard("3.3-V LVTTL")), # Arduino_IO1
-        Subsignal("rx", Pins("AG13"), IOStandard("3.3-V LVTTL"))  # Arduino_IO0
+        Subsignal("tx", Pins("AH9"), IOStandard("3.3-V LVTTL")),    # user i/o port on mister i/o board
+        Subsignal("rx", Pins("AG11"), IOStandard("3.3-V LVTTL"))    # user i/o port on mister i/o board
     ),
 
+#    ("serial", 0,
+#        Subsignal("tx", Pins("AF13"), IOStandard("3.3-V LVTTL")),  # Arduino_IO1
+#        Subsignal("rx", Pins("AG13"), IOStandard("3.3-V LVTTL"))   # Arduino_IO0
+#    ),
+
     ("g_sensor", 0,
         Subsignal("int",  Pins("A17")),
         Subsignal("sclk", Pins("C18")),
@@ -47,6 +55,7 @@ _io = [
         IOStandard("3.3-V LVTTL")
     ),
 
+    # HDMI consists of HDMI + I2C for control + I2S for audio
     ("hdmi", 0,
         Subsignal("tx_d_r", Pins("AS12 AE12 W8 Y8 AD11 AD10 AE11 Y5")),
         Subsignal("tx_d_g", Pins("AF10 Y4 AE9 AB4 AE7 AF6 AF8 AF5")),
@@ -56,36 +65,20 @@ _io = [
         Subsignal("tx_hs",  Pins("T8")),
         Subsignal("tx_vs",  Pins("V13")),
         Subsignal("tx_int", Pins("AF11")),
-        Subsignal("i2s0",   Pins("T13")),
-        Subsignal("mclk",   Pins("U11")),
-        Subsignal("lrclk",  Pins("T11")),
-        Subsignal("sclk",   Pins("T12")),
+        IOStandard("3.3-V LVTTL")
+    ),
+
+    ("i2c", 0,
         Subsignal("scl",    Pins("U10")),
         Subsignal("sda",    Pins("AA4")),
         IOStandard("3.3-V LVTTL")
     ),
 
-    ("gpio_0", 0, Pins(
-        "V12    E8  W12  D11   D8 AH13  AF7 AH14",
-        "AF4   AH3  AD5 AG14 AE23  D12 AD20  C12",
-        "AD17 AC23 AC22  Y19 AB23 AA19  W11 AA18",
-        "W14   Y18  Y17 AB25 AB26  Y11 AA26 AA13",
-        "AA11"),
-        IOStandard("3.3-V LVTTL")
-    ),
-    ("gpio_1", 0, Pins(
-        "Y15  AC24 AA15 AD26 AG28 AF28 AE25 AF27",
-        "AG26 AH27 AG25 AH26 AH24 AF25 AG23 AF24",
-        "AG24 AH22 AH21 AG21 AH23 AA20 AF22 AE22",
-        "AG20 AF21 AH23 AA20 AF22 AE22 AG20 AF21",
-        "AG19 AH19 AG18 AH18 AF18 AF20 AG15 AE20",
-        "AE19 AE17"),
-        IOStandard("3.3-V LVTTL")
-    ),
-    ("arduino", 0, Pins(
-        "AG13 AF13 AG10  AG9  U14  U13 AG8  AH8",
-        "AF17 AE15 AF15 AG16 AH11 AH12 AH9 AG11",
-        "AH7"),
+    ("i2s", 0,
+        Subsignal("i2s",   Pins("T13")),
+        Subsignal("mclk",   Pins("U11")),
+        Subsignal("lrclk",  Pins("T11")),
+        Subsignal("sclk",   Pins("T12")),
         IOStandard("3.3-V LVTTL")
     ),
 ]
@@ -115,6 +108,23 @@ _mister_sdram_module_io = [
         Subsignal("miso", Pins("AF25")),
         IOStandard("3.3-V LVTTL")
     ),
+
+    ("mister_outputs", 0,
+        Subsignal("led_user",  Pins("Y15")),
+        Subsignal("led_hdd",   Pins("AA15")),
+        Subsignal("led_power", Pins("AG28")),
+        IOStandard("3.3-V LVTTL")
+    ),
+
+    ("vga", 0,
+        Subsignal("red", Pins("AE17 AE20 AF20 AH18 AH19 AF21")),
+        Subsignal("green", Pins("AE19 AG15 AF18 AG18 AG19 AG20")),
+        Subsignal("blue", Pins("AG21 AA20 AE22 AF22 AH23 AH21")),
+        Subsignal("hsync", Pins("AH22")),
+        Subsignal("vsync",  Pins("AG24")),
+        Subsignal("en",  Pins("AH27")),
+        IOStandard("3.3-V LVTTL")
+    ),
 ]
 
 # Platform -----------------------------------------------------------------------------------------