1 files changed, 55 insertions, 7 deletions

diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
index 972dbe8ae55..3180b24330b 100644
--- a/arch/arm/mach-uniphier/board_late_init.c
+++ b/arch/arm/mach-uniphier/board_late_init.c
@@ -31,24 +31,25 @@ static void nand_denali_wp_disable(void)
 #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);
@@ -56,7 +57,43 @@ static int uniphier_set_fdt_file(void)
 
 	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)
+{
+	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)
@@ -68,6 +105,10 @@ int board_late_init(void)
 		printf("eMMC Boot");
 		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("bootdev", "nand");
@@ -92,8 +133,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;
 }