crosfw: Enable building beaglebone and VBOOT debugging
The beaglebone has underscore in its name, so is not currently supported. The
fix is to only perform the Chrome OS underscore checking when we know it
is a Chrome OS board.
Also we should always enable VBOOT debugging, so correct that.
BUG=none
TEST=manual
$ crosfw -b am335x_evm -w
See that it now works correctly.
The VBOOT change was tested with a special U-Boot, CLs are still pending in
gerrit.
Change-Id: I19a73b4b0ed617c6a6384bd424858cac38fac374
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/61501
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
diff --git a/scripts/crosfw.py b/scripts/crosfw.py
index ca165f0..8e76a09 100755
--- a/scripts/crosfw.py
+++ b/scripts/crosfw.py
@@ -289,9 +289,13 @@
Log('Building for %s' % options.board)
- # Separate out board_variant string: "peach_pit" becomes "peach", "pit"
+ # Separate out board_variant string: "peach_pit" becomes "peach", "pit".
+ # But don't mess up upstream boards which use _ in their name.
parts = options.board.split('_')
- board = parts[0]
+ if parts[0] in ['daisy', 'peach']:
+ board = parts[0]
+ else:
+ board = options.board
# To allow this to be run from 'cros_sdk'
if in_chroot:
@@ -391,8 +395,7 @@
'QUIET=1',
'CFLAGS_EXTRA_VBOOT=-DUNROLL_LOOPS',
'VBOOT_SOURCE=%s/platform/vboot_reference' % src_root]
- if not options.small:
- base.append('VBOOT_DEBUG=1')
+ base.append('VBOOT_DEBUG=1')
# Handle the Chrome OS USE_STDINT workaround. Vboot needs <stdint.h> due
# to a recent change, the need for which I didn't fully understand. But