From patchwork Sat Jul 16 20:26:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatolij Gustschin X-Patchwork-Id: 104989 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id CDED1B6F85 for ; Sun, 17 Jul 2011 06:27:18 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D0C872807C; Sat, 16 Jul 2011 22:27:14 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kTjVt9NHZ4fB; Sat, 16 Jul 2011 22:27:14 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EF9C92807D; Sat, 16 Jul 2011 22:27:12 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 25BC42807D for ; Sat, 16 Jul 2011 22:27:09 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4rzlPIvvNq5c for ; Sat, 16 Jul 2011 22:27:03 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by theia.denx.de (Postfix) with ESMTP id 5E4252807C for ; Sat, 16 Jul 2011 22:27:00 +0200 (CEST) Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3F7AF1C01CB5; Sat, 16 Jul 2011 22:27:00 +0200 (CEST) X-Auth-Info: zai7cobwGi4oQKVRs8KRQDgN7zIJph8uYzF7BrPREdY= Received: from localhost (p4FDE7726.dip.t-dialin.net [79.222.119.38]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA id DA00E1C00057; Sat, 16 Jul 2011 22:26:59 +0200 (CEST) From: Anatolij Gustschin To: u-boot@lists.denx.de Date: Sat, 16 Jul 2011 22:26:50 +0200 Message-Id: <1310848010-31271-1-git-send-email-agust@denx.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1306739931-19890-1-git-send-email-agust@denx.de> References: <1306739931-19890-1-git-send-email-agust@denx.de> Subject: [U-Boot] [PATCH] digsy_mtc: move board into vendor dir and add vendor logo X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Signed-off-by: Anatolij Gustschin --- 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&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?Gids3F2$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^{>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>RfKsu1H-|F2Jzv{@mO`0PIxW>5&=u=1PdT|pltj*`%p%Cv6+=&(z9feo5 z=~unDpT-A~mp_(I=D0=QwU=p|9a;XJEoF2mz_skJNf{JAV#E{t6r> literal 0 HcmV?d00001 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))