[flasher PATCH V2] Adapt to new U-Boot build commands

[flasher PATCH V2] Adapt to new U-Boot build commands

[Stephen Warren]

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

U-Boot commit 51148790f26e "kconfig: switch to Kconfig" changed the
commands required to configure U-Boot. Adapt the flasher build script
to those changes, in a way that automatically works with either old or
new U-Boot source trees.

Cc: Masahiro Yamada <yamada.m-NAum8xwdG0+S7A1Ibl2khg@public.gmane.org>
Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
--
v2: Check for the modified "make help" output rather than a file added
by commit 51148790f26e. Hopefully this will be more independant from
changes to U-Boot's implementation details.
---
 build | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/build b/build
index af863dd3b395..b58112e12be2 100755
--- a/build
+++ b/build
@@ -186,7 +186,17 @@ def build_uboot_one_board(boardname):
     out_board_dir = gen_out_board_dir(boardname)
     mkdir(out_board_dir)
 
-    run(uboot_dir, 'make O=' + build_uboot_dir + ' ' + boardname + '_config')
+    # U-Boot commit 51148790f26e "kconfig: switch to Kconfig" changed the
+    # build commands from "make ${board}_config; make" to
+    # "make ${board}_defconfig; make". That commit also introduced some new
+    # text into the "make help" output. Check for that text here in order to
+    # tell how to compile U-Boot:-/
+    ret = subprocess.call('make help 2>/dev/null | grep -q "Configuration targets"', shell=True, cwd=uboot_dir)
+    if ret:
+        config_target_suffix = '_config'
+    else:
+        config_target_suffix = '_defconfig'
+    run(uboot_dir, 'make O=' + build_uboot_dir + ' ' + boardname + config_target_suffix)
     run(uboot_dir, 'make O=' + build_uboot_dir + ' -s ' + makejobs)
 
     import_uboot_one_board(boardname, build_uboot_dir)
-- 
1.9.1

Re: [flasher PATCH V2] Adapt to new U-Boot build commands

[Stephen Warren]

On 08/01/2014 01:40 PM, Stephen Warren wrote:
> From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>
> U-Boot commit 51148790f26e "kconfig: switch to Kconfig" changed the
> commands required to configure U-Boot. Adapt the flasher build script
> to those changes, in a way that automatically works with either old or
> new U-Boot source trees.

I have applied this.