ARM: imx: merge plat-mxc into mach-imx