From a9892e1a82c2254595a21c273663aed22624113d Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Sun, 29 Oct 2017 14:46:39 -0700 Subject: [PATCH] targets: Fixing other targets for IRQ changes. --- targets/arty/net.py | 2 +- targets/atlys/net.py | 2 +- targets/atlys/video.py | 4 ++-- targets/nexys_video/base.py | 5 +++++ targets/nexys_video/net.py | 2 +- targets/nexys_video/video.py | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/targets/arty/net.py b/targets/arty/net.py index f6eefaff..69ad83eb 100755 --- 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 index d8770055..eac34d74 100644 --- 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 index 3b1e26e2..e2ee4674 100644 --- 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 index f9ec9f19..00513258 100755 --- 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 index b95334f7..07dd2c1f 100755 --- 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 index 81cb6606..e499de6e 100755 --- 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)