public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] kbuild: tools: fix a bug that always builds Denx logo
@ 2014-03-03  9:40 Masahiro Yamada
  2014-03-03 10:09 ` Bo Shen
  2014-03-04 19:19 ` [U-Boot] " Tom Rini
  0 siblings, 2 replies; 3+ messages in thread
From: Masahiro Yamada @ 2014-03-03  9:40 UTC (permalink / raw)
  To: u-boot

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>
---
 tools/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index dcd49f8..6af1f33 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
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] kbuild: tools: fix a bug that always builds Denx logo
  2014-03-03  9:40 [U-Boot] [PATCH] kbuild: tools: fix a bug that always builds Denx logo Masahiro Yamada
@ 2014-03-03 10:09 ` Bo Shen
  2014-03-04 19:19 ` [U-Boot] " Tom Rini
  1 sibling, 0 replies; 3+ messages in thread
From: Bo Shen @ 2014-03-03 10:09 UTC (permalink / raw)
  To: u-boot

Hi Masahiro Yamada,

On 03/03/2014 05:40 PM, Masahiro Yamada wrote:
> 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>
> ---
>   tools/Makefile | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)

Tested-by: Bo Shen <voice.shen@atmel.com>

> diff --git a/tools/Makefile b/tools/Makefile
> index dcd49f8..6af1f33 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
>

Best Regards,
Bo Shen

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [U-Boot] kbuild: tools: fix a bug that always builds Denx logo
  2014-03-03  9:40 [U-Boot] [PATCH] kbuild: tools: fix a bug that always builds Denx logo Masahiro Yamada
  2014-03-03 10:09 ` Bo Shen
@ 2014-03-04 19:19 ` Tom Rini
  1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2014-03-04 19:19 UTC (permalink / raw)
  To: u-boot

On Mon, Mar 03, 2014 at 06:40:56PM +0900, Masahiro Yamada wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
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>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-03-04 19:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-03  9:40 [U-Boot] [PATCH] kbuild: tools: fix a bug that always builds Denx logo Masahiro Yamada
2014-03-03 10:09 ` Bo Shen
2014-03-04 19:19 ` [U-Boot] " Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox