[U-Boot] [PATCH] 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 --- 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

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

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!
participants (3)
-
Bo Shen
-
Masahiro Yamada
-
Tom Rini