From: Otavio Salvador Date: Mon, 27 Apr 2015 13:13:57 +0000 (-0300) Subject: Merge remote-tracking branch 'imx/master' into patches-2015.04 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=dd995b9886e3c1bbffa9f25e44c7e38d912f15ed;p=bsp%2Fu-boot.git Merge remote-tracking branch 'imx/master' into patches-2015.04 * imx/master: mx6cuboxi: Load the correct 'fdtfile' variable mx6cuboxi: Use more standard namings for fdt variables mx6cuboxi: Differentiate Cubox-i and Hummingboard mx6cuboxi: Introduce multi-SoC support mx6cuboxi: Prepare for multi SoC support mx6cuboxi: Fix the defconfig name --- dd995b9886e3c1bbffa9f25e44c7e38d912f15ed