diff --git a/Makefile b/Makefile index f7a5f06..3ae8e3f 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ export TOPDIR ifeq (include/config.mk,$(wildcard include/config.mk)) # load ARCH, BOARD, and CPU configuration include include/config.mk -export ARCH CPU BOARD VENDOR SOC +export ARCH CPU BOARD VENDOR SOC LOGO ifndef CROSS_COMPILE ifeq ($(HOSTARCH),ppc) CROSS_COMPILE = diff --git a/tools/Makefile b/tools/Makefile index d3dcc7d..5b36ba2 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -38,8 +38,10 @@ #endif LOGO_H = $(TOPDIR)/include/bmp_logo.h -ifeq ($(LOGO_BMP),) -LOGO_BMP= logos/denx.bmp +ifeq ($(LOGO),) +LOGO_BMP= denx.bmp +else +LOGO_BMP= $(LOGO) endif #------------------------------------------------------------------------- @@ -195,8 +197,8 @@ crc32.c: @rm -f crc32.c ln -s ../lib_generic/crc32.c crc32.c -$(LOGO_H): bmp_logo $(LOGO_BMP) - ./bmp_logo $(LOGO_BMP) >$@ +$(LOGO_H): bmp_logo logos/$(LOGO_BMP) + ./bmp_logo logos/$(LOGO_BMP) >$@ #########################################################################