eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot

Browse Source
This commit is contained in:
Stefano Babic
2015-07-17 11:22:56 +02:00
parent 425640256a 605e15db2b
commit f448c5d320
133 changed files with 2537 additions and 1764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/buildman/builderthread.py
View File

@@ -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):

2
tools/ifdtool.c
View File

@@ -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)