From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anatolij Gustschin Date: Thu, 10 Nov 2011 23:33:52 +0100 Subject: [U-Boot] [PATCH v6 2/4] tools: logo: split bmp arrays from bmp_logo.h In-Reply-To: <1319999099-16231-1-git-send-email-agust@denx.de> References: <1319187862-31863-3-git-send-email-clchiou@chromium.org> <1319999099-16231-1-git-send-email-agust@denx.de> Message-ID: <20111110233352.2f9884e4@wker> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Sun, 30 Oct 2011 19:24:59 +0100 Anatolij Gustschin wrote: > From: Che-liang Chiou > > The generated header bmp_logo.h is useful even outside common/lcd.c for > the logo dimension. However, the problem is, the generated bmp_logo.h > cannot be included multiple times because bmp_logo_palette[] and > bmp_logo_bitmap[] are defined in the bmp_logo.h. > > This patch fixes this by defining these arrays in another header > bmp_logo_data.h and in bmp_logo.h only declaring these arrays. > > Signed-off-by: Che-Liang Chiou > Acked-by: Mike Frysinger > Signed-off-by: Anatolij Gustschin > --- > Changes since V5: > - add bmp_logo_data.h to .gitignore > > Makefile | 1 + > common/lcd.c | 1 + > drivers/video/cfb_console.c | 1 + > include/.gitignore | 1 + > tools/Makefile | 8 ++++- > tools/bmp_logo.c | 80 ++++++++++++++++++++++++++++++++----------- > 6 files changed, 71 insertions(+), 21 deletions(-) Applied to u-boot-video/master, thanks. Anatolij