* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*/
-#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/raw/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("fdtfile"))
- return 0; /* do nothing if it is already set */
+ 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);
strncat(dtb_name, ".dtb", buf_len);
- return env_set("fdtfile", 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)
+{
+ DECLARE_GLOBAL_DATA_PTR;
+ 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)
switch (uniphier_boot_device_raw()) {
case BOOT_DEVICE_MMC1:
printf("eMMC Boot");
- env_set("bootcmd", "run bootcmd_mmc0; run distro_bootcmd");
+ 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("bootcmd", "run bootcmd_ubifs0; run distro_bootcmd");
- nand_denali_wp_disable();
+ env_set("bootdev", "nand");
break;
case BOOT_DEVICE_NOR:
printf("NOR Boot");
- env_set("bootcmd", "run tftpboot; run distro_bootcmd");
+ env_set("bootdev", "nor");
break;
case BOOT_DEVICE_USB:
printf("USB Boot");
- env_set("bootcmd", "run bootcmd_usb0; run distro_bootcmd");
+ env_set("bootdev", "usb");
break;
default:
printf("Unknown");
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;
}