master,builtin: factored out common config
builtin: fix bcm2708.c.patch to match upstream changes