From f17d741d54593329d66dc5e70844fac8fe2b8c8f Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Wed, 26 Jan 2022 20:54:13 +0100 Subject: [PATCH] fxconv: fix CLI which was broken since 4d46661d3 --- fxconv/fxconv-main.py | 2 +- fxconv/fxconv.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fxconv/fxconv-main.py b/fxconv/fxconv-main.py index 7e4ceb2..18194ee 100755 --- a/fxconv/fxconv-main.py +++ b/fxconv/fxconv-main.py @@ -119,7 +119,7 @@ def main(): # In manual conversion modes, read parameters from the command-line else: - params = parse_parameters(args) + params = fxconv.parse_parameters(args) if "type" in params: pass diff --git a/fxconv/fxconv.py b/fxconv/fxconv.py index 5d9aa47..c7030dc 100644 --- a/fxconv/fxconv.py +++ b/fxconv/fxconv.py @@ -25,7 +25,7 @@ __all__ = [ "convert_topti", "convert_libimg_fx", "convert_libimg_cg", # Meta API to use fxconv-metadata.txt files - "Metadata", + "Metadata", "parse_parameters", ] # @@ -1353,7 +1353,7 @@ def elf(data, output, symbol, toolchain=None, arch=None, section=None, # Meta API # -def _parse_parameters(params): +def parse_parameters(params): """Parse parameters of the form "NAME:VALUE" into a dictionary.""" d = dict() @@ -1405,7 +1405,7 @@ def _parse_metadata(contents): metadata = [] for (wildcard, params) in elements: params = [ s.strip() for s in params.split("\n") if s.strip() ] - metadata.append((wildcard, _parse_parameters(params))) + metadata.append((wildcard, parse_parameters(params))) return metadata