From dd5921104688074e2879bddeb18349bff89688ef Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 27 Apr 2015 11:34:38 -0400 Subject: builderthread.py: Keep 'SPL' On i.MX platforms the SPL binary is called "SPL" so make sure we keep that. Cc: Simon Glass Signed-off-by: Tom Rini Acked-by: Simon Glass --- tools/buildman/builderthread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index ce1cfddf8cf..cf25bb8f1a7 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): -- cgit v1.2.3 From 50e8a6bba0cf5939afe849ef792f88f09a755758 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Mon, 6 Jul 2015 15:57:06 +0800 Subject: tools: ifdtool: Write correct offset on 32-bit machine On 32-bit machine strtol() returns LONG_MAX which is 0x7fffffff, which is wrong for u-boot.rom components like u-boot-x86-16bit.bin. Change to use strtoll() so that it works on both 32-bit and 64-bit machines. Reported-by: Fei Wang Signed-off-by: Bin Meng Acked-by: Simon Glass --- tools/ifdtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/ifdtool.c b/tools/ifdtool.c index 1d61df19f23..df166161f43 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) -- cgit v1.2.3