]> code.ossystems Code Review - bsp/u-boot.git/commit
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)
commitdd995b9886e3c1bbffa9f25e44c7e38d912f15ed
treefd42eebded527715abecad8f10ad0ae948c85a74
parentf5e23aad9a1f4a9a9a211173f23bfdbe7990e3b9
parent205d58699b157df75f1aa0b363ea9c21add21a0c
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