[coreboot-gerrit] Patch merged into coreboot/master: cpu/x86: Sort some Kconfig options