summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-05-27 12:18:43 +0000
committerStefano Babic <sbabic@denx.de>2013-06-03 14:18:28 +0200
commit96903dae0e0119af5c9f7842ff57c775fff38c2e (patch)
tree31ac3e3393af7ed23c0300bf3a6ae0a16d6b3706
parent0c54f4b7c81dc0234ec4a96d0986b7f5321a7680 (diff)
downloadtalos-obmc-uboot-96903dae0e0119af5c9f7842ff57c775fff38c2e.tar.gz
talos-obmc-uboot-96903dae0e0119af5c9f7842ff57c775fff38c2e.zip
build: Use generic boot logo matching
The boot logo matching is now done in following way: - use LOGO_BMP if it is set, or - use $(BOARD).bmp if it exists in tools/logos, or - use $(VENDOR).bmp if it exists in tools/logos, or - use denx.bmp otherwise. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--tools/Makefile27
1 files changed, 10 insertions, 17 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 889c89798d..93f4a84547 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -128,28 +128,21 @@ LOGO-$(CONFIG_LCD_LOGO) += $(LOGO_DATA_H)
LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_H)
LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_DATA_H)
+# Generic logo
ifeq ($(LOGO_BMP),)
LOGO_BMP= logos/denx.bmp
+
+# Use board logo and fallback to vendor
+ifneq ($(wildcard logos/$(BOARD).bmp),)
+LOGO_BMP= logos/$(BOARD).bmp
+else
+ifneq ($(wildcard logos/$(VENDOR).bmp),)
+LOGO_BMP= logos/$(VENDOR).bmp
endif
-ifeq ($(VENDOR),atmel)
-LOGO_BMP= logos/atmel.bmp
-endif
-ifeq ($(VENDOR),esd)
-LOGO_BMP= logos/esd.bmp
-endif
-ifeq ($(VENDOR),freescale)
-LOGO_BMP= logos/freescale.bmp
-endif
-ifeq ($(VENDOR),ronetix)
-LOGO_BMP= logos/ronetix.bmp
-endif
-ifeq ($(VENDOR),syteco)
-LOGO_BMP= logos/syteco.bmp
-endif
-ifeq ($(VENDOR),intercontrol)
-LOGO_BMP= logos/intercontrol.bmp
endif
+endif # !LOGO_BMP
+
# now $(obj) is defined
HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
HOSTSRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
OpenPOWER on IntegriCloud