blob: a00c90261633f0cb5eac8553a48b7a68eb87a0d0 [file] [log] [blame]
Tom Rini10e47792018-05-06 17:58:06 -04001# SPDX-License-Identifier: GPL-2.0+
Simon Glass2574ef62016-11-25 20:15:51 -07002# Copyright (c) 2016 Google, Inc
Simon Glass2574ef62016-11-25 20:15:51 -07003
4Introduction
5------------
6
7Firmware often consists of several components which must be packaged together.
8For example, we may have SPL, U-Boot, a device tree and an environment area
9grouped together and placed in MMC flash. When the system starts, it must be
10able to find these pieces.
11
12So far U-Boot has not provided a way to handle creating such images in a
13general way. Each SoC does what it needs to build an image, often packing or
14concatenating images in the U-Boot build system.
15
16Binman aims to provide a mechanism for building images, from simple
17SPL + U-Boot combinations, to more complex arrangements with many parts.
18
19
20What it does
21------------
22
23Binman reads your board's device tree and finds a node which describes the
24required image layout. It uses this to work out what to place where. The
25output file normally contains the device tree, so it is in principle possible
26to read an image and extract its constituent parts.
27
28
29Features
30--------
31
32So far binman is pretty simple. It supports binary blobs, such as 'u-boot',
33'spl' and 'fdt'. It supports empty entries (such as setting to 0xff). It can
34place entries at a fixed location in the image, or fit them together with
35suitable padding and alignment. It provides a way to process binaries before
36they are included, by adding a Python plug-in. The device tree is available
37to U-Boot at run-time so that the images can be interpreted.
38
Simon Glass43062bc2019-07-08 14:25:25 -060039Binman can update the device tree with the final location of everything when it
40is done. Entry positions can be provided to U-Boot SPL as run-time symbols,
41avoiding device-tree code overhead.
Simon Glass2574ef62016-11-25 20:15:51 -070042
43Binman can also support incorporating filesystems in the image if required.
44For example x86 platforms may use CBFS in some cases.
45
46Binman is intended for use with U-Boot but is designed to be general enough
47to be useful in other image-packaging situations.
48
49
50Motivation
51----------
52
53Packaging of firmware is quite a different task from building the various
54parts. In many cases the various binaries which go into the image come from
55separate build systems. For example, ARM Trusted Firmware is used on ARMv8
56devices but is not built in the U-Boot tree. If a Linux kernel is included
57in the firmware image, it is built elsewhere.
58
59It is of course possible to add more and more build rules to the U-Boot
60build system to cover these cases. It can shell out to other Makefiles and
61build scripts. But it seems better to create a clear divide between building
62software and packaging it.
63
64At present this is handled by manual instructions, different for each board,
65on how to create images that will boot. By turning these instructions into a
66standard format, we can support making valid images for any board without
67manual effort, lots of READMEs, etc.
68
69Benefits:
70- Each binary can have its own build system and tool chain without creating
71any dependencies between them
72- Avoids the need for a single-shot build: individual parts can be updated
73and brought in as needed
74- Provides for a standard image description available in the build and at
75run-time
Thomas Hebbfd37f242019-11-13 18:18:03 -080076- SoC-specific image-signing tools can be accommodated
Simon Glass2574ef62016-11-25 20:15:51 -070077- Avoids cluttering the U-Boot build system with image-building code
78- The image description is automatically available at run-time in U-Boot,
79SPL. It can be made available to other software also
80- The image description is easily readable (it's a text file in device-tree
81format) and permits flexible packing of binaries
82
83
84Terminology
85-----------
86
87Binman uses the following terms:
88
89- image - an output file containing a firmware image
90- binary - an input binary that goes into the image
91
92
93Relationship to FIT
94-------------------
95
96FIT is U-Boot's official image format. It supports multiple binaries with
97load / execution addresses, compression. It also supports verification
98through hashing and RSA signatures.
99
100FIT was originally designed to support booting a Linux kernel (with an
101optional ramdisk) and device tree chosen from various options in the FIT.
102Now that U-Boot supports configuration via device tree, it is possible to
103load U-Boot from a FIT, with the device tree chosen by SPL.
104
105Binman considers FIT to be one of the binaries it can place in the image.
106
107Where possible it is best to put as much as possible in the FIT, with binman
108used to deal with cases not covered by FIT. Examples include initial
109execution (since FIT itself does not have an executable header) and dealing
110with device boundaries, such as the read-only/read-write separation in SPI
111flash.
112
113For U-Boot, binman should not be used to create ad-hoc images in place of
114FIT.
115
116
117Relationship to mkimage
118-----------------------
119
120The mkimage tool provides a means to create a FIT. Traditionally it has
121needed an image description file: a device tree, like binman, but in a
122different format. More recently it has started to support a '-f auto' mode
123which can generate that automatically.
124
125More relevant to binman, mkimage also permits creation of many SoC-specific
126image types. These can be listed by running 'mkimage -T list'. Examples
127include 'rksd', the Rockchip SD/MMC boot format. The mkimage tool is often
128called from the U-Boot build system for this reason.
129
130Binman considers the output files created by mkimage to be binary blobs
131which it can place in an image. Binman does not replace the mkimage tool or
Michael Heimpold55c822d2018-08-22 22:01:24 +0200132this purpose. It would be possible in some situations to create a new entry
Simon Glass2574ef62016-11-25 20:15:51 -0700133type for the images in mkimage, but this would not add functionality. It
Michael Heimpold55c822d2018-08-22 22:01:24 +0200134seems better to use the mkimage tool to generate binaries and avoid blurring
Simon Glass2574ef62016-11-25 20:15:51 -0700135the boundaries between building input files (mkimage) and packaging then
136into a final image (binman).
137
138
139Example use of binman in U-Boot
140-------------------------------
141
142Binman aims to replace some of the ad-hoc image creation in the U-Boot
143build system.
144
145Consider sunxi. It has the following steps:
146
1471. It uses a custom mksunxiboot tool to build an SPL image called
148sunxi-spl.bin. This should probably move into mkimage.
149
1502. It uses mkimage to package U-Boot into a legacy image file (so that it can
151hold the load and execution address) called u-boot.img.
152
1533. It builds a final output image called u-boot-sunxi-with-spl.bin which
154consists of sunxi-spl.bin, some padding and u-boot.img.
155
156Binman is intended to replace the last step. The U-Boot build system builds
157u-boot.bin and sunxi-spl.bin. Binman can then take over creation of
158sunxi-spl.bin (by calling mksunxiboot, or hopefully one day mkimage). In any
159case, it would then create the image from the component parts.
160
161This simplifies the U-Boot Makefile somewhat, since various pieces of logic
162can be replaced by a call to binman.
163
164
165Example use of binman for x86
166-----------------------------
167
168In most cases x86 images have a lot of binary blobs, 'black-box' code
169provided by Intel which must be run for the platform to work. Typically
170these blobs are not relocatable and must be placed at fixed areas in the
Michael Heimpold55c822d2018-08-22 22:01:24 +0200171firmware image.
Simon Glass2574ef62016-11-25 20:15:51 -0700172
173Currently this is handled by ifdtool, which places microcode, FSP, MRC, VGA
174BIOS, reference code and Intel ME binaries into a u-boot.rom file.
175
176Binman is intended to replace all of this, with ifdtool left to handle only
177the configuration of the Intel-format descriptor.
178
179
180Running binman
181--------------
182
Simon Glass567b6822019-07-08 13:18:35 -0600183First install prerequisites, e.g.
184
Simon Glassdfd19012019-07-08 13:18:41 -0600185 sudo apt-get install python-pyelftools python3-pyelftools lzma-alone \
186 liblz4-tool
Simon Glass567b6822019-07-08 13:18:35 -0600187
Simon Glass2574ef62016-11-25 20:15:51 -0700188Type:
189
Simon Glassf46732a2019-07-08 14:25:29 -0600190 binman build -b <board_name>
Simon Glass2574ef62016-11-25 20:15:51 -0700191
192to build an image for a board. The board name is the same name used when
193configuring U-Boot (e.g. for sandbox_defconfig the board name is 'sandbox').
194Binman assumes that the input files for the build are in ../b/<board_name>.
195
196Or you can specify this explicitly:
197
Simon Glassf46732a2019-07-08 14:25:29 -0600198 binman build -I <build_path>
Simon Glass2574ef62016-11-25 20:15:51 -0700199
200where <build_path> is the build directory containing the output of the U-Boot
201build.
202
203(Future work will make this more configurable)
204
205In either case, binman picks up the device tree file (u-boot.dtb) and looks
206for its instructions in the 'binman' node.
207
208Binman has a few other options which you can see by running 'binman -h'.
209
210
Simon Glass4b94ac92017-11-12 21:52:06 -0700211Enabling binman for a board
212---------------------------
213
214At present binman is invoked from a rule in the main Makefile. Typically you
215will have a rule like:
216
217ifneq ($(CONFIG_ARCH_<something>),)
218u-boot-<your_suffix>.bin: <input_file_1> <input_file_2> checkbinman FORCE
219 $(call if_changed,binman)
220endif
221
222This assumes that u-boot-<your_suffix>.bin is a target, and is the final file
Simon Glassc46090d2020-07-19 13:56:01 -0600223that you need to produce. You can make it a target by adding it to INPUTS-y
Simon Glass4b94ac92017-11-12 21:52:06 -0700224either in the main Makefile or in a config.mk file in your arch subdirectory.
225
226Once binman is executed it will pick up its instructions from a device-tree
227file, typically <soc>-u-boot.dtsi, where <soc> is your CONFIG_SYS_SOC value.
228You can use other, more specific CONFIG options - see 'Automatic .dtsi
229inclusion' below.
230
231
Simon Glass2574ef62016-11-25 20:15:51 -0700232Image description format
233------------------------
234
235The binman node is called 'binman'. An example image description is shown
236below:
237
238 binman {
239 filename = "u-boot-sunxi-with-spl.bin";
240 pad-byte = <0xff>;
241 blob {
242 filename = "spl/sunxi-spl.bin";
243 };
244 u-boot {
Simon Glasse8561af2018-08-01 15:22:37 -0600245 offset = <CONFIG_SPL_PAD_TO>;
Simon Glass2574ef62016-11-25 20:15:51 -0700246 };
247 };
248
249
250This requests binman to create an image file called u-boot-sunxi-with-spl.bin
251consisting of a specially formatted SPL (spl/sunxi-spl.bin, built by the
252normal U-Boot Makefile), some 0xff padding, and a U-Boot legacy image. The
253padding comes from the fact that the second binary is placed at
254CONFIG_SPL_PAD_TO. If that line were omitted then the U-Boot binary would
255immediately follow the SPL binary.
256
257The binman node describes an image. The sub-nodes describe entries in the
258image. Each entry represents a region within the overall image. The name of
259the entry (blob, u-boot) tells binman what to put there. For 'blob' we must
260provide a filename. For 'u-boot', binman knows that this means 'u-boot.bin'.
261
262Entries are normally placed into the image sequentially, one after the other.
263The image size is the total size of all entries. As you can see, you can
Simon Glasse8561af2018-08-01 15:22:37 -0600264specify the start offset of an entry using the 'offset' property.
Simon Glass2574ef62016-11-25 20:15:51 -0700265
266Note that due to a device tree requirement, all entries must have a unique
267name. If you want to put the same binary in the image multiple times, you can
268use any unique name, with the 'type' property providing the type.
269
270The attributes supported for entries are described below.
271
Simon Glasse8561af2018-08-01 15:22:37 -0600272offset:
273 This sets the offset of an entry within the image or section containing
274 it. The first byte of the image is normally at offset 0. If 'offset' is
275 not provided, binman sets it to the end of the previous region, or the
276 start of the image's entry area (normally 0) if there is no previous
277 region.
Simon Glass2574ef62016-11-25 20:15:51 -0700278
279align:
Simon Glasse8561af2018-08-01 15:22:37 -0600280 This sets the alignment of the entry. The entry offset is adjusted
Simon Glassafb9caa2020-10-26 17:40:10 -0600281 so that the entry starts on an aligned boundary within the containing
282 section or image. For example 'align = <16>' means that the entry will
283 start on a 16-byte boundary. This may mean that padding is added before
284 the entry. The padding is part of the containing section but is not
285 included in the entry, meaning that an empty space may be created before
286 the entry starts. Alignment should be a power of 2. If 'align' is not
Simon Glass2574ef62016-11-25 20:15:51 -0700287 provided, no alignment is performed.
288
289size:
290 This sets the size of the entry. The contents will be padded out to
291 this size. If this is not provided, it will be set to the size of the
292 contents.
293
294pad-before:
295 Padding before the contents of the entry. Normally this is 0, meaning
Simon Glassd12599d2020-10-26 17:40:09 -0600296 that the contents start at the beginning of the entry. This can be used
297 to offset the entry contents a little. While this does not affect the
298 contents of the entry within binman itself (the padding is performed
299 only when its parent section is assembled), the end result will be that
300 the entry starts with the padding bytes, so may grow. Defaults to 0.
Simon Glass2574ef62016-11-25 20:15:51 -0700301
302pad-after:
303 Padding after the contents of the entry. Normally this is 0, meaning
304 that the entry ends at the last byte of content (unless adjusted by
305 other properties). This allows room to be created in the image for
Simon Glassd12599d2020-10-26 17:40:09 -0600306 this entry to expand later. While this does not affect the contents of
307 the entry within binman itself (the padding is performed only when its
308 parent section is assembled), the end result will be that the entry ends
309 with the padding bytes, so may grow. Defaults to 0.
Simon Glass2574ef62016-11-25 20:15:51 -0700310
311align-size:
312 This sets the alignment of the entry size. For example, to ensure
313 that the size of an entry is a multiple of 64 bytes, set this to 64.
Simon Glassafb9caa2020-10-26 17:40:10 -0600314 While this does not affect the contents of the entry within binman
315 itself (the padding is performed only when its parent section is
316 assembled), the end result is that the entry ends with the padding
317 bytes, so may grow. If 'align-size' is not provided, no alignment is
318 performed.
Simon Glass2574ef62016-11-25 20:15:51 -0700319
320align-end:
Simon Glassafb9caa2020-10-26 17:40:10 -0600321 This sets the alignment of the end of an entry with respect to the
322 containing section. Some entries require that they end on an alignment
323 boundary, regardless of where they start. This does not move the start
324 of the entry, so the contents of the entry will still start at the
325 beginning. But there may be padding at the end. While this does not
326 affect the contents of the entry within binman itself (the padding is
327 performed only when its parent section is assembled), the end result
328 is that the entry ends with the padding bytes, so may grow.
329 If 'align-end' is not provided, no alignment is performed.
Simon Glass2574ef62016-11-25 20:15:51 -0700330
331filename:
332 For 'blob' types this provides the filename containing the binary to
333 put into the entry. If binman knows about the entry type (like
334 u-boot-bin), then there is no need to specify this.
335
336type:
337 Sets the type of an entry. This defaults to the entry name, but it is
338 possible to use any name, and then add (for example) 'type = "u-boot"'
339 to specify the type.
340
Simon Glasse8561af2018-08-01 15:22:37 -0600341offset-unset:
342 Indicates that the offset of this entry should not be set by placing
Simon Glass4ba8d502018-06-01 09:38:17 -0600343 it immediately after the entry before. Instead, is set by another
344 entry which knows where this entry should go. When this boolean
345 property is present, binman will give an error if another entry does
Simon Glasse8561af2018-08-01 15:22:37 -0600346 not set the offset (with the GetOffsets() method).
Simon Glass4ba8d502018-06-01 09:38:17 -0600347
Simon Glass9dcc8612018-08-01 15:22:42 -0600348image-pos:
349 This cannot be set on entry (or at least it is ignored if it is), but
350 with the -u option, binman will set it to the absolute image position
351 for each entry. This makes it easy to find out exactly where the entry
352 ended up in the image, regardless of parent sections, etc.
353
Simon Glassfa79a812018-09-14 04:57:29 -0600354expand-size:
355 Expand the size of this entry to fit available space. This space is only
356 limited by the size of the image/section and the position of the next
357 entry.
Simon Glass2574ef62016-11-25 20:15:51 -0700358
Simon Glassaa2fcf92019-07-08 14:25:30 -0600359compress:
360 Sets the compression algortihm to use (for blobs only). See the entry
361 documentation for details.
362
Simon Glassa820af72020-09-06 10:39:09 -0600363missing-msg:
364 Sets the tag of the message to show if this entry is missing. This is
365 used for external blobs. When they are missing it is helpful to show
366 information about what needs to be fixed. See missing-blob-help for the
367 message for each tag.
368
Simon Glass80045812018-09-14 04:57:30 -0600369The attributes supported for images and sections are described below. Several
370are similar to those for entries.
Simon Glass2574ef62016-11-25 20:15:51 -0700371
372size:
373 Sets the image size in bytes, for example 'size = <0x100000>' for a
374 1MB image.
375
Simon Glasseb023b32019-04-25 21:58:39 -0600376offset:
377 This is similar to 'offset' in entries, setting the offset of a section
378 within the image or section containing it. The first byte of the section
379 is normally at offset 0. If 'offset' is not provided, binman sets it to
380 the end of the previous region, or the start of the image's entry area
381 (normally 0) if there is no previous region.
382
Simon Glass2574ef62016-11-25 20:15:51 -0700383align-size:
384 This sets the alignment of the image size. For example, to ensure
385 that the image ends on a 512-byte boundary, use 'align-size = <512>'.
386 If 'align-size' is not provided, no alignment is performed.
387
388pad-before:
389 This sets the padding before the image entries. The first entry will
Simon Glasse8561af2018-08-01 15:22:37 -0600390 be positioned after the padding. This defaults to 0.
Simon Glass2574ef62016-11-25 20:15:51 -0700391
392pad-after:
393 This sets the padding after the image entries. The padding will be
394 placed after the last entry. This defaults to 0.
395
396pad-byte:
397 This specifies the pad byte to use when padding in the image. It
398 defaults to 0. To use 0xff, you would add 'pad-byte = <0xff>'.
399
400filename:
401 This specifies the image filename. It defaults to 'image.bin'.
402
Simon Glasse8561af2018-08-01 15:22:37 -0600403sort-by-offset:
Simon Glass2574ef62016-11-25 20:15:51 -0700404 This causes binman to reorder the entries as needed to make sure they
405 are in increasing positional order. This can be used when your entry
406 order may not match the positional order. A common situation is where
Simon Glasse8561af2018-08-01 15:22:37 -0600407 the 'offset' properties are set by CONFIG options, so their ordering is
Simon Glass2574ef62016-11-25 20:15:51 -0700408 not known a priori.
409
410 This is a boolean property so needs no value. To enable it, add a
Simon Glasse8561af2018-08-01 15:22:37 -0600411 line 'sort-by-offset;' to your description.
Simon Glass2574ef62016-11-25 20:15:51 -0700412
413multiple-images:
414 Normally only a single image is generated. To create more than one
415 image, put this property in the binman node. For example, this will
416 create image1.bin containing u-boot.bin, and image2.bin containing
417 both spl/u-boot-spl.bin and u-boot.bin:
418
419 binman {
420 multiple-images;
421 image1 {
422 u-boot {
423 };
424 };
425
426 image2 {
427 spl {
428 };
429 u-boot {
430 };
431 };
432 };
433
434end-at-4gb:
Simon Glasse8561af2018-08-01 15:22:37 -0600435 For x86 machines the ROM offsets start just before 4GB and extend
Simon Glass2574ef62016-11-25 20:15:51 -0700436 up so that the image finished at the 4GB boundary. This boolean
437 option can be enabled to support this. The image size must be
438 provided so that binman knows when the image should start. For an
Simon Glasse8561af2018-08-01 15:22:37 -0600439 8MB ROM, the offset of the first entry would be 0xfff80000 with
Simon Glass2574ef62016-11-25 20:15:51 -0700440 this option, instead of 0 without this option.
441
Jagdish Gediya0fb978c2018-09-03 21:35:07 +0530442skip-at-start:
443 This property specifies the entry offset of the first entry.
444
445 For PowerPC mpc85xx based CPU, CONFIG_SYS_TEXT_BASE is the entry
446 offset of the first entry. It can be 0xeff40000 or 0xfff40000 for
447 nor flash boot, 0x201000 for sd boot etc.
448
449 'end-at-4gb' property is not applicable where CONFIG_SYS_TEXT_BASE +
450 Image size != 4gb.
Simon Glass2574ef62016-11-25 20:15:51 -0700451
452Examples of the above options can be found in the tests. See the
453tools/binman/test directory.
454
Simon Glasse76a3e62018-06-01 09:38:11 -0600455It is possible to have the same binary appear multiple times in the image,
456either by using a unit number suffix (u-boot@0, u-boot@1) or by using a
457different name for each and specifying the type with the 'type' attribute.
458
Simon Glass2574ef62016-11-25 20:15:51 -0700459
Michael Heimpold55c822d2018-08-22 22:01:24 +0200460Sections and hierachical images
Simon Glassa91e1152018-06-01 09:38:16 -0600461-------------------------------
462
463Sometimes it is convenient to split an image into several pieces, each of which
464contains its own set of binaries. An example is a flash device where part of
465the image is read-only and part is read-write. We can set up sections for each
466of these, and place binaries in them independently. The image is still produced
467as a single output file.
468
469This feature provides a way of creating hierarchical images. For example here
Simon Glass1e324002018-06-01 09:38:19 -0600470is an example image with two copies of U-Boot. One is read-only (ro), intended
471to be written only in the factory. Another is read-write (rw), so that it can be
Simon Glassa91e1152018-06-01 09:38:16 -0600472upgraded in the field. The sizes are fixed so that the ro/rw boundary is known
473and can be programmed:
474
475 binman {
476 section@0 {
477 read-only;
Simon Glass3b78d532018-06-01 09:38:21 -0600478 name-prefix = "ro-";
Simon Glassa91e1152018-06-01 09:38:16 -0600479 size = <0x100000>;
480 u-boot {
481 };
482 };
483 section@1 {
Simon Glass3b78d532018-06-01 09:38:21 -0600484 name-prefix = "rw-";
Simon Glassa91e1152018-06-01 09:38:16 -0600485 size = <0x100000>;
486 u-boot {
487 };
488 };
489 };
490
491This image could be placed into a SPI flash chip, with the protection boundary
492set at 1MB.
493
494A few special properties are provided for sections:
495
496read-only:
497 Indicates that this section is read-only. This has no impact on binman's
498 operation, but his property can be read at run time.
499
Simon Glass3b78d532018-06-01 09:38:21 -0600500name-prefix:
501 This string is prepended to all the names of the binaries in the
502 section. In the example above, the 'u-boot' binaries which actually be
503 renamed to 'ro-u-boot' and 'rw-u-boot'. This can be useful to
504 distinguish binaries with otherwise identical names.
505
Simon Glassa91e1152018-06-01 09:38:16 -0600506
Simon Glassfb30e292019-07-20 12:23:51 -0600507Image Properties
508----------------
509
510Image nodes act like sections but also have a few extra properties:
511
512filename:
513 Output filename for the image. This defaults to image.bin (or in the
514 case of multiple images <nodename>.bin where <nodename> is the name of
515 the image node.
516
517allow-repack:
518 Create an image that can be repacked. With this option it is possible
519 to change anything in the image after it is created, including updating
520 the position and size of image components. By default this is not
521 permitted since it is not possibly to know whether this might violate a
522 constraint in the image description. For example, if a section has to
523 increase in size to hold a larger binary, that might cause the section
524 to fall out of its allow region (e.g. read-only portion of flash).
525
526 Adding this property causes the original offset and size values in the
527 image description to be stored in the FDT and fdtmap.
528
529
Simon Glass7a61c6b2018-07-17 13:25:37 -0600530Entry Documentation
531-------------------
532
533For details on the various entry types supported by binman and how to use them,
534see README.entries. This is generated from the source code using:
535
Simon Glassf46732a2019-07-08 14:25:29 -0600536 binman entry-docs >tools/binman/README.entries
Simon Glass7a61c6b2018-07-17 13:25:37 -0600537
538
Simon Glassb2fd11d2019-07-08 14:25:48 -0600539Listing images
540--------------
541
542It is possible to list the entries in an existing firmware image created by
543binman, provided that there is an 'fdtmap' entry in the image. For example:
544
545 $ binman ls -i image.bin
546 Name Image-pos Size Entry-type Offset Uncomp-size
547 ----------------------------------------------------------------------
548 main-section c00 section 0
549 u-boot 0 4 u-boot 0
550 section 5fc section 4
551 cbfs 100 400 cbfs 0
552 u-boot 138 4 u-boot 38
553 u-boot-dtb 180 108 u-boot-dtb 80 3b5
554 u-boot-dtb 500 1ff u-boot-dtb 400 3b5
555 fdtmap 6fc 381 fdtmap 6fc
556 image-header bf8 8 image-header bf8
557
558This shows the hierarchy of the image, the position, size and type of each
559entry, the offset of each entry within its parent and the uncompressed size if
560the entry is compressed.
561
562It is also possible to list just some files in an image, e.g.
563
564 $ binman ls -i image.bin section/cbfs
565 Name Image-pos Size Entry-type Offset Uncomp-size
566 --------------------------------------------------------------------
567 cbfs 100 400 cbfs 0
568 u-boot 138 4 u-boot 38
569 u-boot-dtb 180 108 u-boot-dtb 80 3b5
570
571or with wildcards:
572
573 $ binman ls -i image.bin "*cb*" "*head*"
574 Name Image-pos Size Entry-type Offset Uncomp-size
575 ----------------------------------------------------------------------
576 cbfs 100 400 cbfs 0
577 u-boot 138 4 u-boot 38
578 u-boot-dtb 180 108 u-boot-dtb 80 3b5
579 image-header bf8 8 image-header bf8
580
581
Simon Glass980a2842019-07-08 14:25:52 -0600582Extracting files from images
583----------------------------
584
585You can extract files from an existing firmware image created by binman,
586provided that there is an 'fdtmap' entry in the image. For example:
587
588 $ binman extract -i image.bin section/cbfs/u-boot
589
590which will write the uncompressed contents of that entry to the file 'u-boot' in
591the current directory. You can also extract to a particular file, in this case
592u-boot.bin:
593
594 $ binman extract -i image.bin section/cbfs/u-boot -f u-boot.bin
595
596It is possible to extract all files into a destination directory, which will
597put files in subdirectories matching the entry hierarchy:
598
599 $ binman extract -i image.bin -O outdir
600
601or just a selection:
602
603 $ binman extract -i image.bin "*u-boot*" -O outdir
604
605
Simon Glass072959a2019-07-20 12:23:50 -0600606Replacing files in an image
607---------------------------
608
609You can replace files in an existing firmware image created by binman, provided
610that there is an 'fdtmap' entry in the image. For example:
611
612 $ binman replace -i image.bin section/cbfs/u-boot
613
614which will write the contents of the file 'u-boot' from the current directory
Simon Glass30033c22019-07-20 12:24:15 -0600615to the that entry, compressing if necessary. If the entry size changes, you must
616add the 'allow-repack' property to the original image before generating it (see
617above), otherwise you will get an error.
Simon Glass072959a2019-07-20 12:23:50 -0600618
Simon Glass30033c22019-07-20 12:24:15 -0600619You can also use a particular file, in this case u-boot.bin:
620
621 $ binman replace -i image.bin section/cbfs/u-boot -f u-boot.bin
622
623It is possible to replace all files from a source directory which uses the same
624hierarchy as the entries:
625
626 $ binman replace -i image.bin -I indir
627
628Files that are missing will generate a warning.
629
630You can also replace just a selection of entries:
631
632 $ binman replace -i image.bin "*u-boot*" -I indir
633
Simon Glass072959a2019-07-20 12:23:50 -0600634
Simon Glass233a26a92019-07-08 14:25:49 -0600635Logging
636-------
637
638Binman normally operates silently unless there is an error, in which case it
639just displays the error. The -D/--debug option can be used to create a full
640backtrace when errors occur.
641
642Internally binman logs some output while it is running. This can be displayed
643by increasing the -v/--verbosity from the default of 1:
644
645 0: silent
646 1: warnings only
647 2: notices (important messages)
648 3: info about major operations
649 4: detailed information about each operation
650 5: debug (all output)
651
652
Simon Glassae7cf032018-09-14 04:57:31 -0600653Hashing Entries
654---------------
Simon Glass72232452016-11-25 20:15:53 -0700655
Simon Glassae7cf032018-09-14 04:57:31 -0600656It is possible to ask binman to hash the contents of an entry and write that
657value back to the device-tree node. For example:
Simon Glass72232452016-11-25 20:15:53 -0700658
Simon Glassae7cf032018-09-14 04:57:31 -0600659 binman {
660 u-boot {
661 hash {
662 algo = "sha256";
663 };
664 };
665 };
666
667Here, a new 'value' property will be written to the 'hash' node containing
668the hash of the 'u-boot' entry. Only SHA256 is supported at present. Whole
669sections can be hased if desired, by adding the 'hash' node to the section.
670
671The has value can be chcked at runtime by hashing the data actually read and
672comparing this has to the value in the device tree.
Simon Glass72232452016-11-25 20:15:53 -0700673
674
Simon Glass2574ef62016-11-25 20:15:51 -0700675Order of image creation
676-----------------------
677
678Image creation proceeds in the following order, for each entry in the image.
679
Simon Glasse22f8fa2018-07-06 10:27:41 -06006801. AddMissingProperties() - binman can add calculated values to the device
Simon Glasse8561af2018-08-01 15:22:37 -0600681tree as part of its processing, for example the offset and size of each
Simon Glasse22f8fa2018-07-06 10:27:41 -0600682entry. This method adds any properties associated with this, expanding the
683device tree as needed. These properties can have placeholder values which are
684set later by SetCalculatedProperties(). By that stage the size of sections
685cannot be changed (since it would cause the images to need to be repacked),
686but the correct values can be inserted.
687
6882. ProcessFdt() - process the device tree information as required by the
Simon Glass92307732018-07-06 10:27:40 -0600689particular entry. This may involve adding or deleting properties. If the
690processing is complete, this method should return True. If the processing
691cannot complete because it needs the ProcessFdt() method of another entry to
692run first, this method should return False, in which case it will be called
693again later.
694
Simon Glasse22f8fa2018-07-06 10:27:41 -06006953. GetEntryContents() - the contents of each entry are obtained, normally by
Simon Glass2574ef62016-11-25 20:15:51 -0700696reading from a file. This calls the Entry.ObtainContents() to read the
697contents. The default version of Entry.ObtainContents() calls
698Entry.GetDefaultFilename() and then reads that file. So a common mechanism
699to select a file to read is to override that function in the subclass. The
700functions must return True when they have read the contents. Binman will
701retry calling the functions a few times if False is returned, allowing
702dependencies between the contents of different entries.
703
Simon Glasse8561af2018-08-01 15:22:37 -06007044. GetEntryOffsets() - calls Entry.GetOffsets() for each entry. This can
Simon Glass2574ef62016-11-25 20:15:51 -0700705return a dict containing entries that need updating. The key should be the
Simon Glasse8561af2018-08-01 15:22:37 -0600706entry name and the value is a tuple (offset, size). This allows an entry to
707provide the offset and size for other entries. The default implementation
708of GetEntryOffsets() returns {}.
Simon Glass2574ef62016-11-25 20:15:51 -0700709
Simon Glasse8561af2018-08-01 15:22:37 -06007105. PackEntries() - calls Entry.Pack() which figures out the offset and
711size of an entry. The 'current' image offset is passed in, and the function
712returns the offset immediately after the entry being packed. The default
Simon Glass2574ef62016-11-25 20:15:51 -0700713implementation of Pack() is usually sufficient.
714
Simon Glass2d9570d2020-10-26 17:40:22 -0600715Note: for sections, this also checks that the entries do not overlap, nor extend
716outside the section. If the section does not have a defined size, the size is
717set large enough to hold all the entries.
Simon Glass2574ef62016-11-25 20:15:51 -0700718
Simon Glass2d9570d2020-10-26 17:40:22 -06007196. SetImagePos() - sets the image position of every entry. This is the absolute
Simon Glass4b05b2d2019-07-20 12:23:52 -0600720position 'image-pos', as opposed to 'offset' which is relative to the containing
721section. This must be done after all offsets are known, which is why it is quite
722late in the ordering.
723
Simon Glass2d9570d2020-10-26 17:40:22 -06007247. SetCalculatedProperties() - update any calculated properties in the device
Simon Glasse8561af2018-08-01 15:22:37 -0600725tree. This sets the correct 'offset' and 'size' vaues, for example.
Simon Glasse22f8fa2018-07-06 10:27:41 -0600726
Simon Glass2d9570d2020-10-26 17:40:22 -06007278. ProcessEntryContents() - this calls Entry.ProcessContents() on each entry.
Simon Glass2574ef62016-11-25 20:15:51 -0700728The default implementatoin does nothing. This can be overriden to adjust the
729contents of an entry in some way. For example, it would be possible to create
730an entry containing a hash of the contents of some other entries. At this
Simon Glasse61b6f62019-07-08 14:25:37 -0600731stage the offset and size of entries should not be adjusted unless absolutely
732necessary, since it requires a repack (going back to PackEntries()).
Simon Glass2574ef62016-11-25 20:15:51 -0700733
Simon Glass2d9570d2020-10-26 17:40:22 -06007349. ResetForPack() - if the ProcessEntryContents() step failed, in that an entry
Simon Glass4b05b2d2019-07-20 12:23:52 -0600735has changed its size, then there is no alternative but to go back to step 5 and
736try again, repacking the entries with the updated size. ResetForPack() removes
737the fixed offset/size values added by binman, so that the packing can start from
738scratch.
739
Simon Glass2d9570d2020-10-26 17:40:22 -060074010. WriteSymbols() - write the value of symbols into the U-Boot SPL binary.
Simon Glasse8561af2018-08-01 15:22:37 -0600741See 'Access to binman entry offsets at run time' below for a description of
Simon Glass29dae672018-07-06 10:27:39 -0600742what happens in this stage.
Simon Glassbe83bc72017-11-13 18:55:05 -0700743
Simon Glass2d9570d2020-10-26 17:40:22 -060074411. BuildImage() - builds the image and writes it to a file
Simon Glass4b05b2d2019-07-20 12:23:52 -0600745
Simon Glass2d9570d2020-10-26 17:40:22 -060074612. WriteMap() - writes a text file containing a map of the image. This is the
Simon Glass4b05b2d2019-07-20 12:23:52 -0600747final step.
Simon Glass2574ef62016-11-25 20:15:51 -0700748
749
Simon Glass52debad2016-11-25 20:15:59 -0700750Automatic .dtsi inclusion
751-------------------------
752
753It is sometimes inconvenient to add a 'binman' node to the .dts file for each
754board. This can be done by using #include to bring in a common file. Another
755approach supported by the U-Boot build system is to automatically include
756a common header. You can then put the binman node (and anything else that is
757specific to U-Boot, such as u-boot,dm-pre-reloc properies) in that header
758file.
759
760Binman will search for the following files in arch/<arch>/dts:
761
762 <dts>-u-boot.dtsi where <dts> is the base name of the .dts file
763 <CONFIG_SYS_SOC>-u-boot.dtsi
764 <CONFIG_SYS_CPU>-u-boot.dtsi
765 <CONFIG_SYS_VENDOR>-u-boot.dtsi
766 u-boot.dtsi
767
768U-Boot will only use the first one that it finds. If you need to include a
769more general file you can do that from the more specific file using #include.
770If you are having trouble figuring out what is going on, you can uncomment
771the 'warning' line in scripts/Makefile.lib to see what it has found:
772
773 # Uncomment for debugging
Simon Glass2eee32b2017-11-12 21:52:05 -0700774 # This shows all the files that were considered and the one that we chose.
775 # u_boot_dtsi_options_debug = $(u_boot_dtsi_options_raw)
Simon Glass52debad2016-11-25 20:15:59 -0700776
Simon Glassbe83bc72017-11-13 18:55:05 -0700777
Simon Glass9dcc8612018-08-01 15:22:42 -0600778Access to binman entry offsets at run time (symbols)
779----------------------------------------------------
Simon Glassbe83bc72017-11-13 18:55:05 -0700780
781Binman assembles images and determines where each entry is placed in the image.
782This information may be useful to U-Boot at run time. For example, in SPL it
783is useful to be able to find the location of U-Boot so that it can be executed
784when SPL is finished.
785
786Binman allows you to declare symbols in the SPL image which are filled in
787with their correct values during the build. For example:
788
Simon Glass72555fa2019-11-06 17:22:44 -0700789 binman_sym_declare(ulong, u_boot_any, image_pos);
Simon Glassbe83bc72017-11-13 18:55:05 -0700790
Simon Glass72555fa2019-11-06 17:22:44 -0700791declares a ulong value which will be assigned to the image-pos of any U-Boot
Simon Glassbe83bc72017-11-13 18:55:05 -0700792image (u-boot.bin, u-boot.img, u-boot-nodtb.bin) that is present in the image.
793You can access this value with something like:
794
Simon Glass72555fa2019-11-06 17:22:44 -0700795 ulong u_boot_offset = binman_sym(ulong, u_boot_any, image_pos);
Simon Glassbe83bc72017-11-13 18:55:05 -0700796
Simon Glass72555fa2019-11-06 17:22:44 -0700797Thus u_boot_offset will be set to the image-pos of U-Boot in memory, assuming
798that the whole image has been loaded, or is available in flash. You can then
799jump to that address to start U-Boot.
800
801At present this feature is only supported in SPL and TPL. In principle it is
802possible to fill in such symbols in U-Boot proper, as well, but a future C
803library is planned for this instead, to read from the device tree.
804
805As well as image-pos, it is possible to read the size of an entry and its
806offset (which is the start position of the entry within its parent).
807
808A small technical note: Binman automatically adds the base address of the image
809(i.e. __image_copy_start) to the value of the image-pos symbol, so that when the
810image is loaded to its linked address, the value will be correct and actually
811point into the image.
812
813For example, say SPL is at the start of the image and linked to start at address
81480108000. If U-Boot's image-pos is 0x8000 then binman will write an image-pos
815for U-Boot of 80110000 into the SPL binary, since it assumes the image is loaded
816to 80108000, with SPL at 80108000 and U-Boot at 80110000.
Simon Glassbe83bc72017-11-13 18:55:05 -0700817
Simon Glass72555fa2019-11-06 17:22:44 -0700818For x86 devices (with the end-at-4gb property) this base address is not added
819since it is assumed that images are XIP and the offsets already include the
820address.
Simon Glassbe83bc72017-11-13 18:55:05 -0700821
Simon Glass52debad2016-11-25 20:15:59 -0700822
Simon Glass9dcc8612018-08-01 15:22:42 -0600823Access to binman entry offsets at run time (fdt)
824------------------------------------------------
825
826Binman can update the U-Boot FDT to include the final position and size of
827each entry in the images it processes. The option to enable this is -u and it
828causes binman to make sure that the 'offset', 'image-pos' and 'size' properties
829are set correctly for every entry. Since it is not necessary to specify these in
830the image definition, binman calculates the final values and writes these to
831the device tree. These can be used by U-Boot at run-time to find the location
832of each entry.
833
Simon Glass0f621332019-07-08 14:25:27 -0600834Alternatively, an FDT map entry can be used to add a special FDT containing
835just the information about the image. This is preceded by a magic string so can
Simon Glasscec34ba2019-07-08 14:25:28 -0600836be located anywhere in the image. An image header (typically at the start or end
837of the image) can be used to point to the FDT map. See fdtmap and image-header
838entries for more information.
Simon Glass0f621332019-07-08 14:25:27 -0600839
Simon Glass9dcc8612018-08-01 15:22:42 -0600840
Simon Glass7ba33592018-09-14 04:57:26 -0600841Compression
842-----------
843
844Binman support compression for 'blob' entries (those of type 'blob' and
Simon Glassaa2fcf92019-07-08 14:25:30 -0600845derivatives). To enable this for an entry, add a 'compress' property:
Simon Glass7ba33592018-09-14 04:57:26 -0600846
847 blob {
848 filename = "datafile";
Simon Glassaa2fcf92019-07-08 14:25:30 -0600849 compress = "lz4";
Simon Glass7ba33592018-09-14 04:57:26 -0600850 };
851
852The entry will then contain the compressed data, using the 'lz4' compression
Simon Glassaa2fcf92019-07-08 14:25:30 -0600853algorithm. Currently this is the only one that is supported. The uncompressed
854size is written to the node in an 'uncomp-size' property, if -u is used.
Simon Glass7ba33592018-09-14 04:57:26 -0600855
Simon Glassd92c8362020-10-26 17:40:25 -0600856Compression is also supported for sections. In that case the entire section is
857compressed in one block, including all its contents. This means that accessing
858an entry from the section required decompressing the entire section. Also, the
859size of a section indicates the space that it consumes in its parent section
860(and typically the image). With compression, the section may contain more data,
861and the uncomp-size property indicates that, as above. The contents of the
862section is compressed first, before any padding is added. This ensures that the
863padding itself is not compressed, which would be a waste of time.
Simon Glass7ba33592018-09-14 04:57:26 -0600864
865
Simon Glass30732662018-06-01 09:38:20 -0600866Map files
867---------
868
869The -m option causes binman to output a .map file for each image that it
Simon Glasse8561af2018-08-01 15:22:37 -0600870generates. This shows the offset and size of each entry. For example:
Simon Glass30732662018-06-01 09:38:20 -0600871
Simon Glasse8561af2018-08-01 15:22:37 -0600872 Offset Size Name
Simon Glass3a9a2b82018-07-17 13:25:28 -0600873 00000000 00000028 main-section
874 00000000 00000010 section@0
875 00000000 00000004 u-boot
876 00000010 00000010 section@1
877 00000000 00000004 u-boot
Simon Glass30732662018-06-01 09:38:20 -0600878
879This shows a hierarchical image with two sections, each with a single entry. The
Simon Glasse8561af2018-08-01 15:22:37 -0600880offsets of the sections are absolute hex byte offsets within the image. The
881offsets of the entries are relative to their respective sections. The size of
Simon Glass30732662018-06-01 09:38:20 -0600882each entry is also shown, in bytes (hex). The indentation shows the entries
883nested inside their sections.
884
885
Simon Glass91710b32018-07-17 13:25:32 -0600886Passing command-line arguments to entries
887-----------------------------------------
888
889Sometimes it is useful to pass binman the value of an entry property from the
890command line. For example some entries need access to files and it is not
891always convenient to put these filenames in the image definition (device tree).
892
893The-a option supports this:
894
895 -a<prop>=<value>
896
897where
898
899 <prop> is the property to set
900 <value> is the value to set it to
901
902Not all properties can be provided this way. Only some entries support it,
903typically for filenames.
904
905
Simon Glass6244fa42019-07-08 13:18:28 -0600906External tools
907--------------
908
909Binman can make use of external command-line tools to handle processing of
910entry contents or to generate entry contents. These tools are executed using
911the 'tools' module's Run() method. The tools generally must exist on the PATH,
912but the --toolpath option can be used to specify additional search paths to
913use. This option can be specified multiple times to add more than one path.
914
Alper Nebi Yasakfb4e5382020-09-06 14:46:07 +0300915For some compile tools binman will use the versions specified by commonly-used
916environment variables like CC and HOSTCC for the C compiler, based on whether
917the tool's output will be used for the target or for the host machine. If those
918aren't given, it will also try to derive target-specific versions from the
919CROSS_COMPILE environment variable during a cross-compilation.
920
Simon Glass6244fa42019-07-08 13:18:28 -0600921
Simon Glass52debad2016-11-25 20:15:59 -0700922Code coverage
923-------------
924
925Binman is a critical tool and is designed to be very testable. Entry
Simon Glassf46732a2019-07-08 14:25:29 -0600926implementations target 100% test coverage. Run 'binman test -T' to check this.
Simon Glass52debad2016-11-25 20:15:59 -0700927
928To enable Python test coverage on Debian-type distributions (e.g. Ubuntu):
929
Simon Glassa16dd6e2019-07-08 13:18:26 -0600930 $ sudo apt-get install python-coverage python3-coverage python-pytest
Simon Glass52debad2016-11-25 20:15:59 -0700931
932
Simon Glass1aeb7512019-05-17 22:00:52 -0600933Concurrent tests
934----------------
935
936Binman tries to run tests concurrently. This means that the tests make use of
937all available CPUs to run.
938
939 To enable this:
940
941 $ sudo apt-get install python-subunit python3-subunit
942
943Use '-P 1' to disable this. It is automatically disabled when code coverage is
944being used (-T) since they are incompatible.
945
946
Simon Glass1c420c92019-07-08 13:18:49 -0600947Debugging tests
948---------------
949
950Sometimes when debugging tests it is useful to keep the input and output
951directories so they can be examined later. Use -X or --test-preserve-dirs for
952this.
953
954
Alper Nebi Yasakfb4e5382020-09-06 14:46:07 +0300955Running tests on non-x86 architectures
956--------------------------------------
957
958Binman's tests have been written under the assumption that they'll be run on a
959x86-like host and there hasn't been an attempt to make them portable yet.
960However, it's possible to run the tests by cross-compiling to x86.
961
962To install an x86 cross-compiler on Debian-type distributions (e.g. Ubuntu):
963
964 $ sudo apt-get install gcc-x86-64-linux-gnu
965
966Then, you can run the tests under cross-compilation:
967
968 $ CROSS_COMPILE=x86_64-linux-gnu- binman test -T
969
970You can also use gcc-i686-linux-gnu similar to the above.
971
972
Simon Glass2574ef62016-11-25 20:15:51 -0700973Advanced Features / Technical docs
974----------------------------------
975
976The behaviour of entries is defined by the Entry class. All other entries are
977a subclass of this. An important subclass is Entry_blob which takes binary
978data from a file and places it in the entry. In fact most entry types are
979subclasses of Entry_blob.
980
981Each entry type is a separate file in the tools/binman/etype directory. Each
982file contains a class called Entry_<type> where <type> is the entry type.
983New entry types can be supported by adding new files in that directory.
984These will automatically be detected by binman when needed.
985
986Entry properties are documented in entry.py. The entry subclasses are free
987to change the values of properties to support special behaviour. For example,
988when Entry_blob loads a file, it sets content_size to the size of the file.
989Entry classes can adjust other entries. For example, an entry that knows
Simon Glasse8561af2018-08-01 15:22:37 -0600990where other entries should be positioned can set up those entries' offsets
Simon Glass2574ef62016-11-25 20:15:51 -0700991so they don't need to be set in the binman decription. It can also adjust
992entry contents.
993
994Most of the time such essoteric behaviour is not needed, but it can be
995essential for complex images.
996
Simon Glassade2ef62017-12-24 12:12:07 -0700997If you need to specify a particular device-tree compiler to use, you can define
998the DTC environment variable. This can be useful when the system dtc is too
999old.
1000
Simon Glasse64a0922018-11-06 15:21:31 -07001001To enable a full backtrace and other debugging features in binman, pass
1002BINMAN_DEBUG=1 to your build:
1003
Bin Menga089c412019-10-02 19:07:29 -07001004 make qemu-x86_defconfig
Simon Glasse64a0922018-11-06 15:21:31 -07001005 make BINMAN_DEBUG=1
1006
Simon Glass03b1d8f2019-09-25 08:11:11 -06001007To enable verbose logging from binman, base BINMAN_VERBOSE to your build, which
1008adds a -v<level> option to the call to binman:
1009
Bin Menga089c412019-10-02 19:07:29 -07001010 make qemu-x86_defconfig
Simon Glass03b1d8f2019-09-25 08:11:11 -06001011 make BINMAN_VERBOSE=5
1012
Simon Glass2574ef62016-11-25 20:15:51 -07001013
1014History / Credits
1015-----------------
1016
1017Binman takes a lot of inspiration from a Chrome OS tool called
1018'cros_bundle_firmware', which I wrote some years ago. That tool was based on
1019a reasonably simple and sound design but has expanded greatly over the
1020years. In particular its handling of x86 images is convoluted.
1021
Simon Glass1e324002018-06-01 09:38:19 -06001022Quite a few lessons have been learned which are hopefully applied here.
Simon Glass2574ef62016-11-25 20:15:51 -07001023
1024
1025Design notes
1026------------
1027
1028On the face of it, a tool to create firmware images should be fairly simple:
1029just find all the input binaries and place them at the right place in the
1030image. The difficulty comes from the wide variety of input types (simple
1031flat binaries containing code, packaged data with various headers), packing
1032requirments (alignment, spacing, device boundaries) and other required
1033features such as hierarchical images.
1034
1035The design challenge is to make it easy to create simple images, while
1036allowing the more complex cases to be supported. For example, for most
1037images we don't much care exactly where each binary ends up, so we should
1038not have to specify that unnecessarily.
1039
1040New entry types should aim to provide simple usage where possible. If new
1041core features are needed, they can be added in the Entry base class.
1042
1043
1044To do
1045-----
1046
1047Some ideas:
Simon Glass2574ef62016-11-25 20:15:51 -07001048- Use of-platdata to make the information available to code that is unable
1049 to use device tree (such as a very small SPL image)
Simon Glass2574ef62016-11-25 20:15:51 -07001050- Allow easy building of images by specifying just the board name
Simon Glass2574ef62016-11-25 20:15:51 -07001051- Support building an image for a board (-b) more completely, with a
1052 configurable build directory
Simon Glass8100a8e2019-07-20 12:24:02 -06001053- Detect invalid properties in nodes
1054- Sort the fdtmap by offset
Simon Glass01ab2292021-01-06 21:35:12 -07001055- Output temporary files to a different directory
Simon Glass2574ef62016-11-25 20:15:51 -07001056
1057--
1058Simon Glass <sjg@chromium.org>
10597/7/2016