tegra: video: Rename CONFIG_VIDEO_TEGRA to CONFIG_VIDEO_TEGRA20

This option refers only to the tegra20 video driver, so name it as such
to avoid confusion with tegra124.

Also move this option to Kconfig.

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

arch/arm/mach-tegra/tegra20/Makefile

@@ -7,7 +7,7 @@
 ifdef CONFIG_SPL_BUILD
 obj-y	+= cpu.o
 else
-obj-$(CONFIG_VIDEO_TEGRA) += display.o
+obj-$(CONFIG_VIDEO_TEGRA20) += display.o
 endif
 
 # The AVP is ARMv4T architecture so we must use special compiler

board/toradex/colibri_t20/colibri_t20.c

@@ -114,7 +114,7 @@ void pin_mux_usb(void)
 }
 #endif
 
-#ifdef CONFIG_VIDEO_TEGRA
+#ifdef CONFIG_VIDEO_TEGRA20
 /*
  * Routine: pin_mux_display
  * Description: setup the pin muxes/tristate values for the LCD interface)

configs/colibri_t20_defconfig

@@ -14,4 +14,5 @@ CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_TEGRA20=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/harmony_defconfig

@@ -16,3 +16,4 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USE_PRIVATE_LIBGCC=y
+CONFIG_VIDEO_TEGRA20=y

configs/medcom-wide_defconfig

@@ -15,4 +15,5 @@ CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_TEGRA20=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/paz00_defconfig

@@ -15,4 +15,5 @@ CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_TEGRA20=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/seaboard_defconfig

@@ -15,4 +15,5 @@ CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_TEGRA20=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/tec_defconfig

@@ -15,4 +15,5 @@ CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_TEGRA20=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/ventana_defconfig

@@ -15,4 +15,5 @@ CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_VIDEO_TEGRA20=y
 CONFIG_USE_PRIVATE_LIBGCC=y

drivers/video/Kconfig

@@ -381,6 +381,14 @@ config VIDEO_SANDBOX_SDL
 	  console device and can display stdout output. Within U-Boot is is
 	  a normal bitmap display and can display images as well as text.
 
+config VIDEO_TEGRA20
+	bool "Enable LCD support on Tegra20"
+	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.
+	   This option enables this support which can be used on devices which
+	   have an LCD display connected.
+
 config VIDEO_TEGRA124
 	bool "Enable video support on Tegra124"
 	depends on DM_VIDEO

drivers/video/Makefile

@@ -57,7 +57,7 @@ obj-$(CONFIG_VIDEO_SED13806) += sed13806.o
 obj-$(CONFIG_VIDEO_SM501) += sm501.o
 obj-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
 obj-$(CONFIG_VIDEO_SUNXI) += sunxi_display.o videomodes.o
-obj-$(CONFIG_VIDEO_TEGRA) += tegra.o
+obj-$(CONFIG_VIDEO_TEGRA20) += tegra.o
 obj-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
 obj-$(CONFIG_VIDEO_VESA) += vesa_fb.o
 obj-$(CONFIG_FORMIKE) += formike.o

include/configs/colibri_t20.h

@@ -55,7 +55,6 @@
 /* LCD support */
 #define CONFIG_LCD
 #define CONFIG_PWM_TEGRA
-#define CONFIG_VIDEO_TEGRA
 #define LCD_BPP				LCD_COLOR16
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES	10

include/configs/harmony.h

@@ -62,7 +62,6 @@
 /* LCD support */
 #define CONFIG_LCD
 #define CONFIG_PWM_TEGRA
-#define CONFIG_VIDEO_TEGRA
 #define LCD_BPP				LCD_COLOR16
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES	10

include/configs/medcom-wide.h

@@ -50,7 +50,6 @@
 /* LCD support */
 #define CONFIG_LCD
 #define CONFIG_PWM_TEGRA
-#define CONFIG_VIDEO_TEGRA
 #define LCD_BPP LCD_COLOR16
 #define CONFIG_SYS_WHITE_ON_BLACK
 

include/configs/paz00.h

@@ -50,7 +50,6 @@
 /* LCD support */
 #define CONFIG_LCD
 #define CONFIG_PWM_TEGRA
-#define CONFIG_VIDEO_TEGRA
 #define LCD_BPP				LCD_COLOR16
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES	10

include/configs/seaboard.h

@@ -68,7 +68,6 @@
 /* LCD support */
 #define CONFIG_LCD
 #define CONFIG_PWM_TEGRA
-#define CONFIG_VIDEO_TEGRA
 #define LCD_BPP				LCD_COLOR16
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES	10

include/configs/tec.h

@@ -50,7 +50,6 @@
 /* LCD support */
 #define CONFIG_LCD
 #define CONFIG_PWM_TEGRA
-#define CONFIG_VIDEO_TEGRA
 #define LCD_BPP LCD_COLOR16
 #define CONFIG_SYS_WHITE_ON_BLACK
 

include/configs/ventana.h

@@ -51,7 +51,6 @@
 /* LCD support */
 #define CONFIG_LCD
 #define CONFIG_PWM_TEGRA
-#define CONFIG_VIDEO_TEGRA
 #define LCD_BPP				LCD_COLOR16
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES	10