Merge git://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / board / liebherr / mccmon6 / mccmon6.c

diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c
index e265e2a73291f5b0643d6c403569a852aad52495..946b91f3a1c031488568462fdc0075f119db15f8 100644 (file)
--- a/board/liebherr/mccmon6/mccmon6.c
+++ b/board/liebherr/mccmon6/mccmon6.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016-2017
  * Lukasz Majewski, DENX Software Engineering, lukma@denx.de
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -367,7 +366,7 @@ int board_init(void)
 
 int board_late_init(void)
 {
-       setenv("board_name", "mccmon6");
+       env_set("board_name", "mccmon6");
 
        return 0;
 }
@@ -467,7 +466,7 @@ int spl_start_uboot(void)
                return 1;
 
        env_init();
-       ret = getenv_f("boot_os", s, sizeof(s));
+       ret = env_get_f("boot_os", s, sizeof(s));
        if ((ret != -1) && (strcmp(s, "no") == 0))
                return 1;
 
@@ -481,7 +480,7 @@ int spl_start_uboot(void)
         * recovery_status = <any value> -> start SWUpdate
         *
         */
-       ret = getenv_f("recovery_status", s, sizeof(s));
+       ret = env_get_f("recovery_status", s, sizeof(s));
        if (ret != -1)
                return 1;