Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

[platform/kernel/u-boot.git] / board / freescale / common / fsl_diu_fb.c

diff --git a/board/freescale/common/fsl_diu_fb.c b/board/freescale/common/fsl_diu_fb.c
index a9999d3..2336f6b 100644 (file)
--- a/board/freescale/common/fsl_diu_fb.c
+++ b/board/freescale/common/fsl_diu_fb.c
@@ -23,55 +23,18 @@
  * MA 02111-1307 USA
  */
 
-
 #include <common.h>
 #include <i2c.h>
 #include <malloc.h>
 
-#ifdef CONFIG_FSL_DIU_FB
-
 #include "fsl_diu_fb.h"
 
-
 #ifdef DEBUG
 #define DPRINTF(fmt, args...) printf("%s: " fmt,__FUNCTION__,## args)
 #else
 #define DPRINTF(fmt, args...)
 #endif
 
-struct fb_var_screeninfo {
-       unsigned int xres;              /* visible resolution           */
-       unsigned int yres;
-
-       unsigned int bits_per_pixel;    /* guess what                   */
-
-       /* Timing: All values in pixclocks, except pixclock (of course) */
-       unsigned int pixclock;          /* pixel clock in ps (pico seconds) */
-       unsigned int left_margin;       /* time from sync to picture    */
-       unsigned int right_margin;      /* time from picture to sync    */
-       unsigned int upper_margin;      /* time from sync to picture    */
-       unsigned int lower_margin;
-       unsigned int hsync_len;         /* length of horizontal sync    */
-       unsigned int vsync_len;         /* length of vertical sync      */
-       unsigned int sync;              /* see FB_SYNC_*                */
-       unsigned int vmode;             /* see FB_VMODE_*               */
-       unsigned int rotate;            /* angle we rotate counter clockwise */
-};
-
-struct fb_info {
-       struct fb_var_screeninfo var;   /* Current var */
-       unsigned long smem_start;       /* Start of frame buffer mem */
-                                       /* (physical address) */
-       unsigned int smem_len;          /* Length of frame buffer mem */
-       unsigned int type;              /* see FB_TYPE_*                */
-       unsigned int line_length;       /* length of a line in bytes    */
-
-       char *screen_base;
-       unsigned long screen_size;
-       int logo_height;
-       unsigned int logo_size;
-};
-
 struct fb_videomode {
        const char *name;       /* optional */
        unsigned int refresh;           /* optional */
@@ -214,8 +177,6 @@ struct diu_addr {
 
 #define MAX_CURS               32
 
-
-
 static struct fb_info fsl_fb_info;
 static struct diu_addr gamma, cursor;
 static struct diu_ad fsl_diu_fb_ad __attribute__ ((aligned(32)));
@@ -238,7 +199,6 @@ static int fsl_diu_disable_panel(struct fb_info *info);
 static int allocate_buf(struct diu_addr *buf, u32 size, u32 bytes_align);
 static u32 get_busfreq(void);
 
-
 int fsl_diu_init(int xres,
                 unsigned int pixel_format,
                 int gamma_fix,
@@ -653,4 +613,3 @@ void fsl_diu_clear_screen(void)
 
        memset(info->screen_base, 0, info->smem_len);
 }
-#endif /* CONFIG_FSL_DIU_FB */