Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / board / compulab / common / omap3_display.c

diff --git a/board/compulab/common/omap3_display.c b/board/compulab/common/omap3_display.c
index 61707f5b900e2f0278773592c72ce83bb3e6fb52..bc9f31ab87d69c6c1a800bd562a00c81518d6356 100644 (file)
--- a/board/compulab/common/omap3_display.c
+++ b/board/compulab/common/omap3_display.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2012 - 2013 CompuLab, Ltd. <www.compulab.co.il>
  *
  * Authors: Nikita Kiryanov <nikita@compulab.co.il>
  *
  * Parsing code based on linux/drivers/video/pxafb.c
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -17,8 +16,6 @@
 #include <scf0403_lcd.h>
 #include <asm/arch-omap3/dss.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 enum display_type {
        NONE,
        DVI,
@@ -400,7 +397,7 @@ void lcd_ctrl_init(void *lcdbase)
 {
        struct prcm *prcm = (struct prcm *)PRCM_BASE;
        char *custom_lcd;
-       char *displaytype = getenv("displaytype");
+       char *displaytype = env_get("displaytype");
 
        if (displaytype == NULL)
                return;
@@ -408,7 +405,7 @@ void lcd_ctrl_init(void *lcdbase)
        lcd_def = env_parse_displaytype(displaytype);
        /* If we did not recognize the preset, check if it's an env variable */
        if (lcd_def == NONE) {
-               custom_lcd = getenv(displaytype);
+               custom_lcd = env_get(displaytype);
                if (custom_lcd == NULL || parse_customlcd(custom_lcd) < 0)
                        return;
        }