[coreboot-gerrit] Patch merged into coreboot/master: 5e273a4 cbfstool: add a command to duplicate a cbfs instance

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit 5e273a4577d0392156cb217848b14eab9daa31d6
Author: Vadim Bendebury <vbendeb at chromium.org>
Date:   Tue Dec 23 19:26:54 2014 -0800

    cbfstool: add a command to duplicate a cbfs instance
    
    The new command allows to create a file where the original CBFS image
    is duplicated at a different offset.
    
    The required options of the new command are -D, the offset where the
    copy CBFS header is placed, and -s, the size of the new CBFS copy.
    
    When a CBFS is copied, the bootblock area of the source CBFS is
    ignored, as well as empty and deleted files in the source CBFS. The
    size of the destination CBFS is calculated as the rombase size of the
    source CBFS less the bootblock size.
    
    The copy instance can be created in the image only above the original,
    which rules out the use of this new command for x86 images. If
    necessary, this limitation could be addressed later.
    
    As with other cbfstool commands, unless explicitly specified the
    lowest CBFS instance in the image is considered the source. If
    necessary, the user can specify the source CBFS using the -H option.
    
    BRANCH=storm
    BUG=chrome-os-partner:34161, chromium:445938
    TEST=run multiple cbfstool commands on a storm image:
      $ cd /tmp
      $ cp /build/storm/firmware/image.serial.bin storm.bin
      $ cbfstool storm.bin print
      storm.bin: 8192 kB, bootblocksize 34472, romsize 458752, offset 0x8700
      alignment: 64 bytes, architecture: arm
    
      Name                           Offset     Type         Size
      cdt.mbn                        0x8700     raw          416
      ddr.mbn                        0x8900     raw          25836
      rpm.mbn                        0xee40     raw          78576
      tz.mbn                         0x22180    raw          85360
      fallback/verstage              0x36f40    stage        41620
      fallback/romstage              0x41240    stage        19556
      fallback/ramstage              0x45f00    stage        25579
      config                         0x4c340    raw          2878
      fallback/payload               0x4cec0    payload      64811
      u-boot.dtb                     0x5cc40    (unknown)    2993
      (empty)                        0x5d840    null         75608
      $ cbfstool storm.bin copy -D 0x420000
      E: You need to specify -s/--size.
      $ cbfstool  storm.bin copy -D 0x420000 -s 0x70000
      $ cbfstool  storm.bin print
      W: Multiple (2) CBFS headers found, using the first one.
      storm.bin: 8192 kB, bootblocksize 34472, romsize 458752, offset 0x8700
      alignment: 64 bytes, architecture: arm
    
      Name                           Offset     Type         Size
      cdt.mbn                        0x8700     raw          416
      ddr.mbn                        0x8900     raw          25836
      rpm.mbn                        0xee40     raw          78576
      tz.mbn                         0x22180    raw          85360
      fallback/verstage              0x36f40    stage        41620
      fallback/romstage              0x41240    stage        19556
      fallback/ramstage              0x45f00    stage        25579
      config                         0x4c340    raw          2878
      fallback/payload               0x4cec0    payload      64811
      u-boot.dtb                     0x5cc40    (unknown)    2993
      (empty)                        0x5d840    null         75608
      cbfstool  storm.bin print  -H 0x420000
      storm.bin: 8192 kB, bootblocksize 0, romsize 4784128, offset 0x420040
      alignment: 64 bytes, architecture: arm
    
      Name                           Offset     Type         Size
      cdt.mbn                        0x420040   raw          416
      ddr.mbn                        0x420240   raw          25836
      rpm.mbn                        0x426780   raw          78576
      tz.mbn                         0x439ac0   raw          85360
      fallback/verstage              0x44e880   stage        41620
      fallback/romstage              0x458b80   stage        19556
      fallback/ramstage              0x45d840   stage        25579
      config                         0x463c80   raw          2878
      fallback/payload               0x464800   payload      64811
      u-boot.dtb                     0x474580   (unknown)    2993
      (empty)                        0x475180   null         110168
      $ cbfstool storm.bin remove -n config -H 0x420000
      $ cbfstool  storm.bin copy  -H 0x420000 -D 0x620000 -s 0x70000
      $ cbfstool  storm.bin print -H 0x620000
      storm.bin: 8192 kB, bootblocksize 0, romsize 6881280, offset 0x620040
      alignment: 64 bytes, architecture: arm
    
      Name                           Offset     Type         Size
      cdt.mbn                        0x620040   raw          416
      ddr.mbn                        0x620240   raw          25836
      rpm.mbn                        0x626780   raw          78576
      tz.mbn                         0x639ac0   raw          85360
      fallback/verstage              0x64e880   stage        41620
      fallback/romstage              0x658b80   stage        19556
      fallback/ramstage              0x65d840   stage        25579
      fallback/payload               0x663c80   payload      64811
      u-boot.dtb                     0x673a00   (unknown)    2993
      (empty)                        0x674600   null         113112
    
      $ cbfstool /build/storm/firmware/image.serial.bin extract -n fallback/payload -f payload1
      [..]
      $ cbfstool storm.bin extract -H 0x620000  -n fallback/payload -f payload2
      [..]
      $ diff payload1 payload2
    
    Change-Id: Ieb9205848aec361bb870de0d284dff06c597564f
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: b8d3c1b09a47ca24d2d2effc6de0e89d1b0a8903
    Original-Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    Original-Signed-off-by: Vadim Bendebury <vbendeb at chromium.org>
    Original-Change-Id: I227e607ccf7a9a8e2a1f3c6bbc506b8d29a35b1b
    Original-Reviewed-on: https://chromium-review.googlesource.com/237561
    Reviewed-on: http://review.coreboot.org/9742
    Tested-by: build bot (Jenkins)
    Reviewed-by: Stefan Reinauer <stefan.reinauer at coreboot.org>


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

-gerrit