diff --git a/proto/cheby/gen_gena_regctrl.py b/proto/cheby/gen_gena_regctrl.py index 96aaadd196384367d7b39bcc190db2b0b77697fb..bbf2cc9badac172a7d62e9acc6f1eb1e29ebdb15 100644 --- a/proto/cheby/gen_gena_regctrl.py +++ b/proto/cheby/gen_gena_regctrl.py @@ -1391,9 +1391,12 @@ def gen_gena_regctrl(root, use_common_visual): module.libraries.append('CommonVisual') # Extra on x-gen.packages - pkgs = get_gena_gen(root, 'packages', []) + pkgs = get_gena_gen(root, 'package', "") + pkgs = pkgs.split(";") for name in pkgs: - module.deps.append(name['package'].split('.')) + if name == "": + continue + module.deps.append(name.split('.')) # Depends on MemMap. lib = get_gena_gen(root, 'vhdl-library', 'work') diff --git a/proto/cheby/gena2cheby.py b/proto/cheby/gena2cheby.py index 1eed0408c8fa796adec38690db9aef66b5a34590..fc7cebbf989a0692b0340b78ba83a64e5928d803 100755 --- a/proto/cheby/gena2cheby.py +++ b/proto/cheby/gena2cheby.py @@ -887,7 +887,7 @@ def conv_root(root, filename): xg['vhdl-library'] = vg elif e.startswith('package='): _, vg = e.split('=') - xg['package'] = [n for n in vg.split(';')] + xg['package'] = vg elif e in ('no-creg-mux-dff', 'no-reg-mux-dff', 'no-mem-mux-dff', 'dsp'): xg[e] = True diff --git a/testfiles/gena/Consts.cheby b/testfiles/gena/Consts.cheby index 8b2cb2fe861071ff58a118a770aef9a3745933b9..a32e8a53b42faad5f12ba978a80050c638337b56 100644 --- a/testfiles/gena/Consts.cheby +++ b/testfiles/gena/Consts.cheby @@ -5,8 +5,7 @@ memory-map: size: 256k x-gena: gen: - packages: - - package: my_lib.my_pkg + package: my_lib.my_pkg map-version: 20190607 x-driver-edge: equipment-code: PX-ALGCA