diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-03-03 18:40:56 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-04 12:15:31 -0500 |
| commit | 603f51cbd2d610fcc52e04fa74b2172712eca644 (patch) | |
| tree | 47cadd8dc5d2c917e4ceef2ff2baa250720cc7a6 /tools/Makefile | |
| parent | db5b339cca2f7b7824372f02932c3d7c24a34ed3 (diff) | |
| download | talos-obmc-uboot-603f51cbd2d610fcc52e04fa74b2172712eca644.tar.gz talos-obmc-uboot-603f51cbd2d610fcc52e04fa74b2172712eca644.zip | |
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>
Diffstat (limited to 'tools/Makefile')
| -rw-r--r-- | tools/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile index 8fccc650cc..bac6aafc80 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 |
