From 7e1e29de757b23de7befc54e2bfc01e60b903170 Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Mon, 5 Feb 2018 17:02:49 +0100 Subject: uboot-sunxi: bump again to 2017.11 Runtime-tested on: - Pine64 (A64) - Orange Pi 2 (H3) - Bananapro (A20) - Olimex A20-Micro (A20) - Pcduino v3 (A20) - Pcduino v2 (A10) Compile-tested on: - all A8/A7/A53 boards Signed-off-by: Zoltan HERPAI --- ...200-mkimage-check-environment-for-dtc-binary-location.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch') diff --git a/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch b/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch index d61895a3f9..249157958b 100644 --- a/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch +++ b/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch @@ -1,7 +1,7 @@ -From 5b707cdadb35d896daafff52983416e1c617745b Mon Sep 17 00:00:00 2001 +From 637800493945ffed2f454756300437a4ec86e3b1 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 19 Jul 2017 22:23:15 +0200 -Subject: [PATCH] mkimage: check environment for dtc binary location +Subject: 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 @@ -17,7 +17,7 @@ Cc: Simon Glass --- a/tools/fit_image.c +++ b/tools/fit_image.c -@@ -647,9 +647,14 @@ static int fit_handle_file(struct image_ +@@ -650,9 +650,14 @@ static int fit_handle_file(struct image_ } *cmd = '\0'; } else if (params->datafile) { @@ -27,9 +27,9 @@ Cc: Simon Glass + dtc = MKIMAGE_DTC; + /* dtc -I dts -O dtb -p 500 datafile > tmpfile */ - snprintf(cmd, sizeof(cmd), "%s %s %s > %s", + 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", + snprintf(cmd, sizeof(cmd), "cp \"%s\" \"%s\"", -- cgit v1.2.3