kbuild: tools: fix a bug that always builds Denx logo
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Mon, 3 Mar 2014 09:40:56 +0000 (18:40 +0900)
committerTom Rini <trini@ti.com>
Tue, 4 Mar 2014 17:15:31 +0000 (12:15 -0500)
LOGO_BMP was never overwritten by board-specific or
vendor-specific logos.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reported-by: Bo Shen <voice.shen@atmel.com>
Tested-by: Bo Shen <voice.shen@atmel.com>
tools/Makefile

index 8fccc650cc490efa49b0632ed193845a4a18cc33..bac6aafc80b3019fc840ee12235a0be700fe2616 100644 (file)
@@ -157,10 +157,10 @@ ifeq ($(LOGO_BMP),)
 LOGO_BMP= $(srctree)/$(src)/logos/denx.bmp
 
 # Use board logo and fallback to vendor
-ifneq ($(wildcard logos/$(BOARD).bmp),)
+ifneq ($(wildcard $(srctree)/$(src)/logos/$(BOARD).bmp),)
 LOGO_BMP= $(srctree)/$(src)/logos/$(BOARD).bmp
 else
-ifneq ($(wildcard logos/$(VENDOR).bmp),)
+ifneq ($(wildcard $(srctree)/$(src)/logos/$(VENDOR).bmp),)
 LOGO_BMP= $(srctree)/$(src)/logos/$(VENDOR).bmp
 endif
 endif