Permalink
Browse files

[mbr] allow different logo to be compiled in

The default is wikireader.png, but other logo could be used
by: make mbr BOOT_LOGO=some_logo.png
*_logo.png is ignored in the mbr directory for private logos

Signed-off-by: Christopher Hall <hsw@openmoko.com>
  • Loading branch information...
1 parent 52bfd69 commit 62f020b17e86b3f139fb6d399cbc0f550833a0a7 @hxw hxw committed Mar 15, 2011
Showing with 11 additions and 2 deletions.
  1. +3 −1 Makefile
  2. +2 −0 samo-lib/mbr/.gitignore
  3. +6 −1 samo-lib/mbr/Makefile
  4. BIN samo-lib/mbr/{splash.png → wikireader.png}
View
@@ -54,6 +54,8 @@
#
# TEMPERATURE_DISPLAY Enable temperature display when compiling mahatma.elf/wiki.app [NO]
#
+# BOOT_LOGO A PNG filename in the samo-lib/mbr directory [wikireader.png]
+#
# GRIFO_EXAMPLES Compile / install grifo examples [NO]
#
# EXTRACT_VERSION_FROM a link to XML file name that has an embedded date
@@ -897,7 +899,7 @@ print-mbr-tty:
@echo BOOTLOADER_TTY = "${BOOTLOADER_TTY}"
@echo BOOTLOADER_AUX = "${BOOTLOADER_AUX}"
-$(call STD_RULE, mbr, ${SAMO_LIB}/mbr, gcc fatfs, INSTALL)
+$(call STD_RULE, mbr, ${SAMO_LIB}/mbr, gcc fatfs, INSTALL, LOGO="${BOOT_LOGO}")
$(call STD_RULE, jackknife, ${HOST_TOOLS}/jackknife)
$(call STD_RULE, flash07, ${HOST_TOOLS}/flash07)
View
@@ -15,6 +15,8 @@ menu
version
SAMO_A1.mapfile
splash.h
+splash.png
+*_logo.png
empty.h
adjust.h
flash.rom
View
@@ -42,6 +42,9 @@ $(call REQUIRED_BINARY, ${AWK}, gawk)
# set this to 0 or 1 to control the battery indicator in menu.c
BATTERY_METER ?= 0
+# set this to the name of the logo
+LOGO = wikireader.png
+
# use update YES or NO
# YES => only change serial number if mbr version is ok
# NO => full update even if this will downgrade the mbr
@@ -137,6 +140,8 @@ endef
# Applications for the boot loader
IMAGE_HEADERS = splash.h empty.h adjust.h
+splash.png: ${LOGO}
+ cp "${LOGO}" "$@"
$(call MAKE_APP,version)
$(call MAKE_APP,menu,${IMAGE_HEADERS})
@@ -183,7 +188,7 @@ install: all
.PHONY: clean
clean:
${RM} ${TARGETS} ${APPLICATIONS_CLEAN} ${IMAGE_HEADERS}
- ${RM} *.o *.elf *.d *.p *.asm33 *.header *.map *.rom *.dump
+ ${RM} *.o *.elf *.d *.p *.asm33 *.header *.map *.rom *.dump splash.png
# application headers
%.header: %.c
File renamed without changes

0 comments on commit 62f020b

Please sign in to comment.