google/smaug: roll up fixes to compile with vboot

Change-Id: I256410ff6c0107bbbaaf49b909d63ca61e88a22c
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10731
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
1 file changed