[coreboot-gerrit] Patch merged into coreboot/master: skylake: do not overlap resources

the following patch was just integrated into master:
commit a7a57701d6297e1d103d13b48fa98e51148670a3
Author: Aaron Durbin 
Date:   Tue Aug 4 10:58:32 2015 -0500

skylake: do not overlap resources

FSP was setting up the TCO registers to be mapped at 0x400.
    However, the SMBus initialization in romstage was mapping
    its I/O BAR to 0x400 as well. The result seemed to cause the
    TCO register to be hidden. However, the board was rebooting in
    depthcharge when the SMBus device was enabled from a TCO timeout.
    As the TCO timer was halted before the double resource assignment
    it's not clear how the TCO was getting re-enabled. In either case,
    the current behavior is wrong.

BUG=chrome-os-partner:42407
    BRANCH=None
    TEST=Built and booted glados w/ SMBus enabled.

Original-Change-Id: I43c0d67a76abac51ccfd5105245792981fbcd04c
    Original-Signed-off-by: Aaron Durbin 
    Original-Reviewed-on: https://chromium-review.googlesource.com/290363
    Original-Reviewed-by: Duncan Laurie

Change-Id: I3839290768c27626c3fd2d67d5de94c291c1386e
    Signed-off-by: Aaron Durbin 
    Reviewed-on: http://review.coreboot.org/11180
    Tested-by: build bot (Jenkins)
    Reviewed-by: Patrick Georgi

See http://review.coreboot.org/11180 for details.

-gerrit