From: Peter Meerwald <p.meerwald@bct-electronic.com>
Date: Tue, 10 Jul 2012 06:07:34 +0000 (+0000)
Subject: beagle: only call DSS code when #defined CONFIG_VIDEO_OMAP3
X-Git-Tag: v2012.10-rc1~332
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2c30c1848742af9ae880870794c7e93660c31e52;p=u-boot

beagle: only call DSS code when #defined CONFIG_VIDEO_OMAP3

Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
---

diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 2b61cb89ef..99f833f041 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;
 }