Patch merged into coreboot/master: payload: Fix broken Linux kernel as payload

the following patch was just integrated into master:
commit bc2d151b004663ed3605286661bd6e4203001f86
Author: Werner Zeh 
Date:   Tue May 3 09:52:12 2016 +0200

payload: Fix broken Linux kernel as payload

Commit 785a31d67e8f34065a2483080e4fd7032c3a8aad
    (Makefile.inc: Move payload code to payloads/) breaks the usage of
    Linux kernel as payload. The reason for it is that cbfs-files-y is
    evaluated before payloads/external/Makefile.inc is sourced and as a
    consequence ADDITIONAL_PAYLOAD_CONFIG is empty when it is used for
    payload options. That leads to missing command line and initrd for
    the kernel which in turn leads to kernel panic when it boots.
    To avoid it, move the code which adds payload to cbfs completely to
    payloads/extranal/Makefile.inc. This way, ADDITIONAL_PAYLOAD_CONFIG is
    set right before the payload itself is added to cbfs-files-y.

I have tested this patch with a Linux kernel as well as with SeaBIOS as
    payload on mc_tcu3 and it works. If someone sees impact to other
    payloads just let me know.

Change-Id: I7aad352f8b3fc1fdba1875b12648b07eba14e282
    Signed-off-by: Werner Zeh 
    Reviewed-on: https://review.coreboot.org/14579
    Tested-by: build bot (Jenkins)
    Reviewed-by: Patrick Georgi 
    Reviewed-by: Paul Menzel

See https://review.coreboot.org/14579 for details.

-gerrit