diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-06-09 18:40:16 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-06-18 07:10:20 +0200 |
| commit | f2135e7811fec7174f5a74bc579a6a8f936d1100 (patch) | |
| tree | 341f8bf3695aa505400854ba1adf11a316dbdfe5 /package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch | |
| parent | 7afe1caf7000f4ca671d3d681feef11af01e8551 (diff) | |
| download | upstream-f2135e7811fec7174f5a74bc579a6a8f936d1100.tar.gz upstream-f2135e7811fec7174f5a74bc579a6a8f936d1100.tar.bz2 upstream-f2135e7811fec7174f5a74bc579a6a8f936d1100.zip | |
uboot-sunxi: update to version 2018.05
This patch 220-add-sunxi50i-nanopi-neo-plus2.patch was merged upstream.
The u-boot-sunxi-with-spl.bin is now also created for the ARM64 sunxi
boards by U-Boot itself, no need to do it manually any more.
This was tested on a H2+ Orange Pi R1 and a H5 Orange Pi Zero Plus.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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..2c63ad322e 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 @@ -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_ +@@ -649,9 +649,14 @@ static int fit_handle_file(struct image_ } *cmd = '\0'; } else if (params->datafile) { @@ -26,10 +26,10 @@ Cc: Simon Glass <sjg@chromium.org> + 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); + /* dtc -I dts -O dtb -p 500 -o tmpfile datafile */ + snprintf(cmd, sizeof(cmd), "%s %s -o \"%s\" \"%s\"", +- MKIMAGE_DTC, params->dtc, tmpfile, params->datafile); ++ dtc, params->dtc, tmpfile, params->datafile); debug("Trying to execute \"%s\"\n", cmd); } else { snprintf(cmd, sizeof(cmd), "cp \"%s\" \"%s\"", |