From: Anatolij Gustschin Date: Fri, 29 Mar 2013 12:54:10 +0000 (+0100) Subject: Merge branch 'for-v2013.04' X-Git-Tag: v2013.04-rc2~13 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d0f34f10f14853ebe3f75371533708aa0639d830;p=u-boot Merge branch 'for-v2013.04' Conflicts: drivers/video/Makefile Signed-off-by: Anatolij Gustschin --- d0f34f10f14853ebe3f75371533708aa0639d830 diff --cc common/lcd.c index 77914adbce,195f1de617..b98eea6696 --- a/common/lcd.c +++ b/common/lcd.c @@@ -384,8 -409,10 +409,8 @@@ int drv_lcd_init(void struct stdio_dev lcddev; int rc; - lcd_base = (void *)(gd->fb_base); + lcd_base = (void *) gd->fb_base; - lcd_get_size(&lcd_line_length); - lcd_init(lcd_base); /* LCD initialization */ /* Device initialization */ @@@ -468,11 -495,9 +493,11 @@@ static int lcd_init(void *lcdbase debug("[LCD] Initializing LCD frambuffer at %p\n", lcdbase); lcd_ctrl_init(lcdbase); + lcd_get_size(&lcd_line_length); + lcd_line_length = (panel_info.vl_col * NBITS(panel_info.vl_bpix)) / 8; lcd_is_enabled = 1; lcd_clear(); - lcd_enable (); + lcd_enable(); /* Initialize the console */ console_col = 0; diff --cc drivers/video/Makefile index e8cecca55a,250aebd5f6..53952ab07e --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@@ -39,8 -41,6 +41,7 @@@ COBJS-$(CONFIG_S6E8AX0) += s6e8ax0. COBJS-$(CONFIG_S6E63D6) += s6e63d6.o COBJS-$(CONFIG_LD9040) += ld9040.o COBJS-$(CONFIG_SED156X) += sed156x.o - COBJS-$(CONFIG_VIDEO_AMBA) += amba.o +COBJS-$(CONFIG_VIDEO_BCM2835) += bcm2835.o COBJS-$(CONFIG_VIDEO_COREBOOT) += coreboot_fb.o COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o COBJS-$(CONFIG_VIDEO_DA8XX) += da8xx-fb.o videomodes.o