random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-23 17:18:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

ARM: uniphier: default to environment in eMMC

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2016-02-16 17:08:42 +09:00
parent c231c4367a
commit aa8a93480e
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-uniphier/boot-mode/boot-mode.c
View File

@ -93,6 +93,11 @@ static int find_first_mmc_device(void)
return -ENODEV; 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[]) static int do_mmcsetn(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int dev; int dev;

12
include/configs/uniphier.h
View File

@ -99,16 +99,16 @@
#define CONFIG_CONS_INDEX 1 #define CONFIG_CONS_INDEX 1
/* /* #define CONFIG_ENV_IS_NOWHERE */
* 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_IN_NAND */ /* #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_SIZE 0x2000
#define CONFIG_ENV_OFFSET 0x0
/* #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */ /* #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 */ /* Time clock 1MHz */
#define CONFIG_SYS_TIMER_RATE 1000000 #define CONFIG_SYS_TIMER_RATE 1000000