[U-Boot] [PATCH v2 4/6] scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987

Simon Glass sjg at chromium.org
Mon May 14 19:52:09 UTC 2018


Hi,

On 13 May 2018 at 16:45, Eugeniu Rosca <roscaeugeniu at gmail.com> wrote:
> Hi Simon,
>
> On Mon, May 14, 2018 at 08:00:40AM +1000, Simon Glass wrote:
>> Hi,
>>
>> On 13 May 2018 at 03:13, Eugeniu Rosca <roscaeugeniu at gmail.com> wrote:
>> > From: Rob Herring <robh at kernel.org>
>> >
>> > This adds the following commits from upstream:
>> >
>> > aadd0b65c987 checks: centralize printing of property names in failure messages
>> > 88960e398907 checks: centralize printing of node path in check_msg
>> > f1879e1a50eb Add limited read-only support for older (V2 and V3) device tree to libfdt.
>> > 37dea76e9700 srcpos: drop special handling of tab
>> > 65893da4aee0 libfdt: overlay: Add missing license
>> > 962a45ca034d Avoid installing pylibfdt when dependencies are missing
>> > cd6ea1b2bea6 Makefile: Split INSTALL out into INSTALL_{PROGRAM,LIB,DATA,SCRIPT}
>> > 51b3a16338df Makefile.tests: Add LIBDL make(1) variable for portability sake
>> > 333d533a8f4d Attempt to auto-detect stat(1) being used if not given proper invocation
>> > e54388015af1 dtc: Bump version to v1.4.6
>> > a1fe86f380cb fdtoverlay: Switch from using alloca to malloc
>> > c8d5472de3ff tests: Improve compatibility with other platforms
>> > c81d389a10cc checks: add chosen node checks
>> > e671852042a7 checks: add aliases node checks
>> > d0c44ebe3f42 checks: check for #{size,address}-cells without child nodes
>> > 18a3d84bb802 checks: add string list check for *-names properties
>> > 8fe94fd6f19f checks: add string list check
>> > 6c5730819604 checks: add a string check for 'label' property
>> > a384191eba09 checks: fix sound-dai phandle with arg property check
>> > b260c4f610c0 Fix ambiguous grammar for devicetree rule
>> > fe667e382bac tests: Add some basic tests for the pci_bridge checks
>> > 7975f6422260 Fix widespread incorrect use of strneq(), replace with new strprefixeq()
>> > fca296445eab Add strstarts() helper function
>> > cc392f089007 tests: Check non-matching cases for fdt_node_check_compatible()
>> > bba26a5291c8 livetree: avoid assertion of orphan phandles with overlays
>> > c8f8194d76cc implement strnlen for systems that need it
>> > c8b38f65fdec libfdt: Remove leading underscores from identifiers
>> > 3b62fdaebfe5 Remove leading underscores from identifiers
>> > 2d45d1c5c65e Replace FDT_VERSION() with stringify()
>> > 2e6fe5a107b5 Fix some errors in comments
>> > b0ae9e4b0ceb tests: Correct warning in sw_tree1.c
>> >
>> > Commit c8b38f65fdec upstream ("libfdt: Remove leading underscores from
>> > identifiers") changed the multiple inclusion define protection, so the
>> > kernel's libfdt_env.h needs the corresponding update.
>> >
>> > Signed-off-by: Rob Herring <robh at kernel.org>
>> > [ Linux commit: 9130ba884640328bb78aaa4840e5ddf06ccafb1c ]
>> > [erosca: - Fixup conflicts in include/linux/libfdt_env.h caused by v2018.03-rc4
>> >            commit b08c8c487083 ("libfdt: move headers to <linux/libfdt.h>
>> >            and <linux/libfdt_env.h>")
>> >          - Fix build errors in lib/libfdt/fdt_ro.c, tools/libfdt/fdt_rw.c by:
>> >            - s/_fdt_mem_rsv/fdt_mem_rsv_/
>> >            - s/_fdt_offset_ptr/fdt_offset_ptr_/
>> >            - s/_fdt_check_node_offset/fdt_check_node_offset_/
>> >            - s/_fdt_check_prop_offset/fdt_check_prop_offset_/
>> >            - s/_fdt_find_add_string/fdt_find_add_string_/]
>> > Signed-off-by: Eugeniu Rosca <erosca at de.adit-jv.com>
>> > ---
>> >
>> > v1-v2:
>> > * Newly pushed
>> >
>> >  include/linux/libfdt_env.h           |   6 +-
>> >  lib/libfdt/fdt_ro.c                  |  18 +-
>> >  scripts/dtc/checks.c                 | 439 ++++++++++++++++++---------
>> >  scripts/dtc/dtc-parser.y             |  17 +-
>> >  scripts/dtc/dtc.c                    |   7 +-
>> >  scripts/dtc/dtc.h                    |  11 +-
>> >  scripts/dtc/flattree.c               |   2 +-
>> >  scripts/dtc/libfdt/fdt.c             |  13 +-
>> >  scripts/dtc/libfdt/fdt.h             |   6 +-
>> >  scripts/dtc/libfdt/fdt_overlay.c     |  51 ++++
>> >  scripts/dtc/libfdt/fdt_ro.c          | 132 ++++++--
>> >  scripts/dtc/libfdt/fdt_rw.c          |  90 +++---
>> >  scripts/dtc/libfdt/fdt_sw.c          |  24 +-
>> >  scripts/dtc/libfdt/fdt_wip.c         |  10 +-
>> >  scripts/dtc/libfdt/libfdt.h          |  37 +--
>> >  scripts/dtc/libfdt/libfdt_env.h      |  33 +-
>> >  scripts/dtc/libfdt/libfdt_internal.h |  32 +-
>> >  scripts/dtc/livetree.c               |  10 +-
>> >  scripts/dtc/srcpos.c                 |   5 -
>> >  scripts/dtc/srcpos.h                 |   6 +-
>> >  scripts/dtc/util.h                   |   9 +-
>> >  scripts/dtc/version_gen.h            |   2 +-
>> >  tools/libfdt/fdt_rw.c                |   2 +-
>> >  23 files changed, 632 insertions(+), 330 deletions(-)
>>
>> Can you please check that this does not adversely impact code size?
>
> Sure. Here are the sizes before and after this patch (sandbox):
>
> 1. ELF size comparison shows 96 bytes increase
> $ du -b u-boot.before u-boot.after
>   8055864       u-boot.before
>   8055960       u-boot.after
>
> 2. BIN size comparison shows no change
> $ du -b u-boot.bin.before u-boot.bin.after
>   3377256       u-boot.bin.before
>   3377256       u-boot.bin.after
>
> 3. "size" tool gives more details about ELF file size increase:
> $ size u-boot.before u-boot.after
>    text    data     bss     dec     hex filename
>    1199720        76952  291760 1568432  17eeb0 u-boot.before
>    1199736        76952  291760 1568448  17eec0 u-boot.after

Thanks for the info. That seems OK, but please check sandbox_spl (or
better yet one of the Thumb2 SPL images that uses libfdt) since it is
SPL that matters most.

>
> 4. "bloaty" (diff mode) gives even more details (confirming the above)
> $ bloaty -d compileunits u-boot.after -- u-boot.before
>      VM SIZE                                FILE SIZE
>  --------------                          --------------
>   +2.5%     +30 lib/libfdt/fdt.c             +96  +1.5%
>   [ = ]       0 lib/libfdt/fdt_sw.c          +21  +0.1%
>   +2.6%     +16 [LOAD [RX]]                  +16  +2.6%
>   [ = ]       0 lib/libfdt/fdt_overlay.c     +16  +0.1%
>   [ = ]       0 [section .debug_str]          +2  +0.0%
>   [ = ]       0 fs/ext4/ext4_common.c         -5  -0.0%
>   [ = ]       0 common/fdt_support.c         -11  -0.0%
>   -3.3%     -14 [section .text]              -14  -3.3%
>   [ = ]       0 [Unmapped]                   -25  -0.7%
>   +0.0%     +32 TOTAL                        +96  +0.0%

BTW buildman has a -B flag that shows function size.

Regards,
Simon


More information about the U-Boot mailing list