summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-03-03 18:40:56 +0900
committerTom Rini <trini@ti.com>2014-03-04 12:15:31 -0500
commit603f51cbd2d610fcc52e04fa74b2172712eca644 (patch)
tree47cadd8dc5d2c917e4ceef2ff2baa250720cc7a6
parentdb5b339cca2f7b7824372f02932c3d7c24a34ed3 (diff)
downloadu-boot-imx-603f51cbd2d610fcc52e04fa74b2172712eca644.zip
u-boot-imx-603f51cbd2d610fcc52e04fa74b2172712eca644.tar.gz
u-boot-imx-603f51cbd2d610fcc52e04fa74b2172712eca644.tar.bz2
kbuild: tools: fix a bug that always builds Denx logo
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>
-rw-r--r--tools/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 8fccc65..bac6aaf 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -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