Update and rename cm.mk to full_marvel.mk