[coreboot-gerrit] Patch merged into coreboot/master: nb/x4x: Fix sticky scratchpad register offset