diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-15 10:41:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-15 10:41:20 -0400 |
| commit | 605e15db2b54302364a2528d3c6604fbc57be846 (patch) | |
| tree | 1a1e344964bff1719939183124d66a71e7ca7731 /tools | |
| parent | 4905dfc65d9a17083727865302d2cf633c15c911 (diff) | |
| parent | f110da9984c0aa0aba9e1c4178b67b7abecf7e8d (diff) | |
| download | blackbird-obmc-uboot-605e15db2b54302364a2528d3c6604fbc57be846.tar.gz blackbird-obmc-uboot-605e15db2b54302364a2528d3c6604fbc57be846.zip | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildman/builderthread.py | 2 | ||||
| -rw-r--r-- | tools/ifdtool.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index ce1cfddf8c..cf25bb8f1a 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -356,7 +356,7 @@ class BuilderThread(threading.Thread): # Now write the actual build output if keep_outputs: self.CopyFiles(result.out_dir, build_dir, '', ['u-boot*', '*.bin', - '*.map', '*.img', 'MLO', 'include/autoconf.mk', + '*.map', '*.img', 'MLO', 'SPL', 'include/autoconf.mk', 'spl/u-boot-spl*']) def CopyFiles(self, out_dir, build_dir, dirname, patterns): diff --git a/tools/ifdtool.c b/tools/ifdtool.c index 1d61df19f2..df166161f4 100644 --- a/tools/ifdtool.c +++ b/tools/ifdtool.c @@ -987,7 +987,7 @@ int main(int argc, char *argv[]) print_usage(argv[0]); exit(EXIT_FAILURE); } - ifile->addr = strtol(optarg, NULL, 0); + ifile->addr = strtoll(optarg, NULL, 0); ifile->type = opt == 'f' ? IF_fdt : opt == 'U' ? IF_uboot : IF_normal; if (ifile->type == IF_fdt) |
