env: Rename getenv/_f() to env_get()

[people/ms/u-boot.git] / arch / arm / mach-uniphier / board_late_init.c

diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index ece761fb948b0665f1eae5d16d5545b08eaad6cc..b9a2cbe14865454f7939d774a8177ed2ca3e0211 100644 (file)
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -13,7 +13,7 @@
 #include <linux/io.h>
 #include <../drivers/mtd/nand/denali.h>
 
-#include "boot-mode/boot-device.h"
+#include "init.h"
 
 static void nand_denali_wp_disable(void)
 {
@@ -37,7 +37,7 @@ static int uniphier_set_fdt_file(void)
        char dtb_name[256];
        int buf_len = sizeof(dtb_name);
 
-       if (getenv("fdt_file"))
+       if (env_get("fdt_file"))
                return 0;       /* do nothing if it is already set */
 
        compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL);
@@ -55,36 +55,42 @@ static int uniphier_set_fdt_file(void)
 
        strncat(dtb_name, ".dtb", buf_len);
 
-       return setenv("fdt_file", dtb_name);
+       return env_set("fdt_file", dtb_name);
 }
 
 int board_late_init(void)
 {
        puts("MODE:  ");
 
-       switch (spl_boot_device_raw()) {
+       switch (uniphier_boot_device_raw()) {
        case BOOT_DEVICE_MMC1:
-               printf("eMMC Boot\n");
-               setenv("bootmode", "emmcboot");
+               printf("eMMC Boot");
+               env_set("bootmode", "emmcboot");
                break;
        case BOOT_DEVICE_NAND:
-               printf("NAND Boot\n");
-               setenv("bootmode", "nandboot");
+               printf("NAND Boot");
+               env_set("bootmode", "nandboot");
                nand_denali_wp_disable();
                break;
        case BOOT_DEVICE_NOR:
-               printf("NOR Boot\n");
-               setenv("bootmode", "norboot");
+               printf("NOR Boot");
+               env_set("bootmode", "norboot");
                break;
        case BOOT_DEVICE_USB:
-               printf("USB Boot\n");
-               setenv("bootmode", "usbboot");
+               printf("USB Boot");
+               env_set("bootmode", "usbboot");
                break;
        default:
-               printf("Unknown\n");
+               printf("Unknown");
                break;
        }
 
+       if (uniphier_have_internal_stm())
+               printf(" (STM: %s)",
+                      uniphier_boot_from_backend() ? "OFF" : "ON");
+
+       printf("\n");
+
        if (uniphier_set_fdt_file())
                printf("fdt_file environment was not set correctly\n");