diff --git a/run.py b/run.py index b6b8aa0a..ac323177 100644 --- a/run.py +++ b/run.py @@ -140,6 +140,9 @@ def parse_iss_yaml(iss, iss_yaml, isa, setting_dir, debug_cmd): logging.info("Processing ISS setup file : {}".format(iss_yaml)) yaml_data = read_yaml(iss_yaml) + # Path to the "yaml" subdirectory + yaml_dir = os.path.dirname(iss_yaml) + # Path to the "scripts" subdirectory my_path = os.path.dirname(os.path.realpath(__file__)) scripts_dir = os.path.join(my_path, "scripts") # Search for matched ISS @@ -167,6 +170,7 @@ def parse_iss_yaml(iss, iss_yaml, isa, setting_dir, debug_cmd): else: cmd = re.sub("\", isa, cmd) cmd = re.sub("\", scripts_dir, cmd) + cmd = re.sub("\", yaml_dir, cmd) return cmd logging.error("Cannot find ISS {}".format(iss)) sys.exit(RET_FAIL) diff --git a/yaml/iss.yaml b/yaml/iss.yaml index eb2a85d5..ecf3224a 100644 --- a/yaml/iss.yaml +++ b/yaml/iss.yaml @@ -35,7 +35,7 @@ - iss: whisper path_var: WHISPER_ISS cmd: > - --log --xlen --isa + --log --xlen --isa --configfile /whisper.json --iccmrw - iss: renode path_var: RENODE_PATH diff --git a/yaml/whisper.json b/yaml/whisper.json new file mode 100644 index 00000000..62551c7c --- /dev/null +++ b/yaml/whisper.json @@ -0,0 +1,7 @@ +{ + "iccm": { + "region": "0", + "size": "0x80000000", + "offset": "0x80000000" + } +}