Attention is currently required from: Patrick Georgi, Tim Wawrzynczak, Julius Werner. Hello build bot (Jenkins), Raul Rangel, Patrick Georgi, Paul Menzel, Tim Wawrzynczak,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/60018
to look at the new patch set (#4).
Change subject: cbfstool: Do host space address conversion earlier when adding files ......................................................................
cbfstool: Do host space address conversion earlier when adding files
In cbfs_add_component(), the |offset| variable confusingly jumps back and forth between host address space and flash address space in some cases. This patch tries to clean that logic up a bit by converting it to flash address space very early in the function, and then keeping it that way afterwards. convert() implementations that need the host address space value should store it in a different variable to reduce the risk of confusion. This should also fix a tiny issue where --gen-attribute might have previously encoded the base address as given in CBFS -- it probably makes more sense to always have it store a consistent format (i.e. always flash address).
Also revert the unnecessary check for --base-address in add_topswap_bootblock() that was added in CB:59877. On closer inspection, the function actually doesn't use the passed in *offset at all and uses it purely as an out-parameter. So while our current Makefile does pass --base-address when adding the bootblock, it actually has no effect and is redundant for the topswap case.
Signed-off-by: Julius Werner jwerner@chromium.org Change-Id: Idf4721c5b0700789ddb81c1618d740b3e7f486cb --- M util/cbfstool/cbfstool.c 1 file changed, 16 insertions(+), 24 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/60018/4