]> code.ossystems Code Review - bsp/u-boot.git/commitdiff
Merge remote-tracking branch 'imx/master' into patches-2015.04
authorOtavio Salvador <otavio@ossystems.com.br>
Mon, 27 Apr 2015 13:13:57 +0000 (10:13 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Mon, 27 Apr 2015 13:13:57 +0000 (10:13 -0300)
* 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


Trivial merge