Patchwork [U-Boot] digsy_mtc: move board into vendor dir and add vendor logo

login
register
mail settings
Submitter Anatolij Gustschin
Date July 16, 2011, 8:26 p.m.
Message ID <1310848010-31271-1-git-send-email-agust@denx.de>
Download mbox | patch
Permalink /patch/104989/
State Accepted
Headers show

Comments

Anatolij Gustschin - July 16, 2011, 8:26 p.m.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
Another digsy_mtc patch for this merge window.
It applies on top of patch series
[PATCH 0/5] mpc5200: digsy_mtc: update for next.

 board/{ => intercontrol}/digsy_mtc/Makefile        |    0
 board/{ => intercontrol}/digsy_mtc/cmd_disp.c      |    0
 board/{ => intercontrol}/digsy_mtc/cmd_mtc.c       |    0
 board/{ => intercontrol}/digsy_mtc/cmd_mtc.h       |    0
 board/{ => intercontrol}/digsy_mtc/digsy_mtc.c     |    0
 board/{ => intercontrol}/digsy_mtc/eeprom.h        |    0
 .../{ => intercontrol}/digsy_mtc/is42s16800a-7t.h  |    0
 board/{ => intercontrol}/digsy_mtc/is45s16800a2.h  |    0
 boards.cfg                                         |    8 ++++----
 include/configs/digsy_mtc.h                        |    1 +
 tools/Makefile                                     |    3 +++
 tools/logos/intercontrol.bmp                       |  Bin 0 -> 4998 bytes
 12 files changed, 8 insertions(+), 4 deletions(-)
 rename board/{ => intercontrol}/digsy_mtc/Makefile (100%)
 rename board/{ => intercontrol}/digsy_mtc/cmd_disp.c (100%)
 rename board/{ => intercontrol}/digsy_mtc/cmd_mtc.c (100%)
 rename board/{ => intercontrol}/digsy_mtc/cmd_mtc.h (100%)
 rename board/{ => intercontrol}/digsy_mtc/digsy_mtc.c (100%)
 rename board/{ => intercontrol}/digsy_mtc/eeprom.h (100%)
 rename board/{ => intercontrol}/digsy_mtc/is42s16800a-7t.h (100%)
 rename board/{ => intercontrol}/digsy_mtc/is45s16800a2.h (100%)
 create mode 100644 tools/logos/intercontrol.bmp

