From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bo Shen Date: Mon, 3 Mar 2014 18:09:42 +0800 Subject: [U-Boot] [PATCH] kbuild: tools: fix a bug that always builds Denx logo In-Reply-To: <1393839656-24891-1-git-send-email-yamada.m@jp.panasonic.com> References: <1393839656-24891-1-git-send-email-yamada.m@jp.panasonic.com> Message-ID: <531454E6.5010907@atmel.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 > Reported-by: Bo Shen > --- > tools/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Tested-by: Bo Shen > 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