CM updates

Conflicts:
	BoardConfig.mk