Boardconfig cleanup

Change-Id: I3ee9fcf20b81375b67fdc951ee27a2b7389187f2