summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-07-01 10:14:40 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-07-01 10:14:40 +0200
commit939c2173a3787daa36be6f5f67c72561f7665f65 (patch)
tree0de80442bce4c39234866a7adf6c3f24bd8e2560 /scripts
parentae0589c5efd09e0b2f00edf4970442ad3b096179 (diff)
parent08c0e206b3614eeecc1c3cee63665077360212e5 (diff)
downloadbarebox-939c2173a3787daa36be6f5f67c72561f7665f65.tar.gz
barebox-939c2173a3787daa36be6f5f67c72561f7665f65.tar.xz
Merge branch 'for-next/multi-image'
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.lib2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 0b56dcc218..307412f8d7 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -329,4 +329,4 @@ $(obj)/%.S: $(obj)/%.dcd
$(call cmd,imximage_S_dcd)
quiet_cmd_imx_image = IMX-IMG $@
- cmd_imx_image = $(obj)/scripts/imx/imx-image -b -c $(CFG_$(@F)) -f $< -o $@
+ cmd_imx_image = $(objtree)/scripts/imx/imx-image -b -c $(CFG_$(@F)) -f $< -o $@