summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-01-13 14:33:02 -0500
committerTom Rini <trini@konsulko.com>2022-01-13 14:33:02 -0500
commit25711b07ca1dcf73dc41b45ca040dadbcff0fa08 (patch)
treede49c129e19ab9b129aca41d59cd8ecdc3e18de7 /tools
parent743c562d0c5269740236864bdb0002e73ec3e614 (diff)
parent6c9e3d1fc085977b5b38dfe610f65d1a7f48081b (diff)
Merge tag 'dm-pull-13jan22' of https://source.denx.de/u-boot/custodians/u-boot-dm
bloblist prep for standard passage switch order of pinctrl and power domain calls various minor fixes
Diffstat (limited to 'tools')
-rwxr-xr-xtools/genboardscfg.py2
-rw-r--r--tools/patman/gitutil.py11
2 files changed, 9 insertions, 4 deletions
diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py
index 4ee7aa1f891..07bf681d1d9 100755
--- a/tools/genboardscfg.py
+++ b/tools/genboardscfg.py
@@ -430,7 +430,7 @@ def main():
# Add options here
parser.add_option('-f', '--force', action="store_true", default=False,
help='regenerate the output even if it is new')
- parser.add_option('-j', '--jobs', type='int', default=cpu_count,
+ parser.add_option('-j', '--jobs', type='int', default=min(cpu_count, 240),
help='the number of jobs to run simultaneously')
parser.add_option('-o', '--output', default=OUTPUT_FILE,
help='output file [default=%s]' % OUTPUT_FILE)
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py
index 5e4c1128dcb..e1ef96df22e 100644
--- a/tools/patman/gitutil.py
+++ b/tools/patman/gitutil.py
@@ -616,9 +616,14 @@ def GetAliasFile():
"""
fname = command.OutputOneLine('git', 'config', 'sendemail.aliasesfile',
raise_on_error=False)
- if fname:
- fname = os.path.join(GetTopLevel(), fname.strip())
- return fname
+ if not fname:
+ return None
+
+ fname = os.path.expanduser(fname.strip())
+ if os.path.isabs(fname):
+ return fname
+
+ return os.path.join(GetTopLevel(), fname)
def GetDefaultUserName():
"""Gets the user.name from .gitconfig file.