285111f822
Currently, cbfstool regressed that removing a file from CBFS the space is marked as empty but the filename is still shown, preventing adding a file with the same name again. [1] ``` $ echo a > a $ echo b > b $ ./util/cbfstool/cbfstool test.rom create -m x86 -s 1024 Created CBFS (capacity = 920 bytes) $ ./util/cbfstool/cbfstool test.rom add -f a -n a -t raw $ ./util/cbfstool/cbfstool test.rom add -f b -n b -t raw $ cp test.rom test.rom.original $ ./util/cbfstool/cbfstool test.rom remove -n $ diff -up <(hexdump -C test.rom.original) <(hexdump -C test.rom) --- /dev/fd/63 2015-08-07 08:43:42.118430961 -0500 +++ /dev/fd/62 2015-08-07 08:43:42.114430961 -0500 @@ -1,4 +1,4 @@ -00000000 4c 41 52 43 48 49 56 45 00 00 00 02 00 00 00 50 |LARCHIVE.......P| +00000000 4c 41 52 43 48 49 56 45 00 00 00 02 ff ff ff ff |LARCHIVE........| 00000010 00 00 00 00 00 00 00 28 61 00 00 00 00 00 00 00 |.......(a.......| 00000020 00 00 00 00 00 00 00 00 61 0a ff ff ff ff ff ff |........a.......| 00000030 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| $ ./util/cbfstool/cbfstool test.rom add -f c -n c -t raw $ ./util/cbfstool/cbfstool test.rom print test.rom: 1 kB, bootblocksize 0, romsize 1024, offset 0x0 alignment: 64 bytes, architecture: x86 Name Offset Type Size c 0x0 raw 2 b 0x40 raw 2 (empty) 0x80 null 792 ``` So it is “deteled” as the type changed. But the name was not changed to match the *(empty)* heuristic. So also adapt the name when removing a file by writing a null byte to the beginning of the name, so that the heuristic works. (Though remove doesn't really clear contents.) ``` $ ./util/cbfstool/cbfstool test.rom remove -n c $ ./util/cbfstool/cbfstool test.rom print test.rom: 1 kB, bootblocksize 0, romsize 1024, offset 0x0 alignment: 64 bytes, architecture: x86 Name Offset Type Size (empty) 0x0 null 2 b 0x40 raw 2 (empty) 0x80 null 792 ``` [1] http://www.coreboot.org/pipermail/coreboot/2015-August/080201.html Change-Id: I033456ab10e3e1b402ac2374f3a887cefd3e5abf Signed-off-by: Aaron Durbin <adurbin@chromium.org> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-on: http://review.coreboot.org/11632 Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com> |
||
---|---|---|
.. | ||
console | ||
flashmap | ||
lzma | ||
cbfs-mkpayload.c | ||
cbfs-mkstage.c | ||
cbfs-payload-linux.c | ||
cbfs.h | ||
cbfs_image.c | ||
cbfs_image.h | ||
cbfs_sections.c | ||
cbfs_sections.h | ||
cbfstool.c | ||
coff.h | ||
common.c | ||
common.h | ||
compress.c | ||
elf.h | ||
elfheaders.c | ||
elfparsing.h | ||
EXAMPLE | ||
fit.c | ||
fit.h | ||
flashmap_tests.c | ||
fmap_from_fmd.c | ||
fmap_from_fmd.h | ||
fmaptool.c | ||
fmd.c | ||
fmd.h | ||
fmd_parser.c_shipped | ||
fmd_parser.h_shipped | ||
fmd_parser.y | ||
fmd_scanner.c_shipped | ||
fmd_scanner.h_shipped | ||
fmd_scanner.l | ||
fv.h | ||
linux.h | ||
linux_trampoline.c | ||
linux_trampoline.h | ||
Makefile | ||
Makefile.inc | ||
option.h | ||
partitioned_file.c | ||
partitioned_file.h | ||
ProcessorBind.h | ||
README.fmaptool | ||
rmodtool.c | ||
rmodule.c | ||
rmodule.h | ||
swab.h | ||
xdr.c |
Flashmap descriptors in coreboot ================================ Flashmap (https://code.google.com/p/flashmap) is a binary format for representing the layout of flash chips. Since coreboot is starting to use a "partition" of this format to describe the flash chip layout---both at runtime and when flashing a new image onto a chip---, the project needed a reasonably expressive plaintext format for representing such sections in the source tree. Our solution is the fmd ("flashmap descriptor") language, and the files in this directory contain a scanner, parser, semantic analyser, and flashmap converter. Here's an informal language description: # <line comment> <image name>[@<memory-mapped address>] <image size> { <section name>[@<offset from start of image>] [<section size>] [{ <subsection name>[@<offset from start of parent section>] [<subsection size>] [{ # Sections can be nested as deeply as desired <subsubsection name>[(CBFS)][@...] [...] [{...}] }] [<subsection name>[(CBFS)][@...] [...] [{...}]] # There can be many subsections at each level of nesting: they will be inserted # sequentially, and although gaps are allowed, any provided offsets are always # relative to the closest parent node's and must be strictly increasing with neither # overlapping nor degenerate-size sections. }] } Note that the above example contains a few symbols that are actually metasyntax, and therefore have neither meaning nor place in a real file. The <.*> s indicate placeholders for parameters: - The names are strings, which are provided as single-word---no whitespace---groups of syntactically unimportant symbols (i.e. everything except @, {, and }): they are not surrounded by quotes or any other form of delimiter. - The other fields are nonnegative integers, which may be given as decimal or hexadecimal; in either case, a K, M, or G may be appended---without intermediate whitespace---as a multiplier. - Comments consist of anything one manages to enter, provided it doesn't start a new line. The [.*] s indicate that a portion of the file could be omitted altogether: - Just because something is noted as optional doesn't mean it is in every case: the answer might actually depend on which other information is---or isn't---provided. - In particular, it is only legal to place a (CBFS) annotation on a leaf section; that is, choosing to add child sections excludes the possibility of putting a CBFS in their parent. Such annotations are only used to decide where CBFS empty file headers should be created, and do not result in the storage of any additional metadata in the resulting FMAP section. Additionally, it's important to note these properties of the overall file and its values: - Other than within would-be strings and numbers, whitespace is ignored. It goes without saying that such power comes with responsibility, which is why this sentence is here. - Although the .*section names must be globally unique, one of them may---but is not required to--- match the image name. - It is a syntax error to supply a number---besides 0---that begins with the character 0, as there is no intention of adding octals to the mix. - The image's memory address should be present on---and only on---layouts for memory-mapped chips. - Although it may be evident from above, all .*section offsets are relative only to the immediate parent. There is no way to include an absolute offset (i.e. from the beginning of flash), which means that it is "safe" to reorder the .*section s within a particular level of nesting, as long as the change doesn't cause their positions and sizes to necessitate overlap or zero sizes. - A .*section with omitted offset is assumed to start at as low a position as possible---with no consideration of alignment---and one with omitted size is assumed to fill the remaining space until the next sibling or before the end of its parent. - It's fine to omit any .*section 's offset, size, or both, provided its position and size are still unambiguous in the context of its *sibling* sections and its parent's *size*. In particular, knowledge of one .*section 's children or the .*section s' common parent's siblings will not be used for this purpose. - Although .*section s are not required to have children, the flash chip as a whole must have at least one. - Though the braces after .*section s may be omitted for those that have no children, if they are present, they must contain at least one child. PL people and sympathizers may wish to examine the formal abstract syntax and context-free grammar, which are located in fmd_scanner.l and fmd_scanner.y, respectively. Those interested in the algorithm used to infer omitted values will feel at home in fmd.c, particularly near the definition of validate_and_complete_info().