From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Tue, 16 Feb 2016 08:08:42 +0000 (+0900)
Subject: ARM: uniphier: default to environment in eMMC
X-Git-Tag: v2016.03-rc3~6^2~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aa8a93480e072d8d0473e512b66c31f3c4cc3cc7;p=u-boot

ARM: uniphier: default to environment in eMMC

Of the several boot devices supported, it looks like the eMMC is the
most commonly used.  Enable CONFIG_ENV_IS_IN_MMC by default.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode.c b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
index 05477620a3..cf39bf57e9 100644
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
@@ -93,6 +93,11 @@ static int find_first_mmc_device(void)
 	return -ENODEV;
 }
 
+int mmc_get_env_dev(void)
+{
+	return find_first_mmc_device();
+}
+
 static int do_mmcsetn(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	int dev;
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 1b28cdc1a9..b1c8ccb7b9 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -99,16 +99,16 @@
 
 #define CONFIG_CONS_INDEX		1
 
-/*
- * For NAND booting the environment is embedded in the U-Boot image. Please take
- * look at the file board/amcc/canyonlands/u-boot-nand.lds for details.
- */
+/* #define CONFIG_ENV_IS_NOWHERE */
 /* #define CONFIG_ENV_IS_IN_NAND */
-#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_ENV_OFFSET			0x80000
 #define CONFIG_ENV_SIZE				0x2000
-#define CONFIG_ENV_OFFSET			0x0
 /* #define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */
 
+#define CONFIG_SYS_MMC_ENV_DEV		0
+#define CONFIG_SYS_MMC_ENV_PART		1
+
 /* Time clock 1MHz */
 #define CONFIG_SYS_TIMER_RATE			1000000