[flasher PATCH 1/3] Add libtool to dependency list in README

[flasher PATCH 1/3] Add libtool to dependency list in README

[Stephen Warren]

From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

libtools is required by some of the tools that tegra-uboot-flasher can
build. Add it to the list of dependencies.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 README-developer.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README-developer.txt b/README-developer.txt
index 090f90051c1c..e2648c39f796 100644
--- a/README-developer.txt
+++ b/README-developer.txt
@@ -74,6 +74,7 @@ will be useful:
   build-essential
   autoconf
   automake
+  libtool
   libusb-1.0-0-dev
   libcrypto++-dev
 
-- 
1.8.1.5

[flasher PATCH 2/3] Use O= rather than BUILD_DIR= when building U-Boot

[Stephen Warren]

From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

"make O=" works both before and after U-Boot's conversion to Kbuild,
whereas "make BUILD_DIR=" only works before.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build b/build
index 6142f31e5d5a..f1df6ce9536b 100755
--- a/build
+++ b/build
@@ -159,8 +159,8 @@ def build_uboot_one_board(boardname):
     out_board_dir = gen_out_board_dir(boardname)
     mkdir(out_board_dir)
 
-    run(uboot_dir, 'make BUILD_DIR=' + build_uboot_dir + ' ' + boardname + '_config')
-    run(uboot_dir, 'make BUILD_DIR=' + build_uboot_dir + ' -s ' + makejobs)
+    run(uboot_dir, 'make O=' + build_uboot_dir + ' ' + boardname + '_config')
+    run(uboot_dir, 'make O=' + build_uboot_dir + ' -s ' + makejobs)
 
     import_uboot_one_board(boardname, build_uboot_dir)
 
-- 
1.8.1.5

[flasher PATCH 3/3] Support U-Boot's temporary output DTB path

[Stephen Warren]

From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Historically, U-Boot has generated $(obj)/u-boot.dtb. During the Kbuild
conversion, this file was moved to $(obj)/dts/dt.dtb. While this change
will be imminentely reverted in the U-Boot makefiles, it's quite easy to
support in the flasher build scripts, so we may as well. This prevents
user confusion and/or "git bisect" issues.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 build | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build b/build
index f1df6ce9536b..7bfc2d9d0aa8 100755
--- a/build
+++ b/build
@@ -136,6 +136,8 @@ def import_uboot_one_board(boardname, build_uboot_dir):
     cp(src, dst)
 
     src = os.path.join(build_uboot_dir, 'u-boot.dtb')
+    if not os.path.exists(src):
+        src = os.path.join(build_uboot_dir, 'dts/dt.dtb')
     dst = os.path.join(out_board_dir, 'u-boot.dtb')
     cp(src, dst)
 
-- 
1.8.1.5

Re: [flasher PATCH 1/3] Add libtool to dependency list in README

[Stephen Warren]

On 02/25/2014 11:28 AM, Stephen Warren wrote:
> libtools is required by some of the tools that tegra-uboot-flasher can
> build. Add it to the list of dependencies.

I've applied all 3 patches.