toolkit: Allow an absolute path for app-device-config.json.

Signed-off-by: Damien George <[email protected]>

Author: dpgeorge

toolkit/app-gen-toc.py

@@ -616,7 +616,6 @@ def validateVersAttr(version):
 
 
 def updateDeviceConfig(file):
-    file = paths.CONFIG_INPUT_DIR / file
     # print('*** updateDeviceConfig: ', file)
     # Update the firewall configuration in the OEM DEVICE config file
     # This doesn't do anything except format the json file.
@@ -708,7 +707,6 @@ def main():
     # Set paths given on command line.
     paths.TOOLKIT_DIR = Path(os.path.dirname(__file__))
     paths.CERT_INPUT_DIR = paths.TOOLKIT_DIR / "cert"
-    paths.CONFIG_INPUT_DIR = Path(args.config_dir)
     paths.FIRMWARE_INPUT_DIR = Path(args.firmware_dir)
     paths.OUTPUT_DIR = Path(args.output_dir)
 
@@ -770,8 +768,11 @@ def main():
             continue
 
         print("Generating Device Configuration for: " + sec["binary"])
-        updateDeviceConfig(sec["binary"])
-        gen_device_config(sec["binary"], False)
+        input_device_config = sec["binary"]
+        if not os.path.isabs(input_device_config):
+            input_device_config = os.path.join(args.config_dir, input_device_config)
+        updateDeviceConfig(input_device_config)
+        gen_device_config(input_device_config, False)
         sec["binary"] = (
             (paths.OUTPUT_DIR / sec["binary"]).with_suffix(".bin").as_posix()
         )

toolkit/utils/device_config.py

@@ -239,7 +239,6 @@ def processMiscellaneous(configuration):
 
 
 def gen_device_config(file, is_icv):
-    file = paths.CONFIG_INPUT_DIR / file
     cfg = read_global_config(file)
     validateSections(cfg, file)  # request from SE-1938
     f = createBinary((paths.OUTPUT_DIR / os.path.basename(file)).with_suffix(".bin"))

toolkit/utils/paths.py

@@ -2,6 +2,5 @@
 
 TOOLKIT_DIR = ""
 CERT_INPUT_DIR = ""
-CONFIG_INPUT_DIR = ""
 FIRMWARE_INPUT_DIR = ""
 OUTPUT_DIR = ""