[ot] scripts/opentitan: cfggen.py: fix regression introduced with bc4626e

- ot-rom_ctrl table and ot-otp-eg.scrmbl_key had been removed.

OtpConfiguration was instantiated twice.

Also use a regular ordered dict (py3.7+) rather than a legacy OrderedDict
for managing HSJON content.

Signed-off-by: Emmanuel Blot <[email protected]>

Author: rivos-eblot

scripts/opentitan/cfggen.py

@@ -64,7 +64,7 @@ def load_top_config(self, toppath: str) -> None:
         """Load data from HJSON top configuration file."""
         assert not _HJSON_ERROR
         with open(toppath, 'rt') as tfp:
-            cfg = hjload(tfp)
+            cfg = hjload(tfp, object_pairs_hook=dict)
         self._top_name = cfg.get('name')
         for module in cfg.get('module') or []:
             modtype = module.get('type')
@@ -334,7 +334,6 @@ def main():
         if not isfile(lcpath):
             argparser.error(f"No such file '{ocpath}'")
 
-        cfg = OtConfiguration()
         cfg.load_lifecycle(lcpath)
         cfg.load_otp_constants(ocpath)
         cfg.save(topvar, args.socid, args.count, args.out)