Revert "mako: clean up BoardConfig"

Broke booting with bionic

This reverts commit 418a2f6eab10bcd12c6decf07a17f25bae34ae76.