diff mbox

[4/4] ARM: uniphier: default to environment in eMMC

Message ID 1455610122-1696-5-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit aa8a93480e072d8d0473e512b66c31f3c4cc3cc7
Headers show

Commit Message

Masahiro Yamada Feb. 16, 2016, 8:08 a.m. UTC 
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>

---

 arch/arm/mach-uniphier/boot-mode/boot-mode.c |  5 +++++
 include/configs/uniphier.h                   | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

-- 
1.9.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
diff mbox

Patch

diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode.c b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
index 481e209..d5ef10a 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();
+}
+
 #ifndef CONFIG_SPL_BUILD
 static int do_mmcsetn(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 1b28cdc..b1c8ccb 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