summaryrefslogtreecommitdiff
path: root/board/cm_t35
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2013-03-29 13:54:10 +0100
committerAnatolij Gustschin <agust@denx.de>2013-03-29 13:54:10 +0100
commitd0f34f10f14853ebe3f75371533708aa0639d830 (patch)
tree5e6bf57ff36e9e52c1a3d78a083883eca73978c4 /board/cm_t35
parent009d75ccc11d27b9a083375a88bb93cb746b4800 (diff)
parentacf3baad23586bcaf9af608b8c31949ab54e8338 (diff)
downloadu-boot-imx-d0f34f10f14853ebe3f75371533708aa0639d830.zip
u-boot-imx-d0f34f10f14853ebe3f75371533708aa0639d830.tar.gz
u-boot-imx-d0f34f10f14853ebe3f75371533708aa0639d830.tar.bz2
Merge branch 'for-v2013.04'
Conflicts: drivers/video/Makefile Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'board/cm_t35')
-rw-r--r--board/cm_t35/display.c8
1 files changed, 0 insertions, 8 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;