[coreboot-gerrit] Patch merged into filo/master: Fix Makefiles for mixed use Kconfig usage