1c1
< # Copyright (c) 2010-2013, 2016 ARM Limited
---
> # Copyright (c) 2010-2013, 2016, 2019 ARM Limited
98d97
< ignore_dtb=options.generate_dtb,
244,245c243
< bm[1], options.dtb_filename, cmdline=cmdline,
< ignore_dtb=options.generate_dtb)
---
> bm[1], options.dtb_filename, cmdline=cmdline)
357,362c355,356
< if buildEnv['TARGET_ISA'] == "arm" and options.generate_dtb:
< # Sanity checks
< if options.dtb_filename:
< fatal("--generate-dtb and --dtb-filename cannot be specified at the"\
< "same time.")
<
---
> if buildEnv['TARGET_ISA'] == "arm" and not options.bare_metal \
> and not options.dtb_filename: