Change in coreboot[master]: Makefile.inc: Add bootblock to CBFS before others

[Yu-Ping Wu (Code Review)]

Attention is currently required from: Raul Rangel, Martin L Roth, Yu-Ping Wu.
Hello build bot (Jenkins), Martin L Roth, Julius Werner,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/64547

to look at the new patch set (#3).

Change subject: Makefile.inc: Add bootblock to CBFS before others
......................................................................

Makefile.inc: Add bootblock to CBFS before others

With CBFS verification, cbfstool (CB:41121) needs bootblock to be
present in coreboot.pre in order to locate the metadata hash stored in
it. Therefore we have to ensure that bootblock is added to CBFS before
other CBFS files are added.

To solve the problem, create the 'add_bootblock' function, and call it
in the coreboot.pre recipe. Because bootblock.bin is now a prerequisite
of coreboot.pre, it will get built even if CONFIG_BOOTBLOCK_IN_CBFS=n.

BUG=b:233263447
TEST=emerge-guybrush coreboot
TEST=emerge-corsola coreboot chromeos-bootimage
TEST=cbfstool image-kingler.bin print -v
TEST=Kingler booted successfully
BRANCH=none

Change-Id: I385deb8231e44310ee139c3f69f449e75b92b2be
Signed-off-by: Yu-Ping Wu 
---
M Makefile.inc
M src/arch/x86/Makefile.inc
2 files changed, 10 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/64547/3