Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[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 adcc929a474cc63fa90a91e84e8d40e5190ab738..b800e8b8c6be11b31e89bc5c57fb2f8428ce0812 100644 (file)
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -1,55 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2014      Panasonic Corporation
  * Copyright (C) 2015-2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <common.h>
+#include <env.h>
+#include <init.h>
 #include <spl.h>
 #include <linux/libfdt.h>
 #include <nand.h>
 #include <stdio.h>
 #include <linux/io.h>
 #include <linux/printk.h>
-#include <../drivers/mtd/nand/denali.h>
 
 #include "init.h"
 
-static void nand_denali_wp_disable(void)
-{
-#ifdef CONFIG_NAND_DENALI
-       /*
-        * Since the boot rom enables the write protection for NAND boot mode,
-        * it must be disabled somewhere for "nand write", "nand erase", etc.
-        * The workaround is here to not disturb the Denali NAND controller
-        * driver just for a really SoC-specific thing.
-        */
-       void __iomem *denali_reg = (void __iomem *)CONFIG_SYS_NAND_REGS_BASE;
-
-       writel(WRITE_PROTECT__FLAG, denali_reg + WRITE_PROTECT);
-#endif
-}
-
-static int uniphier_set_fdt_file(void)
+static void uniphier_set_env_fdt_file(void)
 {
        DECLARE_GLOBAL_DATA_PTR;
        const char *compat;
        char dtb_name[256];
        int buf_len = sizeof(dtb_name);
+       int ret;
 
-       if (env_get("fdt_file"))
-               return 0;       /* do nothing if it is already set */
+       if (env_get("fdtfile"))
+               return;         /* do nothing if it is already set */
 
        compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL);
        if (!compat)
-               return -EINVAL;
+               goto fail;
 
        /* rip off the vendor prefix "socionext,"  */
        compat = strchr(compat, ',');
        if (!compat)
-               return -EINVAL;
+               goto fail;
        compat++;
 
        strncpy(dtb_name, compat, buf_len);
@@ -57,7 +42,43 @@ static int uniphier_set_fdt_file(void)
 
        strncat(dtb_name, ".dtb", buf_len);
 
-       return env_set("fdt_file", dtb_name);
+       ret = env_set("fdtfile", dtb_name);
+       if (ret)
+               goto fail;
+
+       return;
+fail:
+       pr_warn("\"fdt_file\" environment variable was not set correctly\n");
+}
+
+static void uniphier_set_env_addr(const char *env, const char *offset_env)
+{
+       unsigned long offset = 0;
+       const char *str;
+       char *end;
+       int ret;
+
+       if (env_get(env))
+               return;         /* do nothing if it is already set */
+
+       if (offset_env) {
+               str = env_get(offset_env);
+               if (!str)
+                       goto fail;
+
+               offset = simple_strtoul(str, &end, 16);
+               if (*end)
+                       goto fail;
+       }
+
+       ret = env_set_hex(env, gd->ram_base + offset);
+       if (ret)
+               goto fail;
+
+       return;
+
+fail:
+       pr_warn("\"%s\" environment variable was not set correctly\n", env);
 }
 
 int board_late_init(void)
@@ -67,20 +88,23 @@ 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_MMC2:
+               printf("SD Boot");
+               env_set("bootdev", "sd");
                break;
        case BOOT_DEVICE_NAND:
                printf("NAND Boot");
-               env_set("bootmode", "nandboot");
-               nand_denali_wp_disable();
+               env_set("bootdev", "nand");
                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");
@@ -93,8 +117,15 @@ int board_late_init(void)
 
        printf("\n");
 
-       if (uniphier_set_fdt_file())
-               pr_warn("fdt_file environment was not set correctly\n");
+       uniphier_set_env_fdt_file();
+
+       uniphier_set_env_addr("dram_base", NULL);
+
+       uniphier_set_env_addr("loadaddr", "loadaddr_offset");
+
+       uniphier_set_env_addr("kernel_addr_r", "kernel_addr_r_offset");
+       uniphier_set_env_addr("ramdisk_addr_r", "ramdisk_addr_r_offset");
+       uniphier_set_env_addr("fdt_addr_r", "fdt_addr_r_offset");
 
        return 0;
 }