From 29b72fac7e3fe16f3a9ce4bcfe58ad11f5a7621f Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Wed, 15 Jun 2022 11:55:22 +0200 Subject: [PATCH] taobao_a_e115fb: Minor cleanups. --- litex_boards/platforms/taobao_a_e115fb.py | 6 +++--- litex_boards/targets/taobao_a_e115fb.py | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/litex_boards/platforms/taobao_a_e115fb.py b/litex_boards/platforms/taobao_a_e115fb.py index c14b892..465b987 100644 --- a/litex_boards/platforms/taobao_a_e115fb.py +++ b/litex_boards/platforms/taobao_a_e115fb.py @@ -13,14 +13,14 @@ from litex.build.altera.programmer import USBBlaster _io = [ # Clk ("clk25", 0, Pins("AB11"), IOStandard("3.3-V LVTTL")), - ("clk27", 0, Pins("A11"), IOStandard("3.3-V LVTTL")), + ("clk27", 0, Pins("A11"), IOStandard("3.3-V LVTTL")), # Rst ("cpu_reset_n", 0, Pins("N21"), IOStandard("1.8-V")), # N21 # Serial ("serial", 0, - Subsignal("tx", Pins("V3"), IOStandard("3.3-V LVTTL")), # GPIOs close to voltage selector + Subsignal("tx", Pins("V3"), IOStandard("3.3-V LVTTL")), # GPIOs close to voltage selector Subsignal("rx", Pins("AA1"), IOStandard("3.3-V LVTTL")) ), @@ -32,7 +32,7 @@ _io = [ # Buttons ("user_btn_n", 0, Pins("T1"), IOStandard("3.3-V LVTTL")), # K3 - ("user_btn_n", 1, Pins("N22"), IOStandard("3.3-V LVTTL")), # K4 + ("user_btn_n", 1, Pins("N22"), IOStandard("3.3-V LVTTL")), # K4 ] # Platform ----------------------------------------------------------------------------------------- diff --git a/litex_boards/targets/taobao_a_e115fb.py b/litex_boards/targets/taobao_a_e115fb.py index 9634002..21dea34 100755 --- a/litex_boards/targets/taobao_a_e115fb.py +++ b/litex_boards/targets/taobao_a_e115fb.py @@ -11,35 +11,34 @@ from migen.genlib.resetsync import AsyncResetSynchronizer from litex_boards.platforms import taobao_a_e115fb -from litex.soc.cores.clock import CycloneIVPLL -from litex.soc.cores.led import LedChaser from litex.soc.integration.soc_core import * from litex.soc.integration.builder import * +from litex.soc.cores.clock import CycloneIVPLL +from litex.soc.cores.led import LedChaser # CRG ---------------------------------------------------------------------------------------------- class _CRG(Module): def __init__(self, platform, sys_clk_freq): self.rst = Signal() - self.clock_domains.cd_sys = ClockDomain() + self.clock_domains.cd_sys = ClockDomain() # # # # Clk / Rst clk25 = platform.request("clk25") - rst_n = platform.request("cpu_reset_n") + rst_n = platform.request("cpu_reset_n") # PLL self.submodules.pll = pll = CycloneIVPLL(speedgrade="-7") self.comb += pll.reset.eq(~rst_n | self.rst) pll.register_clkin(clk25, 25e6) - pll.create_clkout(self.cd_sys, sys_clk_freq) + pll.create_clkout(self.cd_sys, sys_clk_freq) # BaseSoC ------------------------------------------------------------------------------------------ class BaseSoC(SoCCore): - def __init__(self, sys_clk_freq=int(50e6), with_led_chaser=True, - **kwargs): + def __init__(self, sys_clk_freq=int(50e6), with_led_chaser=True, **kwargs): platform = taobao_a_e115fb.Platform() # CRG --------------------------------------------------------------------------------------