summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <jrigby@freescale.com>2008-10-30 16:39:35 -0600
committerJohn Rigby <jrigby@freescale.com>2009-02-03 09:25:51 -0700
commit92c20fbd3a7788c1a154f50a3f44f28a7763f99a (patch)
tree88975088fb590dfc9ddf844794a87ad74d3d4eac
parent6c6e042ab3bbfb5428e4cdeb38fa27728c63afdd (diff)
downloadu-boot-imx-92c20fbd3a7788c1a154f50a3f44f28a7763f99a.zip
u-boot-imx-92c20fbd3a7788c1a154f50a3f44f28a7763f99a.tar.gz
u-boot-imx-92c20fbd3a7788c1a154f50a3f44f28a7763f99a.tar.bz2
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>
-rw-r--r--board/ads5121/ads5121_diu.c4
-rw-r--r--include/configs/ads5121.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/board/ads5121/ads5121_diu.c b/board/ads5121/ads5121_diu.c
index 4f7dda0..565b63d 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 bb3525f..bb38be6 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