Merge from francescofavero
cleanup and fix
cleanup
Update cm.mk
Update BoardConfig.mk
merge ugers changes