mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-25 21:24:21 +08:00
common/lcd.c: cleanup use of global variables
console_col, console_row, lcd_line_length, lcd_console_address had to be declared in board / driver specific code, but were not actually used there on many boards. Get rid of the global variables. for completeness, the ack of Bo Shen is for the atmel part Cc: Alessandro Rubini <rubini@unipv.it> Cc: Anatolij Gustschin <agust@denx.de> Cc: Bo Shen <voice.shen@atmel.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Minkyu Kang <mk7.kang@samsung.com> Cc: Nikita Kiryanov <nikita@compulab.co.il> Cc: Simon Glass <sjg@chromium.org> Cc: Stelian Pop <stelian@popies.net> Cc: Tom Warren <twarren@nvidia.com> Acked-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> [agust: rebased and fixed cm_t35 board] Signed-off-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
parent
0698095af6
commit
f1d205a19c
@ -381,11 +381,7 @@ static enum display_type env_parse_displaytype(char *displaytype)
|
||||
return NONE;
|
||||
}
|
||||
|
||||
int lcd_line_length;
|
||||
void *lcd_base;
|
||||
short console_col;
|
||||
short console_row;
|
||||
void *lcd_console_address;
|
||||
|
||||
void lcd_ctrl_init(void *lcdbase)
|
||||
{
|
||||
|
@ -68,16 +68,10 @@ vidinfo_t panel_info = {
|
||||
LCD_WIDTH, LCD_HEIGHT, LCD_BPP
|
||||
};
|
||||
|
||||
int lcd_line_length;
|
||||
|
||||
/*
|
||||
* 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
|
||||
|
@ -101,9 +101,15 @@ static void lcd_setbgcolor(int color);
|
||||
|
||||
static int lcd_color_fg;
|
||||
static int lcd_color_bg;
|
||||
int lcd_line_length;
|
||||
|
||||
char lcd_is_enabled = 0;
|
||||
|
||||
static short console_col;
|
||||
static short console_row;
|
||||
|
||||
static void *lcd_console_address;
|
||||
|
||||
static char lcd_flush_dcache; /* 1 to flush dcache after each lcd update */
|
||||
|
||||
|
||||
|
@ -29,13 +29,7 @@
|
||||
#include <lcd.h>
|
||||
#include <atmel_hlcdc.h>
|
||||
|
||||
int lcd_line_length;
|
||||
|
||||
void *lcd_base; /* Start of framebuffer memory */
|
||||
void *lcd_console_address; /* Start of console buffer */
|
||||
|
||||
short console_col;
|
||||
short console_row;
|
||||
|
||||
/* configurable parameters */
|
||||
#define ATMEL_LCDC_CVAL_DEFAULT 0xc8
|
||||
|
@ -29,13 +29,7 @@
|
||||
#include <lcd.h>
|
||||
#include <atmel_lcdc.h>
|
||||
|
||||
int lcd_line_length;
|
||||
|
||||
void *lcd_base; /* Start of framebuffer memory */
|
||||
void *lcd_console_address; /* Start of console buffer */
|
||||
|
||||
short console_col;
|
||||
short console_row;
|
||||
|
||||
/* configurable parameters */
|
||||
#define ATMEL_LCDC_CVAL_DEFAULT 0xc8
|
||||
|
@ -33,13 +33,7 @@
|
||||
|
||||
#include "exynos_fb.h"
|
||||
|
||||
int lcd_line_length;
|
||||
|
||||
void *lcd_base;
|
||||
void *lcd_console_address;
|
||||
|
||||
short console_col;
|
||||
short console_row;
|
||||
|
||||
static unsigned int panel_width, panel_height;
|
||||
|
||||
|
@ -256,16 +256,10 @@ vidinfo_t panel_info = {
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
|
||||
int lcd_line_length;
|
||||
|
||||
/*
|
||||
* Frame buffer memory information
|
||||
*/
|
||||
void *lcd_base; /* Start of framebuffer memory */
|
||||
void *lcd_console_address; /* Start of console buffer */
|
||||
|
||||
short console_col;
|
||||
short console_row;
|
||||
|
||||
/************************************************************************/
|
||||
|
||||
|
@ -332,13 +332,7 @@ void lcd_getcolreg (ushort regno, ushort *red, ushort *green, ushort *blue);
|
||||
void lcd_ctrl_init (void *lcdbase);
|
||||
void lcd_enable (void);
|
||||
|
||||
int lcd_line_length;
|
||||
|
||||
void *lcd_base; /* Start of framebuffer memory */
|
||||
void *lcd_console_address; /* Start of console buffer */
|
||||
|
||||
short console_col;
|
||||
short console_row;
|
||||
|
||||
static int pxafb_init_mem (void *lcdbase, vidinfo_t *vid);
|
||||
static void pxafb_setup_gpio (vidinfo_t *vid);
|
||||
|
@ -60,13 +60,7 @@ enum {
|
||||
LCD_MAX_LOG2_BPP = 4, /* 2^4 = 16 bpp */
|
||||
};
|
||||
|
||||
int lcd_line_length;
|
||||
|
||||
void *lcd_base; /* Start of framebuffer memory */
|
||||
void *lcd_console_address; /* Start of console buffer */
|
||||
|
||||
short console_col;
|
||||
short console_row;
|
||||
|
||||
vidinfo_t panel_info = {
|
||||
/* Insert a value here so that we don't end up in the BSS */
|
||||
|
@ -37,10 +37,7 @@ extern int lcd_line_length;
|
||||
* Frame buffer memory information
|
||||
*/
|
||||
extern void *lcd_base; /* Start of framebuffer memory */
|
||||
extern void *lcd_console_address; /* Start of console buffer */
|
||||
|
||||
extern short console_col;
|
||||
extern short console_row;
|
||||
extern struct vidinfo panel_info;
|
||||
|
||||
extern void lcd_ctrl_init (void *lcdbase);
|
||||
|
Loading…
Reference in New Issue
Block a user