* 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