[U-Boot] [PATCH v3 1/2] build: Use generic boot logo matching

[U-Boot] [PATCH v3 1/2] build: Use generic boot logo matching

[Otavio Salvador]

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>
---
Changes in v3:
- New patch, which replaces the 1/2 from v1 and v2

Changes in v2: None

 tools/Makefile | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 889c897..93f4a84 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))
-- 
1.8.1

[U-Boot] [PATCH v3 2/2] wandboard: Add Boot Splash image with Wandboard logo

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v3:
- Remove Makefile change as it is not need anymore

Changes in v2:
- Move config changes to video block

 include/configs/wandboard.h |   2 ++
 tools/logos/wandboard.bmp   | Bin 0 -> 22390 bytes
 2 files changed, 2 insertions(+)
 create mode 100644 tools/logos/wandboard.bmp

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index d4ac086..823e17b 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -95,8 +95,10 @@
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IPUV3_CLK 260000000
 
 #if defined(CONFIG_MX6DL)
diff --git a/tools/logos/wandboard.bmp b/tools/logos/wandboard.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..7f288a8e8eee052c96b9c2c2699e2e3d3efe1758
GIT binary patch
literal 22390
zcmeHPKaBH6b|3zcL~*sEC~_rAD{-}4%c96z4!InpF_0YM;u09CT%>U6)}@ig#UX%8
zmj;r+#icM1BrXntfdhgZ;3N)k4&c&A5Wu*&aA)8Uz=bc(A-^{xuBh+Rw at dAQ{?7i^
z1FT36-+MFj=Djy>-aPIf|Jh&sIg{lNOvYl|#TsLOf~&?XS^wi#8T+`e{!mFTWa(HI
zJ32aIp69XC(^K}s3oo$MDrRY#GR|{WmL+ at XrI*+r{o#+<%P+soe)5w)Wv{&Q3VZd{
zSJ`W?y~bXD{dM-n8*i{T-+Yt3_10VLr$7Bm_V(Lvvv=NkhrRpmyX>$2`fu2K at 4d%<
z_Orib@4x>(`@6sY2ll}SAF!YQ{2$qeAAZPw at r!?A|NP5evX4Ic7xvM={u}%F<9}zr
z`s6>@C%^iHefsIA?6c24WB>VI|II%C{B!o}Uw^^==Zi1cmtTI#zWVAb_M6}QFZ=rI
zuh}=>{FZ(5+y7&~``z!<pnmxMfdfBq;9w3IrtSEXMVusA#;IgH%aV0`9(ayr>Ic(%
z9uZ7y5JX&vl4nW0IzO9FgJ3e9htVotXQ&rE8V{@o&MT{b5?zTbj%Fjb-)$M2wMNQ=
zX0*C}cQlV;F7k7~-+CUUq|uoAlSGK+*y)<a4e(%>6U3riPkMDW-hlCZz3MHvh)?XB
zShO9m*&C&ThxWGSf!tYBp3fclevOOiEb=0FVA|KuuIBB7)yQ6y>*L0ZeGUMRId|_g
z3@^`)?u7WgMCv5GcSy%uTeraFi-)6n6EQr5P3F?yGRiN82kYx0jeVD3vvspoZqsM)
zYP983E1eyL{9PLNp?%@29SkQ at A&#BO?SqlTwRO>0pVgkWP|xGtD%){{hQhgNlmkB8
ziW9SWP<y%w@B9C5C}#CR^!TIZYT)&@$`vLx0W!{b|H0TNeO8X^V^4xdhCYSw?QJ0J
ztY*bqGco>tij%gpd991d4fn=eENh;@A~u-Osqw0HUW#(5lr!L4>vg;mlNy6>XyH5e
zsypu7p-=im at Gatqx0yEe>WoU$VR}i7(pOQXg4StX_|?Oc8*RIu=Mpy!$Mc57WX<vX
zf#R=@I=t+AUQfzp+x0zLBhcZ{8 at f(4Tc(Q&RJnE~zPde{h2gkQ9nfr0R^!%tvJq6c
zvZ956x@T#Q4|3P^G+py6m(dsmVL0`=Y5+Fiq(j&q0#8yfhm-JZHX6uk{U|K5#lV!j
z>1PP!`}{<r>axn=ZYz!f>Tu;0w7hd(%rT@}i-)Kc9{{ko7NU?!JK`cm6DWPug)PXl
zm=WX5NhxwPU`3)V5d<r;<xtK<KNVL9eu;uFUCAjsq+pm3c}zPAhYLQEeKA2Qw)GPs
zvH at PSp$WypG(vF&dLjospc~^j6Y;sPG2KgZNhg~UQ#4PMIjv%?=&CHw(WO?96cQl6
zR7PBL&e7Ox(1FgSXtT$KXSR+<p6r&sj`X9<)!3-Cp_49pnTJid#PpDwA?6NgWOJGp
z;+PUwzYvATFbpv#K1mSb(*;0@Q{c>)7}d{ko9EPJ?h%EUUZq5l_|aYpv1+59brVs}
zm_DMpf%N+TSX<0o;Hv256N70zM3BUV&GaF)k!8fICGa&LVBnJme33xL3_=vydX1J-
zqEE#R5Q8gLqrv3@q95lxPK8kO&c^E&Tb$|oBJ)P8qU7;tBdH4Y$-fqjNK8#;Kvpo<
zght(tNfSK0jBRFuPb5zkhAT=XPa^RL{v3?RG41U5QWVqUV|RuTMJ?6>LK!(`cY^+d
zfbM}W0qN$n5Lm7aj1&CR`oO=$xT(R+A9y5$#Tfh>;~4^U4EFO;r{$s_Wgz8A@`<K}
zW8}m)k&SJg2qfD<8oi;6`X-peDDtNlVk*TRYKU1mNsSgHfiDBM<|k~i_ue_+H73hq
zUCA&GnPhCFgq_|9EVU$0;FCTgd8znxPV?(v;uCbZe@VlK8bGbqHtCt5_sk41a4gR@
z3CO0byA_|h=xy#37>2pVMCe2hR>hcy0W{y70egh^%mQR;k=}``zI+mdXA!?he;FXx
zbln!icA~6jkNHYx0Wn>c5Kj0gF>F3ZbX;13Eyj&^Fi&YJ3WqtFNG`z^Vm!%xnM*y&
zXu1`j`f{)ppCW2n_rN-MvfvZ+6M8U_^5bK)D#AewT0ya<U{ZmC3+xEV6Zh>1byKn%
z)IdUf)m_OMqp$1Ev1Eht21y_bSLvN+pA!|rL#>#DU3~|Jpe9dvMa3!Bn6MMAlN2K|
z8<<Bv*I6{x+@j_`$TzqBOiMADa^Y*RJpt6_oQ6-<cI{ey3}gjGlzcMi7dB*vPm-fR
z>1EKDR=azG364zS7Nm+wn-t<$DqiMWJ+O=H74ZpX2R~3s6e&+~!RlO!5<{V)u|66M
z)ubO$!%!QbaKcNZ_XBbz#5mx*+{dRjEP5dV5>k=K1t;J~%q{wC9B;iR+1PDA)(R%u
zO+;v6Z0_(<TuOuIW`aA+hAIY-FVee-0ny<hEY!w6sa<9l_+Ta0J1kZidR4Ca(mbt{
zq?7891%ia;Cz9by%&g=SIu9W^s|@0r<cXP}M-WuB0oVYmM5UXHa;iytr0~u$P!0XU
z@~2@|Q685kJziU_5ifW!o&+A~_xPCgIXtKHaAU6&_1k|384M##)7o9ZGTJZ$(la27
z9T-D!24j?b3i_y;_veD55%3GdhEHJS5`3aLrcz=>km9(RFp^AZsWA;p19m$ndqaH6
z7bn3IVnF+JX@;ddnV=Wd`7}{uu%NLMX`e(m3YK`nS|<4f at pQ&00qOlC<uvUu2$i!j
zME!KxaWmLQGdXnE3yYm~^_j?*IHs@+j9)rR8ccQsrU+?;NaN<GTx3q`{1Lr_RfB^?
z@>DE_!x?NGsTHg at l#L2`5D9ck9~2 at Tz@E^9<df7t09FQ2+9&MWMKMu&hv^49BJ}_j
zygHG5f+=O_FbNU^y0quAsXae#fkic$C^i}6TrA@96tiF#%AHau9Vy9s(6?1Ikr!=7
zzNT~zf^uV6;9#a9^jf-6q<2s$=wAB~KGFJig_Q^Llw&>(tmiOH8r+^MxlS<$D<}Db
ztR0CWf_p0MHpvt5iS@~Et=T677KaF_(uQzxX~3`{ks9VhVoAbXbQk`EgHByXkw}3b
zDcu5nt9HKdI5C;zQDe;_BAe2FVSVcn9xZIx0;-h^JRV}a)PL3j1JMa(jY*zR);-q2
zNH=;%>wcU3qZLL1c_P2SJjM92&=Fa37o<2z$CDX8hFENtLGm++PvmFP!cPs5U(g{R
zE|r|2P7qkRfIw-GMzJ!LJdxjo`6$6BgB&_IrYN1+iY~jwNT=}WH+6<H9CX#gaI?zL
z8w*>4L~?Hzcjt*5Z0r=EPUs&xK+Cui$uWAYthgEm280MQZCEyZ%H~112GAur0Hk-3
zKf)QK<PXV}NJoxG<2aLsNAhl?b{qTTkI1hi3uvC<It%77kIE0*bg~11Di`h`AW?vr
zNjrXaG9v$$^bbZE0Fgf!j3NI!Ba;u>{9>=Y4pyp91SCysF5RKW32bVNuoQB`34N2M
z$gB*M5;5h&$ze#jlO8$v)TQyO5=#lbw&U<BNz2SJ1ON^beimxslP)NhdD-vndItvz
zHKhKVvX<*@)nn=Wmb7)`<X1|+KmnG@>R at 3;DQHsT3aNJWvOU_!w5VEA3A7&*_Kks+
zcEq{#o85%-5jw1oGfpcmM0$oqn1%8(j499Zh}5Ao=NaU!6H<;0&(fu at Y+x_OBNAt_
z*i#dzyD|ARc`~kMPWJ$@mP*YG+$;E%gg2*fDu~|2h931m7HgV;*(F~}_QA=MDLPrU
zsv;rwT<-qzY*8~g6*lYT%H6%LkT-g=BWCR}F?(^tc38J;Tb`d9UE7wy2-CJVI^054
zb++2FaZgR?9l)szURx@DLG>Wi?b==J(yL<hJ>RPzVN)AbCJi-1 at NH!;v^E;ByH>^1
ziUzJ)d*J)m;Tqr(Vz*Nn9YAyjXlSs1&4L54 at d;`q;gyFqe7tc;;V&!qp$_^$?zQkb
z9EZuQcD+{qsQYBiA+=fkVBvu<s2b*&!n+&c87(&Q+UK>{xPpWwfR%V?`4|<K5HZ8y
zl;#Bk%h0@{a`asl71=`3ogKlRo+*R8`{p4$^(c-C@3>fDuOl5^jC!2yixwCGeBu{x
zbvc`JZI5Maj{J-v%@y2J)(%A(&ysXJ^aoJFFxx9O`ryS<{7A*E at 83<$8EhA|`;+^&
zDNIY^NsnXuh#<B|$PbC@N1XKzv}TBNlYjISiZN9V)>9z$EJ(=H^UkuwW at 23A0Xe;T
zy4-aOw*4 at CIQa66U|V;`J9|yXJ>Q#RW4{TnzKo|MK2yfWOl2^1{}6gG=NC^QX^cYr
zH*bdaxBvU9)#It|hSLDUua-MAz3GtLMEK=iMoQCl4UzD8ovL8%?`z}-wmVBrUBmg*
zg5vnHbkm!2!Uk)R-^1lJyeNur8s?4482Rh=o=wJqLwF|O?#2nQFXd4Z+H`I+9M)-3
z&h~GFnsgcGBV~N%o7N1+wYSG?nvi at 3Fzt*E7_m_tR+&5dg9!DmXo$nzoMl#re(b)p
z5NgrH&3fPV{4tF0Ld9ycy6M$=KY5Z{Q0r~~MWnvm*-^B at oET*W`6fH2M){yy{YeY+
zK~$OnPp%I+H}KI;ROJao%oEP5*bP8zm51^K;K!<aX$be$;R_1J-MyIJzOc~U>D`Dq
z+(a8IAboY(XqE;)sx9n(xYvcRXg+#%(vdyx_tu+JwMSn!eeNXDon^Xd8`p5%?E#Lg
zYbTFI3$9^zZmhGb`6d|4g0g->vjev8;UtTbGFv1hRd+9%b0w3t?oQzlOg%<kU9I%9
zrU5z4%MxY$ae%Nr-l)-f!fpFZ6mxf)%QKcIz%;1F at d{<7JgYL^9pW%=?rt9~Q@Jlb
zLgEmPDVr82U1JlhyXhk;-xPlX=VZ~Ew(-xX^oz=Kk`2}~GjHvIIk}|Whg*zi&3#X;
z?<;*hn%&0^o3qQFS3haIwYT>JFw at P6up$$t%>@H)*C58hTELH6YnA)KbhCTg9K-)t
z#kf8}IBW=-ZnoOPJk-0{CM)GI{JTNV>c>#}@<37UMxk?obcrEfc;i`g5m(1hcj%06
zHE{FIQM_8GSyn)6k;ifwF9L7iR4d9IT5XEr=CufimB^#}rnrDJrzxdf>NuUdOp#F~
zvsn+ouYtBF@))vKv*%Vr)@Bihi_pgjc<&rvek0Ht?F+%~LB3B_I~!Mu0OxNf2je!f
znrTyZiS!EE{hp<p=fyoDo_2<;%-c)nyr6uls`Qfbv<X@Tf7h#iezCPE{>`7g?6lDy
zPFBcmT1{o*IK9$?Cb{N2M5+hV84N<Cp<12WjTSzTpadydG<#iCp^l2yw{#te?RTvK
z-*=S0zu^uYEd;fXvh`rw|NSUWt~FHFYr!uXY>mx{s1D=3RQV=Pru@|292Y8k9R&6B
zS`NnT4dApYcDCCbFP8~nx8v=DFk~LENE^krjEPKmrBsu&xxcrs*#qi~6=e;{V#dvO
zcNKLy06pt&%$vE~{dBDYYIvn&RgpH3CeSlR8_&t!O@?UL)E&V_Wi=-jSK+AUgu18v
zI`v?-_vEiBEhMuRDlhDIjP`QfVU~;J{d1LRcst5dfUvXbb0DW^y1UypJIJfmXTW7z
z=JwSgci1k at oN0EQE_fqukB5evBCk&ORZ8KF&`<4URPBYm-OXO32JB0Ux^<Ckb1%g+
z1};9j88$Lcy2lrxNG3@UjAVvpqmJGm2(G5GF=2J;asbUfA~6UBr{Pd{Wt!LlxOGs~
z17o`^)L-u2QwHayZ!s&tM>s0gbr;}UdNLBq^Mr4Ga7Hwc28qkOe2xE;w4Cs$!Or9U
zgJ at lpbLqe6$jwq+zdz9?6z0lpLPqq~HE)7PFvGPwDwbWnJ4SM!%&2dQd1p9#eyyJE
z$)O)l+__aC_6q3_3~xJ=+Si76nU$dwqt;-?)!jb0r&woHehg?Dy=NlAo8E`g^$FGI
zA%~3!Ne41JS7P;GHJ;}p|3g8WFKYYCro)}w$9Okw<U0fB<(@vhI^26gx<A(Qhf}mg
Y5sN$h7nMdU`SZg_bIR!>pa)<6ALUp}9RL6T

literal 0
HcmV?d00001

-- 
1.8.1

[U-Boot] [PATCH v3 2/2] wandboard: Add Boot Splash image with Wandboard logo

[Stefano Babic]

On 28/05/2013 00:18, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic




-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH v3 1/2] build: Use generic boot logo matching

[Wolfgang Denk]

Dear Otavio Salvador,

In message <1369693124-26106-1-git-send-email-otavio@ossystems.com.br> you wrote:
> 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>
> ---
> Changes in v3:
> - New patch, which replaces the 1/2 from v1 and v2

Looks good to me, at least it solves the immediate issues.

Thanks!

Acked-by: Wolfgang Denk <wd@denx.de>

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"I'm not a god, I was misquoted."                 - Lister, Red Dwarf

[U-Boot] [PATCH v3 1/2] build: Use generic boot logo matching

[Stefano Babic]

On 28/05/2013 00:18, Otavio Salvador wrote:
> 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>
> ---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic





-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================