From d2f906500eb31e2661aacb99d811ab07da0fd5bd Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 30 Jan 2016 16:37:51 -0700 Subject: [PATCH] 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 Acked-by: Anatolij Gustschin Signed-off-by: Tom Warren --- arch/arm/mach-tegra/tegra20/Makefile | 2 +- board/toradex/colibri_t20/colibri_t20.c | 2 +- configs/colibri_t20_defconfig | 1 + configs/harmony_defconfig | 1 + configs/medcom-wide_defconfig | 1 + configs/paz00_defconfig | 1 + configs/seaboard_defconfig | 1 + configs/tec_defconfig | 1 + configs/ventana_defconfig | 1 + drivers/video/Kconfig | 8 ++++++++ drivers/video/Makefile | 2 +- include/configs/colibri_t20.h | 1 - include/configs/harmony.h | 1 - include/configs/medcom-wide.h | 1 - include/configs/paz00.h | 1 - include/configs/seaboard.h | 1 - include/configs/tec.h | 1 - include/configs/ventana.h | 1 - 18 files changed, 18 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-tegra/tegra20/Makefile b/arch/arm/mach-tegra/tegra20/Makefile index fc3fb4ae4c..efcf843a2a 100644 --- a/arch/arm/mach-tegra/tegra20/Makefile +++ b/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 diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c index 83e1ddc734..879f25a538 100644 --- a/board/toradex/colibri_t20/colibri_t20.c +++ b/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) diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index 982cee4bcc..9b198e07da 100644 --- a/configs/colibri_t20_defconfig +++ b/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 diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig index a3f73ccac8..d1abd4bca8 100644 --- a/configs/harmony_defconfig +++ b/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 diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig index 6c9e41af83..579a338f8e 100644 --- a/configs/medcom-wide_defconfig +++ b/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 diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig index 9d7350ab83..37118f8aed 100644 --- a/configs/paz00_defconfig +++ b/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 diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index ad16a10d5b..3ced3cc701 100644 --- a/configs/seaboard_defconfig +++ b/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 diff --git a/configs/tec_defconfig b/configs/tec_defconfig index ea3c3696f5..3b14300ef6 100644 --- a/configs/tec_defconfig +++ b/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 diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig index 3423f24cbd..d83e0d3163 100644 --- a/configs/ventana_defconfig +++ b/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 diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 72afae0d26..b6c0e3cc27 100644 --- a/drivers/video/Kconfig +++ b/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 diff --git a/drivers/video/Makefile b/drivers/video/Makefile index c55e6eda3b..d19a1d9042 100644 --- a/drivers/video/Makefile +++ b/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 diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 7611fc5004..e1aab72db7 100644 --- a/include/configs/colibri_t20.h +++ b/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 diff --git a/include/configs/harmony.h b/include/configs/harmony.h index e0bc7c0d73..89dae8f1ef 100644 --- a/include/configs/harmony.h +++ b/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 diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index 6dfd5e2c40..819cc18c91 100644 --- a/include/configs/medcom-wide.h +++ b/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 diff --git a/include/configs/paz00.h b/include/configs/paz00.h index d9dd9bdcd4..fc590251c4 100644 --- a/include/configs/paz00.h +++ b/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 diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 3e904746f2..87bf1b14bc 100644 --- a/include/configs/seaboard.h +++ b/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 diff --git a/include/configs/tec.h b/include/configs/tec.h index 4b8ca5e8da..453ecc6574 100644 --- a/include/configs/tec.h +++ b/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 diff --git a/include/configs/ventana.h b/include/configs/ventana.h index e9c3500109..be54f95c41 100644 --- a/include/configs/ventana.h +++ b/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