projects/imx6: final merge of all changes