commit 6f51ecbbb2bcf8814a3034c52805f04893807347
author Philipp Wagner <phw@lowrisc.org> Thu Nov 19 23:05:22 2020 +0000
committer Philipp Wagner <mail@philipp-wagner.com> Fri Nov 20 10:44:45 2020 +0000
tree a7b415673f404179852cfd7e3db4f15a56df2837
parent d2a16f95b3a1c0a4bfa8870c6d8e5f83f411f8d9

[otbn] Add the option to pass a linker script to otbn_build

This option is currently unused.

Signed-off-by: Philipp Wagner <phw@lowrisc.org>

util/otbn_build.py

diff --git a/util/otbn_build.py b/util/otbn_build.py
index 42da512..0791aac 100755
--- a/util/otbn_build.py
+++ b/util/otbn_build.py
@@ -41,7 +41,7 @@
 import subprocess
 import sys
 from pathlib import Path
-from typing import List
+from typing import List, Optional
 
 log.basicConfig(level=log.INFO, format="%(message)s")
 
@@ -62,10 +62,15 @@
     run_cmd([otbn_as_cmd, '-o', out_file, src_file], check=True)
 
 
-def call_otbn_ld(src_files: List[Path], out_file: Path):
+def call_otbn_ld(src_files: List[Path], out_file: Path, linker_script: Optional[Path]):
     otbn_ld_cmd = os.environ.get('OTBN_LD',
                                  str(REPO_TOP / 'hw/ip/otbn/util/otbn-ld'))
-    run_cmd([otbn_ld_cmd, '-o', out_file] + src_files, check=True)
+
+    cmd = [otbn_ld_cmd, '-o', out_file]
+    if linker_script:
+        cmd += ['-T', linker_script]
+    cmd += src_files
+    run_cmd(cmd, check=True)
 
 
 def call_rv32_objcopy(args: List[str]):
@@ -83,6 +88,12 @@
         default=".",
         help="Output directory (default: %(default)s)")
     parser.add_argument(
+        '--script',
+        '-T',
+        dest="linker_script",
+        required=False,
+        help="Linker script")
+    parser.add_argument(
         '--app-name',
         '-n',
         required=False,
@@ -108,7 +119,7 @@
             call_otbn_as(src_file, obj_file)
 
         out_elf = out_dir / (app_name + '.elf')
-        call_otbn_ld(obj_files, out_elf)
+        call_otbn_ld(obj_files, out_elf, linker_script = args.linker_script)
 
         out_embedded_obj = out_dir / (app_name + '.rv32embed.o')
         args = [