author | Anatolij Gustschin <agust@denx.de> | |
Fri, 29 Mar 2013 12:54:10 +0000 (13:54 +0100) | ||
committer | Anatolij Gustschin <agust@denx.de> | |
Fri, 29 Mar 2013 12:54:10 +0000 (13:54 +0100) |
Conflicts:
drivers/video/Makefile
Signed-off-by: Anatolij Gustschin <agust@denx.de>
drivers/video/Makefile
Signed-off-by: Anatolij Gustschin <agust@denx.de>
1 | 2 | |||
---|---|---|---|---|
common/lcd.c | patch | | diff1 | | diff2 | | blob | history |
drivers/video/Makefile | patch | | diff1 | | diff2 | | blob | history |
diff --cc common/lcd.c
index 77914adbce558aca4a67607dcd3292519cf02275,195f1de617c07a508f579c70b5df57e53e013562..b98eea669692a977c5a7684e81b56e5328d8111b
--- 1/common/lcd.c
--- 2/common/lcd.c
+++ b/common/lcd.c
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 */
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 e8cecca55a93db2a663e31483a69603e4b0ccab9,250aebd5f6d48bc43cf9d6482069f0e43fd44a92..53952ab07e4ed613b10650d18dbaa762a7373d7a
+++ b/drivers/video/Makefile
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