Patch merged into coreboot/master: 8f50e53 cbfstool: Fix architecture check when adding payload

the following patch was just integrated into master:
commit 8f50e53a4bb4c6f4b95398bb57d58f32fecdad93
Author: Stefan Reinauer 
Date:   Wed Nov 13 14:34:57 2013 -0800

cbfstool: Fix architecture check when adding payload

In the process of rewriting cbfstool for ARM and using
    a new internal API a regression was introduced that would
    silently let you add an ARM payload into an x86 CBFS image
    and the other way around. This patch fixes cbfstool to
    produce an error in that case again.

Change-Id: I37ee65a467d9658d0846c2cf43b582e285f1a8f8
    Signed-off-by: Stefan Reinauer 
    Reviewed-on: https://chromium-review.googlesource.com/176711
    Reviewed-by: Hung-Te Lin 
    Commit-Queue: Stefan Reinauer 
    Tested-by: Stefan Reinauer 
    (cherry picked from commit 8f74f3f5227e440ae46b59f8fd692f679f3ada2d)
    Signed-off-by: Isaac Christensen 
    Reviewed-on: http://review.coreboot.org/6879
    Tested-by: build bot (Jenkins)
    Reviewed-by: Edward O'Callaghan 
    Reviewed-by: Paul Menzel

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

-gerrit