From 869ceadacb68a24d066a3526e532ac0cb51ea833 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 6 Aug 2020 20:04:03 +0200 Subject: [PATCH] targets: use platform.request_all on LedChaser. --- litex_boards/targets/ac701.py | 2 +- litex_boards/targets/acorn_cle_215.py | 2 +- litex_boards/targets/aller.py | 2 +- litex_boards/targets/alveo_u250.py | 2 +- litex_boards/targets/arty.py | 2 +- litex_boards/targets/arty_s7.py | 2 +- litex_boards/targets/c10lprefkit.py | 2 +- litex_boards/targets/camlink_4k.py | 2 +- litex_boards/targets/de0nano.py | 2 +- litex_boards/targets/de10lite.py | 2 +- litex_boards/targets/de10nano.py | 2 +- litex_boards/targets/ecp5_evn.py | 2 +- litex_boards/targets/forest_kitten_33.py | 2 +- litex_boards/targets/genesys2.py | 4 ++-- litex_boards/targets/kc705.py | 2 +- litex_boards/targets/kcu105.py | 2 +- litex_boards/targets/linsn_rv901t.py | 2 +- litex_boards/targets/logicbone.py | 2 +- litex_boards/targets/mercury_xu5.py | 2 +- litex_boards/targets/mimas_a7.py | 2 +- litex_boards/targets/minispartan6.py | 2 +- litex_boards/targets/netv2.py | 2 +- litex_boards/targets/nexys4ddr.py | 2 +- litex_boards/targets/nexys_video.py | 2 +- litex_boards/targets/orangecrab.py | 2 +- litex_boards/targets/pano_logic_g2.py | 2 +- litex_boards/targets/pipistrello.py | 2 +- litex_boards/targets/tagus.py | 2 +- litex_boards/targets/trellisboard.py | 2 +- litex_boards/targets/ulx3s.py | 2 +- litex_boards/targets/vc707.py | 2 +- litex_boards/targets/vcu118.py | 2 +- litex_boards/targets/versa_ecp5.py | 2 +- litex_boards/targets/zcu104.py | 2 +- litex_boards/targets/zybo_z7.py | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/litex_boards/targets/ac701.py b/litex_boards/targets/ac701.py index 6648a979..0ce2e919 100755 --- a/litex_boards/targets/ac701.py +++ b/litex_boards/targets/ac701.py @@ -117,7 +117,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(4)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/acorn_cle_215.py b/litex_boards/targets/acorn_cle_215.py index 6e2fd80f..ca46834b 100755 --- a/litex_boards/targets/acorn_cle_215.py +++ b/litex_boards/targets/acorn_cle_215.py @@ -150,7 +150,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(4)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/aller.py b/litex_boards/targets/aller.py index c700a2cd..ccdf8dd5 100755 --- a/litex_boards/targets/aller.py +++ b/litex_boards/targets/aller.py @@ -125,7 +125,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(3)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/alveo_u250.py b/litex_boards/targets/alveo_u250.py index b820f751..46505fa1 100755 --- a/litex_boards/targets/alveo_u250.py +++ b/litex_boards/targets/alveo_u250.py @@ -88,7 +88,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(3)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/arty.py b/litex_boards/targets/arty.py index 958cd4b6..36039266 100755 --- a/litex_boards/targets/arty.py +++ b/litex_boards/targets/arty.py @@ -92,7 +92,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(4)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/arty_s7.py b/litex_boards/targets/arty_s7.py index 0e0adbc8..dd27f5c5 100755 --- a/litex_boards/targets/arty_s7.py +++ b/litex_boards/targets/arty_s7.py @@ -79,7 +79,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(4)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/c10lprefkit.py b/litex_boards/targets/c10lprefkit.py index 7f7d1b33..b64fcbd8 100755 --- a/litex_boards/targets/c10lprefkit.py +++ b/litex_boards/targets/c10lprefkit.py @@ -95,7 +95,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(5)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/camlink_4k.py b/litex_boards/targets/camlink_4k.py index ce40e508..b5a1eba5 100755 --- a/litex_boards/targets/camlink_4k.py +++ b/litex_boards/targets/camlink_4k.py @@ -101,7 +101,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(2)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/de0nano.py b/litex_boards/targets/de0nano.py index f1aa49e9..1e58ec05 100755 --- a/litex_boards/targets/de0nano.py +++ b/litex_boards/targets/de0nano.py @@ -83,7 +83,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/de10lite.py b/litex_boards/targets/de10lite.py index 164e8c1b..7620bf05 100755 --- a/litex_boards/targets/de10lite.py +++ b/litex_boards/targets/de10lite.py @@ -91,7 +91,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(10)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/de10nano.py b/litex_boards/targets/de10nano.py index 777138b6..90662f23 100755 --- a/litex_boards/targets/de10nano.py +++ b/litex_boards/targets/de10nano.py @@ -102,7 +102,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/ecp5_evn.py b/litex_boards/targets/ecp5_evn.py index 11208e19..2bd46bc9 100755 --- a/litex_boards/targets/ecp5_evn.py +++ b/litex_boards/targets/ecp5_evn.py @@ -57,7 +57,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/forest_kitten_33.py b/litex_boards/targets/forest_kitten_33.py index 2ee18f90..889ac15c 100755 --- a/litex_boards/targets/forest_kitten_33.py +++ b/litex_boards/targets/forest_kitten_33.py @@ -44,7 +44,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(7)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/genesys2.py b/litex_boards/targets/genesys2.py index 72e42c96..7f256abc 100755 --- a/litex_boards/targets/genesys2.py +++ b/litex_boards/targets/genesys2.py @@ -43,7 +43,7 @@ class _CRG(Module): # BaseSoC ------------------------------------------------------------------------------------------ class BaseSoC(SoCCore): - def __init__(self, sys_clk_freq=int(125e6), with_ethernet=False, with_etherbone=False, **kwargs): + def __init__(self, sys_clk_freq=int(100e6), with_ethernet=False, with_etherbone=False, **kwargs): platform = genesys2.Platform() # SoCCore ---------------------------------------------------------------------------------- @@ -86,7 +86,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/kc705.py b/litex_boards/targets/kc705.py index 1c7a04c9..745fd654 100755 --- a/litex_boards/targets/kc705.py +++ b/litex_boards/targets/kc705.py @@ -86,7 +86,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/kcu105.py b/litex_boards/targets/kcu105.py index 397e9492..27d0c84b 100755 --- a/litex_boards/targets/kcu105.py +++ b/litex_boards/targets/kcu105.py @@ -94,7 +94,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/linsn_rv901t.py b/litex_boards/targets/linsn_rv901t.py index 95db8203..edb4b3be 100755 --- a/litex_boards/targets/linsn_rv901t.py +++ b/litex_boards/targets/linsn_rv901t.py @@ -74,7 +74,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(1)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/logicbone.py b/litex_boards/targets/logicbone.py index d558b24c..c5847e5d 100755 --- a/litex_boards/targets/logicbone.py +++ b/litex_boards/targets/logicbone.py @@ -144,7 +144,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(4)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/mercury_xu5.py b/litex_boards/targets/mercury_xu5.py index 739e8df8..24ccc0c0 100755 --- a/litex_boards/targets/mercury_xu5.py +++ b/litex_boards/targets/mercury_xu5.py @@ -83,7 +83,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(3)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/mimas_a7.py b/litex_boards/targets/mimas_a7.py index 0be9c609..066b948e 100755 --- a/litex_boards/targets/mimas_a7.py +++ b/litex_boards/targets/mimas_a7.py @@ -86,7 +86,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/minispartan6.py b/litex_boards/targets/minispartan6.py index 98717329..f76c89c9 100755 --- a/litex_boards/targets/minispartan6.py +++ b/litex_boards/targets/minispartan6.py @@ -86,7 +86,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/netv2.py b/litex_boards/targets/netv2.py index 7ebc081e..0508f672 100755 --- a/litex_boards/targets/netv2.py +++ b/litex_boards/targets/netv2.py @@ -87,7 +87,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(6)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/nexys4ddr.py b/litex_boards/targets/nexys4ddr.py index 646d802d..33b807d6 100755 --- a/litex_boards/targets/nexys4ddr.py +++ b/litex_boards/targets/nexys4ddr.py @@ -86,7 +86,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(16)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/nexys_video.py b/litex_boards/targets/nexys_video.py index 2fd41da4..266fc77b 100755 --- a/litex_boards/targets/nexys_video.py +++ b/litex_boards/targets/nexys_video.py @@ -86,7 +86,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/orangecrab.py b/litex_boards/targets/orangecrab.py index 7a5d8964..5ecaeddb 100755 --- a/litex_boards/targets/orangecrab.py +++ b/litex_boards/targets/orangecrab.py @@ -139,7 +139,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(3)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/pano_logic_g2.py b/litex_boards/targets/pano_logic_g2.py index da6b2196..c0886773 100755 --- a/litex_boards/targets/pano_logic_g2.py +++ b/litex_boards/targets/pano_logic_g2.py @@ -68,7 +68,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(3)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/pipistrello.py b/litex_boards/targets/pipistrello.py index a0c50487..5f7f1a00 100755 --- a/litex_boards/targets/pipistrello.py +++ b/litex_boards/targets/pipistrello.py @@ -188,7 +188,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(5)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/tagus.py b/litex_boards/targets/tagus.py index 65526d25..1093968c 100755 --- a/litex_boards/targets/tagus.py +++ b/litex_boards/targets/tagus.py @@ -125,7 +125,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(3)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/trellisboard.py b/litex_boards/targets/trellisboard.py index eb742e29..d40ddd5b 100755 --- a/litex_boards/targets/trellisboard.py +++ b/litex_boards/targets/trellisboard.py @@ -147,7 +147,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(12)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/ulx3s.py b/litex_boards/targets/ulx3s.py index 105e09ee..6d4e15ba 100755 --- a/litex_boards/targets/ulx3s.py +++ b/litex_boards/targets/ulx3s.py @@ -107,7 +107,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/vc707.py b/litex_boards/targets/vc707.py index feaef4fa..e6df3f53 100755 --- a/litex_boards/targets/vc707.py +++ b/litex_boards/targets/vc707.py @@ -75,7 +75,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/vcu118.py b/litex_boards/targets/vcu118.py index de048832..97bb2530 100755 --- a/litex_boards/targets/vcu118.py +++ b/litex_boards/targets/vcu118.py @@ -83,7 +83,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/versa_ecp5.py b/litex_boards/targets/versa_ecp5.py index 8eb5ca24..1b4cf907 100755 --- a/litex_boards/targets/versa_ecp5.py +++ b/litex_boards/targets/versa_ecp5.py @@ -119,7 +119,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(8)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/zcu104.py b/litex_boards/targets/zcu104.py index fd043333..73452c04 100755 --- a/litex_boards/targets/zcu104.py +++ b/litex_boards/targets/zcu104.py @@ -86,7 +86,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(4)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds") diff --git a/litex_boards/targets/zybo_z7.py b/litex_boards/targets/zybo_z7.py index 4d1be0d2..bcc8ba46 100755 --- a/litex_boards/targets/zybo_z7.py +++ b/litex_boards/targets/zybo_z7.py @@ -71,7 +71,7 @@ class BaseSoC(SoCCore): # Leds ------------------------------------------------------------------------------------- self.submodules.leds = LedChaser( - pads = Cat(*[platform.request("user_led", i) for i in range(4)]), + pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) self.add_csr("leds")