diff options
| author | Zoltan HERPAI <wigyori@uid0.hu> | 2018-02-16 11:40:34 +0100 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2018-02-16 12:17:15 +0100 |
| commit | 94ef87f49dbada855ce9b2a00b2bd62ffa509336 (patch) | |
| tree | 3603204ad906a5aeeea268dab416135fe4d3aa96 /package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch | |
| parent | 4bc1ebbd88a2aef177a7d4c36c8cd5fbf7cf0bd0 (diff) | |
| download | upstream-94ef87f49dbada855ce9b2a00b2bd62ffa509336.tar.gz upstream-94ef87f49dbada855ce9b2a00b2bd62ffa509336.tar.bz2 upstream-94ef87f49dbada855ce9b2a00b2bd62ffa509336.zip | |
Revert "uboot-sunxi: bump to 2017.11"
This reverts commit 805f756d6e4ff5061380baf5e262aec72abcf195.
Move back to 2017.07 until we move sunxi to GCC7.
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch')
| -rw-r--r-- | package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 249157958b..d61895a3f9 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 637800493945ffed2f454756300437a4ec86e3b1 Mon Sep 17 00:00:00 2001 +From 5b707cdadb35d896daafff52983416e1c617745b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens <hauke@hauke-m.de> Date: Wed, 19 Jul 2017 22:23:15 +0200 -Subject: mkimage: check environment for dtc binary location +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 @@ -17,7 +17,7 @@ Cc: Simon Glass <sjg@chromium.org> --- a/tools/fit_image.c +++ b/tools/fit_image.c -@@ -650,9 +650,14 @@ static int fit_handle_file(struct image_ +@@ -647,9 +647,14 @@ static int fit_handle_file(struct image_ } *cmd = '\0'; } else if (params->datafile) { @@ -27,9 +27,9 @@ Cc: Simon Glass <sjg@chromium.org> + 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", |