summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Meerwald <p.meerwald@bct-electronic.com>2012-07-10 06:07:34 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-09-01 14:58:10 +0200
commit2c30c1848742af9ae880870794c7e93660c31e52 (patch)
tree321176ab4e032edf824bea9b676d0e0b9a7bfe26
parent99b603e7143ab7ba8460000675eb46382f1afdc7 (diff)
downloadu-boot-imx-2c30c1848742af9ae880870794c7e93660c31e52.zip
u-boot-imx-2c30c1848742af9ae880870794c7e93660c31e52.tar.gz
u-boot-imx-2c30c1848742af9ae880870794c7e93660c31e52.tar.bz2
beagle: only call DSS code when #defined CONFIG_VIDEO_OMAP3
Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
-rw-r--r--board/ti/beagle/beagle.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 2b61cb8..99f833f 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -228,6 +228,7 @@ static unsigned int get_expansion_id(void)
return expansion_config.device_vendor;
}
+#ifdef CONFIG_VIDEO_OMAP3
/*
* Configure DSS to display background color on DVID
* Configure VENC to display color bar on S-Video
@@ -282,6 +283,7 @@ static void beagle_dvi_pup(void)
break;
}
}
+#endif
/*
* Routine: misc_init_r
@@ -458,9 +460,11 @@ int misc_init_r(void)
dieid_num_r();
+#ifdef CONFIG_VIDEO_OMAP3
beagle_dvi_pup();
beagle_display_init();
omap3_dss_enable();
+#endif
return 0;
}