Skip to contentSkip to conversation

kbuild: tools: fix a bug that always builds Denx logo

PATCH In review Masahiro Yamada 3 participants 3 messages Mar 3, 2014 – Mar 4, 2014

lore
Share & tools
lore

Masahiro Yamada

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Reported-by Bo Shen <[email protected]>
---
 tools/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/Makefile +2 -2
index dcd49f8..6af1f33 100644
@@ -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
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 kbuild: tools: fix a bug that always builds Denx logo

Hi Masahiro Yamada,

Quoted 8 lines · Masahiro Yamada

LOGO_BMP was never overwritten by board-specific or vendor-specific logos.

Signed-off-by Masahiro Yamada <[email protected]>
Reported-by Bo Shen <[email protected]>
---
  tools/Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
Tested-by Bo Shen <[email protected]>
Quoted 8 lines
tools/Makefile +0 -0
index dcd49f8..6af1f33 100644
@@ -157,10 +157,10 @@ ifeq ($(LOGO_BMP),)
  LOGO_BMP= $(srctree)/$(src)/logos/denx.bmp

tools/Makefile ifeq ($(LOGO_BMP),) · line 166

Quoted 10 lines
tools/Makefile +2 -2
  # 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

Best Regards,
Bo Shen

#2 lore raw
In reply to Masahiro Yamada
Quoted 6 lines · Masahiro Yamada

LOGO_BMP was never overwritten by board-specific or vendor-specific logos.

Signed-off-by Masahiro Yamada <[email protected]>
Reported-by Bo Shen <[email protected]>
Tested-by Bo Shen <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140304/2669d8cb/attachment.pgp>