summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2010-08-31 19:56:43 -0500
committerAnatolij Gustschin <agust@denx.de>2010-09-21 22:46:02 +0200
commite69e520f9d235bb7d96296081fdfc09b9fee8c46 (patch)
treea690ae6920bf6794df239403e0100bec599bc916 /include/configs
parent68f6618bcd0f06b5558c66ceb607b14f5f46ba03 (diff)
downloadu-boot-imx-e69e520f9d235bb7d96296081fdfc09b9fee8c46.zip
u-boot-imx-e69e520f9d235bb7d96296081fdfc09b9fee8c46.tar.gz
u-boot-imx-e69e520f9d235bb7d96296081fdfc09b9fee8c46.tar.bz2
fsl: refactor MPC8610 and MPC5121 DIU code to use existing bitmap and logo features
The Freescale MPC8610 and MPC5121 DIU code had re-implement two features that already existed in U-Boot: bitmap drawing and top-of-screen logo (CONFIG_VIDEO_LOGO). So delete the 8610-specific code and use the built-in features instead. Signed-off-by: Timur Tabi <timur@freescale.com>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/MPC8610HPCD.h5
-rw-r--r--include/configs/mpc5121ads.h6
2 files changed, 8 insertions, 3 deletions
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 4d9606e..58d3d99 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -24,9 +24,12 @@
/* video */
#undef CONFIG_VIDEO
-#if defined(CONFIG_VIDEO)
+#ifdef CONFIG_VIDEO
+#define CONFIG_CMD_BMP
#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
#endif
#ifdef RUN_DIAG
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 5281042..272502a 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -47,14 +47,16 @@
#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
-#if defined(CONFIG_VIDEO)
+#ifdef CONFIG_VIDEO
+#define CONFIG_CMD_BMP
#define CONFIG_CFB_CONSOLE
#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
#endif
/* CONFIG_PCI is defined at config time */