Patch merged into coreboot/master: FSP 1.1: Update the CBFS image type

the following patch was just integrated into master:
commit 9a8e4f9f94b4ca6a3ba86394945b3fbb6e628eb4
Author: Lee Leahy 
Date:   Thu Jul 9 16:48:07 2015 -0700

FSP 1.1: Update the CBFS image type

Update Makefile.inc to use the simplified CBFS image type.

BRANCH=none
    BUG=None
    TEST=Build and run on cyan

Change-Id: Ibb8413ab90b147e9d26d32639a8822c57ca54a46
    Signed-off-by: Lee Leahy 
    Reviewed-on: http://review.coreboot.org/10871
    Reviewed-by: Aaron Durbin 
    Tested-by: build bot (Jenkins)

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

-gerrit