On Sun, 30 Oct 2011 19:24:59 +0100 Anatolij Gustschin agust@denx.de wrote:
From: Che-liang Chiou clchiou@chromium.org
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 clchiou@chromium.org Acked-by: Mike Frysinger vapier@gentoo.org Signed-off-by: Anatolij Gustschin agust@denx.de
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