From: John Rigby <jrigby@freescale.com>
Date: Thu, 30 Oct 2008 22:39:35 +0000 (-0600)
Subject: ADS5121 DIU Make inclusion of FSL logo optional
X-Git-Tag: v2009.03-rc1~109^2~7^2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=92c20fbd3a7788c1a154f50a3f44f28a7763f99a;p=u-boot

ADS5121 DIU Make inclusion of FSL logo optional

Make inclusion of FSL logo optional and
turn it off by default.

Signed-off-by: John Rigby <jrigby@freescale.com>
---

diff --git a/board/ads5121/ads5121_diu.c b/board/ads5121/ads5121_diu.c
index 4f7dda0e3e..565b63da4d 100644
--- a/board/ads5121/ads5121_diu.c
+++ b/board/ads5121/ads5121_diu.c
@@ -37,7 +37,11 @@
 #include <video_fb.h>
 #endif
 
+#ifdef CONFIG_FSL_DIU_LOGO_BMP
 extern unsigned int FSL_Logo_BMP[];
+#else
+#define FSL_Logo_BMP NULL
+#endif
 
 static int xres, yres;
 
diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index bb3525f175..bb38be6bf3 100644
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -47,6 +47,7 @@
 #define CONFIG_E300		1	/* E300 Family */
 #define CONFIG_MPC512X		1	/* MPC512X family */
 #define CONFIG_FSL_DIU_FB	1	/* FSL DIU */
+#undef CONFIG_FSL_DIU_LOGO_BMP		/* Don't include FSL DIU binary bmp */
 
 /* video */
 #undef CONFIG_VIDEO