diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
| commit | d6694aff569a0838a9d0ef352128f5aa309d73ff (patch) | |
| tree | a94eeab5431dfd0ed91a510c2e7de5eebb7a78fc /include/configs/embestmx6boards.h | |
| parent | b5b8d85e9a50c2294b6043830cd045de1002dc5d (diff) | |
| parent | 3f4c01d9f9d38e383f004dcd06c0d5661f2a57e0 (diff) | |
| download | u-boot-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.gz u-boot-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.xz u-boot-d6694aff569a0838a9d0ef352128f5aa309d73ff.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/embestmx6boards.h')
| -rw-r--r-- | include/configs/embestmx6boards.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index eb91c44e3f..f1000f37fa 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -20,7 +20,7 @@ #include <linux/sizes.h> #define CONFIG_MXC_UART_BASE UART2_BASE -#define CONFIG_CONSOLE_DEV "ttymxc0" +#define CONFIG_CONSOLE_DEV "ttymxc1" #define CONFIG_MMCROOT "/dev/mmcblk1p2" #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) @@ -293,7 +293,7 @@ #if defined(CONFIG_ENV_IS_IN_MMC) /* RiOTboard */ -#define CONFIG_DEFAULT_FDT_FILE "imx6s-riotboard.dtb" +#define CONFIG_DEFAULT_FDT_FILE "imx6dl-riotboard.dtb" #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_SYS_MMC_ENV_DEV 2 /* SDHC4 */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) |