Merge "Support including DTB image"

2019-01-23 20:56:55 +00:00
parent 2ec9fcd951 9683b2f136
commit 2463c3ab2a
2 changed files with 34 additions and 0 deletions
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -588,6 +588,11 @@ def _BuildBootableImage(sourcedir, fs_config_file, info_dict=None,
    cmd.append("--second")
    cmd.append(fn)

+  fn = os.path.join(sourcedir, "dtb")
+  if os.access(fn, os.F_OK):
+    cmd.append("--dtb")
+    cmd.append(fn)
+
  fn = os.path.join(sourcedir, "cmdline")
  if os.access(fn, os.F_OK):
    cmd.append("--cmdline")