diff options
| author | Puneet Saxena <puneets@nvidia.com> | 2012-01-17 14:54:48 +0530 |
|---|---|---|
| committer | Puneet Saxena <puneets@nvidia.com> | 2012-02-07 01:55:44 -0800 |
| commit | 66ffe73e4ee710bae2b98a79f63ec86a8aa5c13b (patch) | |
| tree | a01e83bec31448185c91ab845f39af412585be04 | |
| parent | 37899c6c8e3752678cfeca10ebbb81fb53e46660 (diff) | |
tegra: Rename "CONFIG_VIDEO_TEGRA2" to "CONFIG_VIDEO_TEGRA"
Enables common LCD support for Tegra2 and Tegra3
BUG=chromium-os:23496
TEST=Built ok for Cardhu, Waluigi and Seaboard.
Change-Id: I938824045440cc4964c2ac6bf727a90ee5f129b4
Signed-off-by: Puneet Saxena <puneets@nvidia.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/14692
| -rw-r--r-- | board/nvidia/common/board.c | 6 | ||||
| -rw-r--r-- | common/cmd_vboot_twostop.c | 6 | ||||
| -rw-r--r-- | drivers/video/Makefile | 2 | ||||
| -rw-r--r-- | include/configs/seaboard.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 049d908adf..4e517deda8 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -303,7 +303,7 @@ static void power_det_init(void) */ int board_init(void) { -#ifdef CONFIG_VIDEO_TEGRA2 +#ifdef CONFIG_VIDEO_TEGRA tegra_lcd_check_next_stage(gd->blob, 0); #endif #ifdef CONFIG_DELAY_CONSOLE @@ -380,7 +380,7 @@ int board_early_init_f(void) init_uarts(gd->blob); #endif -#ifdef CONFIG_VIDEO_TEGRA2 +#ifdef CONFIG_VIDEO_TEGRA /* Get LCD panel size */ lcd_early_init(gd->blob); #endif @@ -486,7 +486,7 @@ void board_panic_no_console(const char *str) int board_late_init(void) { /* Make sure we finish initing the LCD */ -#ifdef CONFIG_VIDEO_TEGRA2 +#ifdef CONFIG_VIDEO_TEGRA tegra_lcd_check_next_stage(gd->blob, 1); #endif return 0; diff --git a/common/cmd_vboot_twostop.c b/common/cmd_vboot_twostop.c index e1c33d72ea..88cc50a9eb 100644 --- a/common/cmd_vboot_twostop.c +++ b/common/cmd_vboot_twostop.c @@ -25,7 +25,7 @@ #include <chromeos/power_management.h> #include <usb.h> -#ifdef CONFIG_VIDEO_TEGRA2 +#ifdef CONFIG_VIDEO_TEGRA /* for tegra_lcd_check_next_stage() */ #include <asm/arch-tegra/dc.h> #endif @@ -327,7 +327,7 @@ twostop_init_vboot_library(firmware_storage_t *file, void *gbb, return err; } -#ifdef CONFIG_VIDEO_TEGRA2 +#ifdef CONFIG_VIDEO_TEGRA tegra_lcd_check_next_stage(gd->blob, 0); #endif VBDEBUG(PREFIX "iparams.out_flags: %08x\n", iparams.out_flags); @@ -637,7 +637,7 @@ twostop_init(struct twostop_fmap *fmap, firmware_storage_t *file, } ret = 0; -#ifdef CONFIG_VIDEO_TEGRA2 +#ifdef CONFIG_VIDEO_TEGRA tegra_lcd_check_next_stage(gd->blob, 0); #endif diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 1626353133..08d2811e78 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -40,7 +40,7 @@ COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o COBJS-$(CONFIG_SED156X) += sed156x.o COBJS-$(CONFIG_VIDEO_SM501) += sm501.o COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o -COBJS-$(CONFIG_VIDEO_TEGRA2) += tegra2.o +COBJS-$(CONFIG_VIDEO_TEGRA) += tegra2.o COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o COBJS-$(CONFIG_VIDEO_COREBOOT) += coreboot_fb.o COBJS-$(CONFIG_VIDEO_TEST) += test_lcd.o diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 4cb34d6185..73ceadd10f 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -247,7 +247,7 @@ * LCDC configuration */ #define CONFIG_LCD -#define CONFIG_VIDEO_TEGRA2 +#define CONFIG_VIDEO_TEGRA /* TODO: This needs to be configurable at run-time */ #define LCD_BPP LCD_COLOR16 |