diff options
| author | Anatolij Gustschin <agust@denx.de> | 2013-03-29 12:54:10 (GMT) |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2013-03-29 12:54:10 (GMT) |
| commit | d0f34f10f14853ebe3f75371533708aa0639d830 (patch) | |
| tree | 5e6bf57ff36e9e52c1a3d78a083883eca73978c4 /board | |
| parent | 009d75ccc11d27b9a083375a88bb93cb746b4800 (diff) | |
| parent | acf3baad23586bcaf9af608b8c31949ab54e8338 (diff) | |
| download | u-boot-fsl-qoriq-d0f34f10f14853ebe3f75371533708aa0639d830.tar.xz | |
Merge branch 'for-v2013.04'
Conflicts:
drivers/video/Makefile
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'board')
| -rw-r--r-- | board/cm_t35/display.c | 8 | ||||
| -rw-r--r-- | board/mcc200/lcd.c | 24 |
2 files changed, 2 insertions, 30 deletions
diff --git a/board/cm_t35/display.c b/board/cm_t35/display.c index 2f78bad..a004ea1 100644 --- a/board/cm_t35/display.c +++ b/board/cm_t35/display.c @@ -381,14 +381,6 @@ static enum display_type env_parse_displaytype(char *displaytype) return NONE; } -int lcd_line_length; -int lcd_color_fg; -int lcd_color_bg; -void *lcd_base; -short console_col; -short console_row; -void *lcd_console_address; - void lcd_ctrl_init(void *lcdbase) { struct prcm *prcm = (struct prcm *)PRCM_BASE; diff --git a/board/mcc200/lcd.c b/board/mcc200/lcd.c index 893f4b7..24f0abd 100644 --- a/board/mcc200/lcd.c +++ b/board/mcc200/lcd.c @@ -68,19 +68,6 @@ vidinfo_t panel_info = { LCD_WIDTH, LCD_HEIGHT, LCD_BPP }; -int lcd_line_length; - -int lcd_color_fg; -int lcd_color_bg; - -/* - * Frame buffer memory information - */ -void *lcd_base; /* Start of framebuffer memory */ -void *lcd_console_address; /* Start of console buffer */ - -short console_col = 0; -short console_row = 0; /* * The device we use to communicate with PSoC @@ -88,13 +75,6 @@ short console_row = 0; int serial_inited = 0; /* - * Exported functions - */ -void lcd_initcolregs (void); -void lcd_ctrl_init (void *lcdbase); -void lcd_enable (void); - -/* * Imported functions to support the PSoC protocol */ extern int serial_init_dev (unsigned long dev_base); @@ -156,12 +136,12 @@ void lcd_enable (void) #if !defined(SWAPPED_LCD) for (i=0; i<fb_size; i++) { - serial_putc_raw_dev (PSOC_PSC, ((char *)lcd_base)[i]); + serial_putc_raw_dev(PSOC_PSC, ((char *)gd->fb_base)[i]); } #else { int x, y, pwidth; - char *p = (char *)lcd_base; + char *p = (char *)gd->fb_base; pwidth = ((panel_info.vl_col+7) >> 3); for (y=0; y<panel_info.vl_row; y++) { |