dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 15:01:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-video

Browse Source
This commit is contained in:
Tom Rini
2016-02-11 18:18:15 -05:00
parent cc8d698fab 6c88b51305
commit 9ef2835f26
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-tegra/Kconfig
View File

@@ -13,6 +13,7 @@ config TEGRA_COMMON
select DM_SPI select DM_SPI
select DM_SPI_FLASH select DM_SPI_FLASH
select OF_CONTROL select OF_CONTROL
select VIDCONSOLE_AS_LCD
config TEGRA_ARMV7_COMMON config TEGRA_ARMV7_COMMON
bool "Tegra 32-bit common options" bool "Tegra 32-bit common options"

8
common/console.c
View File

@@ -650,6 +650,10 @@ struct stdio_dev *search_device(int flags, const char *name)
struct stdio_dev *dev; struct stdio_dev *dev;
dev = stdio_get_by_name(name); dev = stdio_get_by_name(name);
#ifdef CONFIG_VIDCONSOLE_AS_LCD
if (!dev && !strcmp(name, "lcd"))
dev = stdio_get_by_name("vidconsole");
#endif
if (dev && (dev->flags & flags)) if (dev && (dev->flags & flags))
return dev; return dev;
@@ -795,6 +799,10 @@ done:
#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET #ifndef CONFIG_SYS_CONSOLE_INFO_QUIET
stdio_print_current_devices(); stdio_print_current_devices();
#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ #endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
#ifdef CONFIG_VIDCONSOLE_AS_LCD
if (strstr(stdoutname, "lcd"))
printf("Warning: Please change 'lcd' to 'vidconsole' in stdout/stderr environment vars\n");
#endif
#ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
/* set the environment variables (will overwrite previous env settings) */ /* set the environment variables (will overwrite previous env settings) */

10
drivers/video/Kconfig
View File

@@ -91,6 +91,16 @@ config CONSOLE_TRUETYPE_SIZE
source "drivers/video/fonts/Kconfig" source "drivers/video/fonts/Kconfig"
config VIDCONSOLE_AS_LCD
bool "Use 'vidconsole' when 'lcd' is seen in stdout"
depends on DM_VIDEO
help
This is a work-around for boards which have 'lcd' in their stdout
environment variable, but have moved to use driver model for video.
In this case the console will no-longer work. While it is possible
to update the environment, the breakage may be confusing for users.
This option will be removed around the end of 2016.
config VIDEO_VESA config VIDEO_VESA
bool "Enable VESA video driver support" bool "Enable VESA video driver support"
default n default n

4
drivers/video/bcm2835.c
View File

@@ -7,6 +7,7 @@
#include <common.h> #include <common.h>
#include <lcd.h> #include <lcd.h>
#include <memalign.h> #include <memalign.h>
#include <phys2bus.h>
#include <asm/arch/mbox.h> #include <asm/arch/mbox.h>
#include <asm/global_data.h> #include <asm/global_data.h>
@@ -103,7 +104,8 @@ void lcd_ctrl_init(void *lcdbase)
panel_info.vl_row = h; panel_info.vl_row = h;
panel_info.vl_bpix = LCD_COLOR16; panel_info.vl_bpix = LCD_COLOR16;
gd->fb_base = msg_setup->allocate_buffer.body.resp.fb_address; gd->fb_base = bus_to_phys(
msg_setup->allocate_buffer.body.resp.fb_address);
} }
void lcd_enable(void) void lcd_enable(void)