diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-11 18:18:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-11 18:18:15 -0500 |
| commit | 9ef2835f26652092a61b0cb0551ef4f36be27946 (patch) | |
| tree | 6bba2498b2364342cdfc02789efad167b72d4c50 /drivers/video | |
| parent | cc8d698fabf072f49ef4dfb2cfdbe0f57d54af81 (diff) | |
| parent | 6c88b51305d69b9728c56f27f363530a7f3d7e83 (diff) | |
| download | talos-obmc-uboot-9ef2835f26652092a61b0cb0551ef4f36be27946.tar.gz talos-obmc-uboot-9ef2835f26652092a61b0cb0551ef4f36be27946.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/video/bcm2835.c | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index fbc5d7cfe7..19f9429cce 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -91,6 +91,16 @@ config CONSOLE_TRUETYPE_SIZE 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 bool "Enable VESA video driver support" default n diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c index 7867fe3895..bff1fcb9ea 100644 --- a/drivers/video/bcm2835.c +++ b/drivers/video/bcm2835.c @@ -7,6 +7,7 @@ #include <common.h> #include <lcd.h> #include <memalign.h> +#include <phys2bus.h> #include <asm/arch/mbox.h> #include <asm/global_data.h> @@ -103,7 +104,8 @@ void lcd_ctrl_init(void *lcdbase) panel_info.vl_row = h; 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) |
