From cb19c42084d016573bdde30de8535123f245e9aa Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sat, 24 Apr 2021 21:46:45 +0100 Subject: [PATCH] argh reorder functions to not be recursively dependent --- src/pinmux_generator.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pinmux_generator.py b/src/pinmux_generator.py index 3e92bf0..52267f4 100644 --- a/src/pinmux_generator.py +++ b/src/pinmux_generator.py @@ -89,20 +89,20 @@ if __name__ == '__main__': with open(fname, "w") as of: with open(pyname, "w") as pyf: ps = module.pinspec() - pm, chip = module.pinparse(ps, pinspec) - litexmap = ps.pywrite(pyf, pm) pinout, bankspec, pin_spec, fixedpins = ps.write(of) #chip['litex.map'] = litexmap - chip = json.dumps(chip) - with open("%s/litex_pinpads.json" % pinspec, "w") as f: - f.write(chip) - if testing: dummytest(ps, output_dir, output_type) else: specgen(of, output_dir, pinout, bankspec, ps.muxwidths, pin_spec, fixedpins, ps.fastbus) + pm, chip = module.pinparse(ps, pinspec) + litexmap = ps.pywrite(pyf, pm) + chip = json.dumps(chip) + with open("%s/litex_pinpads.json" % pinspec, "w") as f: + f.write(chip) + else: if output_type == 'bsv': from bsv.pinmux_generator import pinmuxgen as gentypes -- 2.30.2