|
|
@@ -0,0 +1,35 @@
|
|
|
+From 5b707cdadb35d896daafff52983416e1c617745b Mon Sep 17 00:00:00 2001
|
|
|
+From: Hauke Mehrtens <[email protected]>
|
|
|
+Date: Wed, 19 Jul 2017 22:23:15 +0200
|
|
|
+Subject: [PATCH] mkimage: check environment for dtc binary location
|
|
|
+
|
|
|
+Currently mkimage assumes the dtc binary is in the path and fails
|
|
|
+otherwise. This patch makes it check the DTC environment variable first
|
|
|
+for the dtc binary and then fall back to the default path. This makes
|
|
|
+it possible to call the u-boot build with make DTC=... and build a fit
|
|
|
+image with the dtc binary not being the the default path.
|
|
|
+
|
|
|
+Signed-off-by: Hauke Mehrtens <[email protected]>
|
|
|
+Cc: Simon Glass <[email protected]>
|
|
|
+---
|
|
|
+ tools/fit_image.c | 7 ++++++-
|
|
|
+ 1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
+
|
|
|
+--- a/tools/fit_image.c
|
|
|
++++ b/tools/fit_image.c
|
|
|
+@@ -647,9 +647,14 @@ static int fit_handle_file(struct image_
|
|
|
+ }
|
|
|
+ *cmd = '\0';
|
|
|
+ } else if (params->datafile) {
|
|
|
++ const char* dtc = getenv("DTC");
|
|
|
++
|
|
|
++ if (!dtc)
|
|
|
++ dtc = MKIMAGE_DTC;
|
|
|
++
|
|
|
+ /* dtc -I dts -O dtb -p 500 datafile > tmpfile */
|
|
|
+ snprintf(cmd, sizeof(cmd), "%s %s %s > %s",
|
|
|
+- MKIMAGE_DTC, params->dtc, params->datafile, tmpfile);
|
|
|
++ dtc, params->dtc, params->datafile, tmpfile);
|
|
|
+ debug("Trying to execute \"%s\"\n", cmd);
|
|
|
+ } else {
|
|
|
+ snprintf(cmd, sizeof(cmd), "cp %s %s",
|