Update codina mach stuff and add CM defconfig