Merge pull request #367 from mithro/litex-irq-fix

LiteX uart is moving to IRQ 2
timvideos · Oct 30, 2017 · e653dd5 · e653dd5
2 parents 944d5f1 + a9892e1
commit e653dd5
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 9 deletions.
diff --git a/targets/arty/net.py b/targets/arty/net.py
@@ -16,7 +16,7 @@ class NetSoC(BaseSoC):
     csr_map_update(BaseSoC.csr_map, csr_peripherals)
 
     interrupt_map = {
-        "ethmac": 2,
+        "ethmac": 3,
     }
     interrupt_map.update(BaseSoC.interrupt_map)
 

diff --git a/targets/atlys/net.py b/targets/atlys/net.py
@@ -15,7 +15,7 @@ class NetSoC(BaseSoC):
     csr_map_update(BaseSoC.csr_map, csr_peripherals)
 
     interrupt_map = {
-        "ethmac": 2,
+        "ethmac": 3,
     }
     interrupt_map.update(BaseSoC.interrupt_map)
 

diff --git a/targets/atlys/video.py b/targets/atlys/video.py
@@ -17,8 +17,8 @@ class VideoSoC(BaseSoC):
     csr_map_update(BaseSoC.csr_map, csr_peripherals)
 
     interrupt_map = {
-        "hdmi_in0": 3,
-        "hdmi_in1": 4,
+        "hdmi_in0": 4,
+        "hdmi_in1": 5,
     }
     interrupt_map.update(BaseSoC.interrupt_map)
 

diff --git a/targets/nexys_video/base.py b/targets/nexys_video/base.py
@@ -90,6 +90,11 @@ class BaseSoC(SoCSDRAM):
     )
     csr_map_update(SoCSDRAM.csr_map, csr_peripherals)
 
+    interrupt_map = {
+        "uart": 2,
+    }
+    interrupt_map.update(SoCSDRAM.interrupt_map)
+
     mem_map = {
         "spiflash": 0x20000000,  # (default shadow @0xa0000000)
     }

diff --git a/targets/nexys_video/net.py b/targets/nexys_video/net.py
@@ -16,7 +16,7 @@ class NetSoC(BaseSoC):
     csr_map_update(BaseSoC.csr_map, csr_peripherals)
 
     interrupt_map = {
-        "ethmac": 2,
+        "ethmac": 3,
     }
     interrupt_map.update(BaseSoC.interrupt_map)
 

diff --git a/targets/nexys_video/video.py b/targets/nexys_video/video.py
@@ -19,7 +19,7 @@ class VideoSoC(BaseSoC):
     csr_map_update(BaseSoC.csr_map, csr_peripherals)
 
     interrupt_map = {
-        "hdmi_in0": 3,
+        "hdmi_in0": 4,
     }
     interrupt_map.update(BaseSoC.interrupt_map)
 

diff --git a/targets/opsis/base.py b/targets/opsis/base.py
@@ -223,6 +223,11 @@ class BaseSoC(SoCSDRAM):
     )
     csr_map_update(SoCSDRAM.csr_map, csr_peripherals)
 
+    interrupt_map = {
+        "uart": 2,
+    }
+    interrupt_map.update(SoCSDRAM.interrupt_map)
+
     mem_map = {
         "spiflash":     0x20000000,  # (default shadow @0xa0000000)
     }

diff --git a/targets/opsis/video.py b/targets/opsis/video.py
@@ -22,8 +22,8 @@ class VideoSoC(BaseSoC):
     csr_map_update(BaseSoC.csr_map, csr_peripherals)
 
     interrupt_map = {
-        "hdmi_in0": 3,
-        "hdmi_in1": 4,
+        "hdmi_in0": 4,
+        "hdmi_in1": 5,
     }
     interrupt_map.update(BaseSoC.interrupt_map)
 

diff --git a/third_party/litex b/third_party/litex