video: bcm2835: fix build issues
Subsystems (3)
PATCH 1/1 video: bcm2835: fix build issues
After merging LCD patches for v2013.04 the bcm2835 video driver building is broken due to removal of many global variables. Fix the driver.
--- common/lcd.c | 12 ++++++++++++ drivers/video/bcm2835.c | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-)
common/lcd.c +12 -0
@@ -493,6 +493,18 @@ static int lcd_init(void *lcdbase)debug ("[LCD] Initializing LCD frambuffer at %p\n" , lcdbase);lcd_ctrl_init (lcdbase); + +/* +* lcd_ctrl_init() of some drivers (i.e. bcm2835 on rpi_b) ignores +* the 'lcdbase' argument and uses custom lcd base address +* by setting up gd->fb_base. Check for this condition and fixup +* 'lcd_base' address. +*/ +if ((unsigned long )lcdbase != gd->fb_base) + lcd_base = (void *)gd->fb_base; + +debug ("[LCD] Using LCD frambuffer at %p\n" , lcd_base); +lcd_get_size (&lcd_line_length); lcd_line_length = (panel_info.vl_col *NBITS (panel_info.vl_bpix)) /8 ; lcd_is_enabled =1 ;
drivers/video/bcm2835.c +0 -11
@@ -23,17 +23,7 @@DECLARE_GLOBAL_DATA_PTR ;/* Global variables that lcd.c expects to exist */ -int lcd_line_length; -int lcd_color_fg; -int lcd_color_bg; -void *lcd_base; -void *lcd_console_address; -short console_col; -short console_row;vidinfo_t panel_info; -char lcd_cursor_enabled; -ushort lcd_cursor_width; -ushort lcd_cursor_height;struct msg_query {struct bcm2835_mbox_hdr hdr;
@@ -119,7 +109,6 @@ void lcd_ctrl_init(void *lcdbase) panel_info.vl_bpix =LCD_COLOR16 ; gd->fb_base = msg_setup->allocate_buffer.body.resp.fb_address; - lcd_base = (void *)gd->fb_base; }void lcd_enable (void )
Signature · 1 line
1.7.5.4
PATCH 1/1 video: bcm2835: fix build issues
Quoted 10 lines · On Fri, 29 Mar 2013 14:10:09 +0100 Anatolij Gustschin <[email protected]> wrote:
After merging LCD patches for v2013.04 the bcm2835 video driver building is broken due to removal of many global variables. Fix the driver.
Signed-off-by Anatolij Gustschin <[email protected]>Cc Stephen Warren <[email protected]>--- common/lcd.c | 12 ++++++++++++ drivers/video/bcm2835.c | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-)
applied to u-boot-video/master.
Anatolij
PATCH 1/1 video: bcm2835: fix build issues
Quoted 7 lines · Anatolij Gustschin
Quoted 4 lines · On Fri, 29 Mar 2013 14:10:09 +0100 Anatolij Gustschin <[email protected]> wrote:
After merging LCD patches for v2013.04 the bcm2835 video driver building is broken due to removal of many global variables. Fix the driver.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Anatolij Gustschin <[email protected]>Cc Stephen Warren <[email protected]>--- common/lcd.c | 12 ++++++++++++ drivers/video/bcm2835.c | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-)applied to u-boot-video/master.
FYI, I just tested these patches as they exist in u-boot/master, and the RPi "LCD" support still works fine after these patches. Thanks.
PATCH 1/1 video: bcm2835: fix build issues
On Mon, 01 Apr 2013 20:54:25 -0600
Stephen Warren <[email protected]> wrote:
...
Quoted 2 lines
FYI, I just tested these patches as they exist in u-boot/master, and the RPi "LCD" support still works fine after these patches. Thanks.
Thanks for testing!
Anatolij