diff mbox

[U-Boot,for,v2016.07] mkimage -l is broken for images after gpimage

Message ID 1468246188-19412-1-git-send-email-sbabic@denx.de
State Accepted
Commit 969cd1fa6df4d13615e26afbf03864670af6c098
Delegated to: Tom Rini
Headers show

Commit Message

Stefano Babic July 11, 2016, 2:09 p.m. UTC
Because a gpimage cannot be detected, a false
GP header is printed instead of checking
for further image types.

Move gpimage as last to be linked, letting check
all other image types and printing a GP header just
in case no image is detected.

Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 tools/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Tom Rini July 11, 2016, 2:58 p.m. UTC | #1
On Mon, Jul 11, 2016 at 04:09:48PM +0200, Stefano Babic wrote:

> Because a gpimage cannot be detected, a false
> GP header is printed instead of checking
> for further image types.
> 
> Move gpimage as last to be linked, letting check
> all other image types and printing a GP header just
> in case no image is detected.
> 
> Signed-off-by: Stefano Babic <sbabic@denx.de>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/tools/Makefile b/tools/Makefile
index 63355aa..f72294a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -76,8 +76,6 @@  dumpimage-mkimage-objs := aisimage.o \
 			lib/fdtdec.o \
 			fit_common.o \
 			fit_image.o \
-			gpimage.o \
-			gpimage-common.o \
 			common/image-fit.o \
 			image-host.o \
 			common/image.o \
@@ -100,6 +98,8 @@  dumpimage-mkimage-objs := aisimage.o \
 			zynqimage.o \
 			zynqmpimage.o \
 			$(LIBFDT_OBJS) \
+			gpimage.o \
+			gpimage-common.o \
 			$(RSA_OBJS-y)
 
 dumpimage-objs := $(dumpimage-mkimage-objs) dumpimage.o