diff --git a/tools/logos/intercontrol.bmp b/tools/logos/intercontrol.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..cf2a884b2df9e6fd63d89f929b64724d0fa10426
GIT binary patch
literal 4998
zcmeHJEsQEj5dLmME}LNXIJ1(VP!}XYkyDt<ATg65$tcL2K%!m{Cy*nNNF;LQO616q
zNF?&Us_O0;va|0XIo^BXb+)?xzWV8+cV_<l>&x%Z_3IPRrSuP}P5K4T+=10^)c-L0
zo4SxK`k$Zq_k!map;x>Jy$ZGQD%5VHt<*)k+eNqAL$}vMuh&Pf-$!3*i2iVhq0$J$
z(Fh}@G4mWT8jmqnnlRsylw&-ZFmH|t`D8L>Zpzasrlf8!C!b+Do3TcY8F^p%oOP(r
z=a`d*qnv!nTI5UeagHVVa=F5CwPK9|EAol*HCF32)=C@ZEU?~eup!On1@jb?Gi<Vq
z@dYySEZZX6Zn0I`G4_P*Zik)H9=rV>ds3F2$PYLigx=^s;qXSjKjDphFZ}%-@1(=w
zOn#)D{CLDsDW~m>JkO~MFOV0c{EULUIGxBZI0-)qC!NnYD_wB8T#)`;U!8!z@ijce
zna`;eMMSZx=}J(O^N6E_IMGF_FKn7ex2I;S)oSqH)~|s1R)R0w8YEgW9yGnlwcu5q
zL8)*eq7Y;@L93);6_*Eir@?KaiVd52no*i2(O@u$l5{a>m@#0!m7rx?Ng8*ogGPt4
zjmBCKfJn*}eWis{d#i%otPHM^-t7{J`e6x>tqe3wH_phk57<W=SiTWgTLGTjh^(~q
z7n%r)3bKVI7*!M;%#0N|7%QsUsvB_w*Gh}`rBx;=JE-CxDFe+kv8%%Sdo>^{>rbV;
zs=!~0avXXP4RgQ{qz5yjbJZNG91A*e8h_`xM5%wG_#aC;=W?B!;tZuiw<(0Fv&N++
zk8_HFYo;Q&B=OJM`d(_o9%AJ2V}GJgdl5jW?$77WD|Yp(-L~o|EUpat>RfK<CG_!F
z0f_x?#JgL0<W(l|*bd6<K)AcnBB|-crYpMyg;`$<s=0r1hbl|lECC%q4SqDZx1vj}
zNvx>su1H-|F2Jzv{@mO`0P<P4aL+nU=s)ISC2I!sfAzw5KxDaMFSyhn=JIJT?r7?#
zEIgd{c7ajh-Pm+5MfdEpB$i*ZtH@0pX08feb|?Yexg_%Xo1qacI-!y;>IxW>5&=<q
zoUz2**^1@7`j(2*#NJAl%8Hg1DLu3oRKGFP>u=1PdT|pltj*`%p%Cv6+=&(z9feo5
z=~unDpT-A~mp_(I=D0=QwU=p|9a;XJEoF2mz_skJNf{JAV#E{<rpjGyl%*=UE8-8`
V3!BqctLOhzzJDw~BYxls{0k2L>t6r>

literal 0
HcmV?d00001
Wolfgang Denk - July 27, 2011, 9:27 p.m.
Dear Anatolij Gustschin,

In message <1310848010-31271-1-git-send-email-agust@denx.de> you wrote:
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
> Another digsy_mtc patch for this merge window.
> It applies on top of patch series
> [PATCH 0/5] mpc5200: digsy_mtc: update for next.
> 
>  board/{ => intercontrol}/digsy_mtc/Makefile        |    0
>  board/{ => intercontrol}/digsy_mtc/cmd_disp.c      |    0
>  board/{ => intercontrol}/digsy_mtc/cmd_mtc.c       |    0
>  board/{ => intercontrol}/digsy_mtc/cmd_mtc.h       |    0
>  board/{ => intercontrol}/digsy_mtc/digsy_mtc.c     |    0
>  board/{ => intercontrol}/digsy_mtc/eeprom.h        |    0
>  .../{ => intercontrol}/digsy_mtc/is42s16800a-7t.h  |    0
>  board/{ => intercontrol}/digsy_mtc/is45s16800a2.h  |    0
>  boards.cfg                                         |    8 ++++----
>  include/configs/digsy_mtc.h                        |    1 +
>  tools/Makefile                                     |    3 +++
>  tools/logos/intercontrol.bmp                       |  Bin 0 -> 4998 bytes
>  12 files changed, 8 insertions(+), 4 deletions(-)
>  rename board/{ => intercontrol}/digsy_mtc/Makefile (100%)
>  rename board/{ => intercontrol}/digsy_mtc/cmd_disp.c (100%)
>  rename board/{ => intercontrol}/digsy_mtc/cmd_mtc.c (100%)
>  rename board/{ => intercontrol}/digsy_mtc/cmd_mtc.h (100%)
>  rename board/{ => intercontrol}/digsy_mtc/digsy_mtc.c (100%)
>  rename board/{ => intercontrol}/digsy_mtc/eeprom.h (100%)
>  rename board/{ => intercontrol}/digsy_mtc/is42s16800a-7t.h (100%)
>  rename board/{ => intercontrol}/digsy_mtc/is45s16800a2.h (100%)
>  create mode 100644 tools/logos/intercontrol.bmp

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/board/digsy_mtc/Makefile b/board/intercontrol/digsy_mtc/Makefile
similarity index 100%
rename from board/digsy_mtc/Makefile
rename to board/intercontrol/digsy_mtc/Makefile
diff --git a/board/digsy_mtc/cmd_disp.c b/board/intercontrol/digsy_mtc/cmd_disp.c
similarity index 100%
rename from board/digsy_mtc/cmd_disp.c
rename to board/intercontrol/digsy_mtc/cmd_disp.c
diff --git a/board/digsy_mtc/cmd_mtc.c b/board/intercontrol/digsy_mtc/cmd_mtc.c
similarity index 100%
rename from board/digsy_mtc/cmd_mtc.c
rename to board/intercontrol/digsy_mtc/cmd_mtc.c
diff --git a/board/digsy_mtc/cmd_mtc.h b/board/intercontrol/digsy_mtc/cmd_mtc.h
similarity index 100%
rename from board/digsy_mtc/cmd_mtc.h
rename to board/intercontrol/digsy_mtc/cmd_mtc.h
diff --git a/board/digsy_mtc/digsy_mtc.c b/board/intercontrol/digsy_mtc/digsy_mtc.c
similarity index 100%
rename from board/digsy_mtc/digsy_mtc.c
rename to board/intercontrol/digsy_mtc/digsy_mtc.c
diff --git a/board/digsy_mtc/eeprom.h b/board/intercontrol/digsy_mtc/eeprom.h
similarity index 100%
rename from board/digsy_mtc/eeprom.h
rename to board/intercontrol/digsy_mtc/eeprom.h
diff --git a/board/digsy_mtc/is42s16800a-7t.h b/board/intercontrol/digsy_mtc/is42s16800a-7t.h
similarity index 100%
rename from board/digsy_mtc/is42s16800a-7t.h
rename to board/intercontrol/digsy_mtc/is42s16800a-7t.h
diff --git a/board/digsy_mtc/is45s16800a2.h b/board/intercontrol/digsy_mtc/is45s16800a2.h
similarity index 100%
rename from board/digsy_mtc/is45s16800a2.h
rename to board/intercontrol/digsy_mtc/is45s16800a2.h
diff --git a/boards.cfg b/boards.cfg
index 4522ea7..3e3d428 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -317,10 +317,10 @@  a4m072                       powerpc     mpc5xxx     a4m072
 BC3450                       powerpc     mpc5xxx     bc3450
 canmb                        powerpc     mpc5xxx
 cm5200                       powerpc     mpc5xxx
-digsy_mtc                    powerpc     mpc5xxx     digsy_mtc
-digsy_mtc_RAMBOOT            powerpc     mpc5xxx     digsy_mtc           -              -           digsy_mtc:SYS_TEXT_BASE=0x00100000
-digsy_mtc_rev5               powerpc     mpc5xxx     digsy_mtc           -              -           digsy_mtc:DIGSY_REV5
-digsy_mtc_rev5_RAMBOOT       powerpc     mpc5xxx     digsy_mtc           -              -           digsy_mtc:SYS_TEXT_BASE=0x00100000,DIGSY_REV5
+digsy_mtc                    powerpc     mpc5xxx     digsy_mtc           intercontrol
+digsy_mtc_RAMBOOT            powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:SYS_TEXT_BASE=0x00100000
+digsy_mtc_rev5               powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:DIGSY_REV5
+digsy_mtc_rev5_RAMBOOT       powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:SYS_TEXT_BASE=0x00100000,DIGSY_REV5
 galaxy5200                   powerpc     mpc5xxx     galaxy5200          -              -           galaxy5200:galaxy5200
 galaxy5200_LOWBOOT           powerpc     mpc5xxx     galaxy5200          -              -           galaxy5200:galaxy5200_LOWBOOT
 icecube_5200                 powerpc     mpc5xxx     icecube             -              -           IceCube
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index c2b642c..ba3097d 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -97,6 +97,7 @@ 
 #define CONFIG_VIDEO_CORALP
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
diff --git a/tools/Makefile b/tools/Makefile
index 97f83f8..de96e34 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -129,6 +129,9 @@  endif
 ifeq ($(VENDOR),syteco)
 LOGO_BMP= logos/syteco.bmp
 endif
+ifeq ($(VENDOR),intercontrol)
+LOGO_BMP= logos/intercontrol.bmp
+endif
 
 # now $(obj) is defined
 HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))