Integrate some CM lines into defconfig