Merge "Re-organize trout BoardConfig.mk"