* origin/master: (87 commits)
usb: eth: enable AX88179 DRIVER for ARNDALE 5250
usb: eth: add ASIX AX88179 DRIVER
mx6slevk: Remove get_board_rev()
arm: mx6: novena: Add proper LVDS display support
arm: mx6: novena: Pull video handling into separate file
arm: mx6: novena: Pull GPIO definitions into header
arm: mx6: novena: Minor config file fix
arm: mx6: novena: Minor coding style fix
arm: mx6: novena: Define CONFIG_SYS_MALLOC_F_LEN
arm: mx6: gw_ventana: Define CONFIG_SYS_MALLOC_F_LEN
imx: i2c: Zap unnecessary malloc() calls
embestmx6boards: convert to use config_distro_bootcmd.h
embestmx6boards: convert to use config_distro_defaults.h
imx SPL: enable boot from eMMC boot partitions.
ARM: UniPhier: display boot swap pin status by pinmon command
ARM: UniPhier: add dump command of DDR PHY parameters
ARM: UniPhier: add DDR PHY training code
Exynos: Move down common USB configuration
Prepare v2015.01-rc4
buildman: Fix some typos in README
...
#if defined(CONFIG_ENV_IS_IN_MMC)
/* RiOTboard */
- #define CONFIG_DEFAULT_FDT_FILE "imx6dl-riotboard.dtb"
+ #define CONFIG_FDTFILE "imx6dl-riotboard.dtb"
#define CONFIG_SYS_FSL_USDHC_NUM 3
-#define CONFIG_SYS_MMC_ENV_DEV 2 /* SDHC4 */
+#define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)