am 600b4bb6: am 8c1eeffe: am 2b80317b: only auto-generate board= requirement if a board-info file is not specified

Merge commit '600b4bb655e96655b769f390a17a85ad20fc15a5'

* commit '600b4bb655e96655b769f390a17a85ad20fc15a5':
  only auto-generate board= requirement if a board-info file is not specified