[coreboot] Patch merged into coreboot/master: c5ff648 armv7: Prevent CBFS data overlapping bootblock.