Merged imx8 architecture + fixes for mx6