Patch merged into coreboot/master: 93a6665 wtm2: build-time dev and recovery settings

the following patch was just integrated into master:
commit 93a6665e0cf29971b92550ff020b8c2f67c17202
Author: Aaron Durbin 
Date:   Tue Mar 19 15:25:46 2013 -0500

wtm2: build-time dev and recovery settings

It's helpful to switch back and forth for developer and
    recovery settings while testing boards. The wtm2 board
    currently doesn't have gpios which dynamically seelect that.
    Might as well make it easy to change the value for each
    setting with one define. The original defaults are kept.

Change-Id: I7b928c592fd20a1b847e4733f4cdef09d6ddad4c
    Signed-off-by: Aaron Durbin 
    Reviewed-on: http://review.coreboot.org/2861
    Tested-by: build bot (Jenkins)
    Reviewed-by: Ronald G. Minnich

Build-Tested: build bot (Jenkins) at Thu Mar 21 00:29:39 2013, giving +1
See http://review.coreboot.org/2861 for details.

-gerrit