X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fvideo%2Fmx3fb.c;h=176ae70b7ceef299753506838e5f9a2a1e760134;hb=30a90f56c3a20da0456e09e6e665b648719b8935;hp=f30deb3922847aaf5de878886290dcfc7f7ac022;hpb=10d1a160f5e28b05f891c050ca2f23855b226f5f;p=u-boot

diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index f30deb3922..176ae70b7c 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -1,26 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2009
  * Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>
  * Copyright (C) 2011
  * HALE electronic GmbH, <helmut.raiger@hale.at>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 #include <common.h>
 #include <malloc.h>
@@ -28,7 +11,7 @@
 
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 
 #include "videomodes.h"
@@ -360,8 +343,6 @@ union chan_param_mem {
 	struct chan_param_mem_interleaved	ip;
 };
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /* graphics setup */
 static GraphicDevice panel;
 static struct ctfb_res_modes *mode;
@@ -824,7 +805,7 @@ void *video_hw_init(void)
 	char *penv;
 	u32 memsize;
 	unsigned long t1, hsynch, vsynch;
-	int bits_per_pixel, i, tmp, vesa_idx = 0, videomode;
+	int bits_per_pixel, i, tmp, videomode;
 
 	tmp = 0;
 
@@ -832,7 +813,7 @@ void *video_hw_init(void)
 
 	videomode = CONFIG_SYS_DEFAULT_VIDEO_MODE;
 	/* get video mode via environment */
-	penv = getenv("videomode");
+	penv = env_get("videomode");
 	if (penv) {
 		/* decide if it is a string */
 		if (penv[0] <= '9') {
@@ -857,7 +838,6 @@ void *video_hw_init(void)
 		mode = (struct ctfb_res_modes *)
 				&res_mode_init[vesa_modes[i].resindex];
 		bits_per_pixel = vesa_modes[i].bits_per_pixel;
-		vesa_idx = vesa_modes[i].resindex;
 	} else {
 		mode = (struct ctfb_res_modes *) &var_mode;
 		bits_per_pixel = video_get_params(mode, penv);
@@ -921,12 +901,3 @@ void *video_hw_init(void)
 
 	return (void *) &panel;
 }
-
-void video_set_lut(unsigned int index,	/* color number */
-		    unsigned char r,	/* red */
-		    unsigned char g,	/* green */
-		    unsigned char b	/* blue */
-		    )
-{
-	return;
-}