From: Simon Glass <sjg@chromium.org>
Date: Sat, 30 Jan 2016 23:37:54 +0000 (-0700)
Subject: tegra: video: Move the check for CONFIG_OF_CONTROL to Kconfig
X-Git-Tag: v2016.03-rc3~86^2~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=40d56a918c400d6d9b7805c3b30bd310e074c850;p=u-boot

tegra: video: Move the check for CONFIG_OF_CONTROL to Kconfig

We can check this in Kconfig now.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
---

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index b6c0e3cc27..ff4179fcd8 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -383,6 +383,7 @@ config VIDEO_SANDBOX_SDL
 
 config VIDEO_TEGRA20
 	bool "Enable LCD support on Tegra20"
+	depends on OF_CONTROL
 	help
 	   Tegra20 supports video output to an attached LCD panel as well as
 	   other options such as HDMI. Only the LCD is supported in U-Boot.
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 5b8d623e08..fc70beb90b 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -51,10 +51,6 @@ vidinfo_t panel_info = {
 	.vl_col = -1,
 };
 
-#if !CONFIG_IS_ENABLED(OF_CONTROL)
-#error "You must enable CONFIG_OF_CONTROL to get Tegra LCD support"
-#endif
-
 static void update_window(struct dc_ctlr *dc, struct disp_ctl_win *win)
 {
 	unsigned h_dda, v_dda;