From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 10 Apr 2014 01:37:14 +0000 (+0800)
Subject: rk: build resource.img with logo.bmp
X-Git-Tag: firefly_0821_release~5578
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c817f7be5e65051d45f08f7afd09ddd004698f04;p=firefly-linux-kernel-4.4.55.git

rk: build resource.img with logo.bmp
---

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c27cdf4c7a94..84be7af7458a 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -338,6 +338,7 @@ kernel.img: zImage
 	rm -f $(objtree)/zImage-dtb
 	@echo '  Image:  kernel.img (with $*.dtb) is ready'
 
-%.img: %.dtb kernel.img
-	$(Q)$(srctree)/resource_tool $(objtree)/arch/arm/boot/dts/$*.dtb
-	@echo '  Image:  resource.img (with $*.dtb) is ready'
+LOGO := $(notdir $(wildcard $(srctree)/logo.bmp))
+%.img: %.dtb kernel.img $(LOGO)
+	$(Q)$(srctree)/resource_tool $(objtree)/arch/arm/boot/dts/$*.dtb $(LOGO)
+	@echo '  Image:  resource.img (with $*.dtb $(LOGO)) is ready'
diff --git a/logo.bmp b/logo.bmp
new file mode 100644
index 000000000000..c15e2ba028e1
Binary files /dev/null and b/logo.bmp differ