[coreboot-gerrit] Patch merged into coreboot/master: 023e829 fmaptool: Add listing of annotated CBFS sections and generate header

gerrit at coreboot.org gerrit at coreboot.org
Fri May 8 20:33:49 CEST 2015


the following patch was just integrated into master:
commit 023e8294236d3bd7e39b7af0a4929137c30f089d
Author: Sol Boucher <solb at chromium.org>
Date:   Wed Mar 18 10:13:48 2015 -0700

    fmaptool: Add listing of annotated CBFS sections and generate header
    
    The fmd compiler now processes "(CBFS)" annotations, distilling them
    into a comma-separated list of the names of sections containing
    CBFSes. This list is the only thing printed to standard output to
    enable easy capture and machine consumption by other tools.
    Additionally, the ability to generate a tiny header with a define for
    the primary CBFS's size is implemented and can be requested via a
    new command-line switch.
    
    Here's an example of how to use the new features:
     $ ./fmaptool -h layout.h layout_arm_8192.fmd layout.fmap 2>/dev/null
     FW_MAIN_A,FW_MAIN_B,COREBOOT
    The hypothetical fmd file contains three sections annotated as (CBFS),
    the names of which are printed to standard output. As before, a binary
    FMAP file named layout.fmap is created; however, because the command
    was invoked with -h, a header #define ing the offset of its FMAP
    section (i.e. where it will be relative to the base of flash once the
    boot image is assembled) is also generated.
    
    BUG=chromium:470407
    TEST=Verify that fmd files without a "COREBOOT" section or with one
    that isn't annotated as "(CBFS)" are not accepted. Ensure that the
    list of CBFS sections matches the descriptor file's annotations and
    is led by the "COREBOOT" section. Invoke with the header generation
    switch and check that output file for reasonableness.
    BRANCH=None
    
    Change-Id: I496dd937f69467bfd9233c28df59c7608e89538f
    Signed-off-by: Sol Boucher <solb at chromium.org>
    Original-Commit-Id: 9227698adecf675770b2983380eb570676c2b5d2
    Original-Change-Id: I8b32f6ef19cabe2f6760106e676683c4565bbaad
    Original-Signed-off-by: Sol Boucher <solb at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/262956
    Original-Reviewed-by: Duncan Laurie <dlaurie at chromium.org>
    Original-Reviewed-by: Julius Werner <jwerner at chromium.org>
    Reviewed-on: http://review.coreboot.org/9967
    Tested-by: build bot (Jenkins)
    Reviewed-by: Patrick Georgi <pgeorgi at google.com>


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

-gerrit



More information about the coreboot-gerrit mailing list