Skip to content
Snippets Groups Projects
Commit f0b14fb1 authored by Mitchel Humpherys's avatar Mitchel Humpherys
Browse files

linux-ramdump-parser-v2: respect --nm-path and --gdb-path

Somewhere along the way we started ignoring the --nm-path and --gdb-path
options. Fix this. Also ensure that the command line options take
precedence over anything from local_settings.py or anything discovered
from CROSS_COMPILE.

Change-Id: I39ff653c7de7fb1de170701b898567c9b2356835
parent 230830b8
No related branches found
No related tags found
No related merge requests found
...@@ -145,18 +145,18 @@ if __name__ == '__main__': ...@@ -145,18 +145,18 @@ if __name__ == '__main__':
'Path {0} does not exist for Ram dumps. Exiting...'.format(options.autodump)) 'Path {0} does not exist for Ram dumps. Exiting...'.format(options.autodump))
sys.exit(1) sys.exit(1)
gdb_path = None gdb_path = options.gdb
nm_path = None nm_path = options.nm
try: try:
import local_settings import local_settings
gdb_path = local_settings.gdb_path gdb_path = gdb_path or local_settings.gdb_path
nm_path = local_settings.nm_path nm_path = nm_path or local_settings.nm_path
except ImportError: except ImportError:
cross_compile = os.environ.get('CROSS_COMPILE') cross_compile = os.environ.get('CROSS_COMPILE')
if cross_compile is not None: if cross_compile is not None:
gdb_path = cross_compile+"gdb" gdb_path = gdb_path or cross_compile+"gdb"
nm_path = cross_compile+"nm" nm_path = nm_path or cross_compile+"nm"
if gdb_path is None or nm_path is None: if gdb_path is None or nm_path is None:
print_out_str("!!! Incorrect path for toolchain specified.") print_out_str("!!! Incorrect path for toolchain specified.")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment