Merge branch '2019-05-28-master-imports'

[oweals/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 9dff3f16a067ee5b602cf3c14280793a38468079..972dbe8ae55380e8c270904334873f838669a8f4 100644 (file)
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <linux/io.h>
 #include <linux/printk.h>
-#include <../drivers/mtd/nand/denali.h>
+#include <../drivers/mtd/nand/raw/denali.h>
 
 #include "init.h"
 
@@ -38,7 +38,7 @@ static int uniphier_set_fdt_file(void)
        char dtb_name[256];
        int buf_len = sizeof(dtb_name);
 
-       if (env_get("fdt_file"))
+       if (env_get("fdtfile"))
                return 0;       /* do nothing if it is already set */
 
        compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL);
@@ -56,7 +56,7 @@ static int uniphier_set_fdt_file(void)
 
        strncat(dtb_name, ".dtb", buf_len);
 
-       return env_set("fdt_file", dtb_name);
+       return env_set("fdtfile", dtb_name);
 }
 
 int board_late_init(void)
@@ -66,20 +66,20 @@ int board_late_init(void)
        switch (uniphier_boot_device_raw()) {
        case BOOT_DEVICE_MMC1:
                printf("eMMC Boot");
-               env_set("bootmode", "emmcboot");
+               env_set("bootdev", "emmc");
                break;
        case BOOT_DEVICE_NAND:
                printf("NAND Boot");
-               env_set("bootmode", "nandboot");
+               env_set("bootdev", "nand");
                nand_denali_wp_disable();
                break;
        case BOOT_DEVICE_NOR:
                printf("NOR Boot");
-               env_set("bootmode", "norboot");
+               env_set("bootdev", "nor");
                break;
        case BOOT_DEVICE_USB:
                printf("USB Boot");
-               env_set("bootmode", "usbboot");
+               env_set("bootdev", "usb");
                break;
        default:
                printf("Unknown");