mbox series

[0/5] libfdt: Reduce duplicated copies of libfdt

Message ID 1508247020-28071-1-git-send-email-yamada.masahiro@socionext.com
Headers show
Series libfdt: Reduce duplicated copies of libfdt | expand

Message

Masahiro Yamada Oct. 17, 2017, 1:30 p.m. UTC 
Recently, U-Boot switched to the bundled DTC approach.
This means we have two copies, lib/libfdt and scripts/dtc/libfdt.

Ideally, we should change lib/libfdt to #include scripts/dtc/libfdt.

One big problem is lib/libfdt is locally modified
(fdt_ro.c  fdt_wip.c fdt_rw.c) and makes our life difficult.

For now I synced only 6 files.

This series depends on
"pylibfdt: compile pylibfdt in scripts/dtc/pylibfdt only when necessary"
http://patchwork.ozlabs.org/project/uboot/list/?series=8554



Masahiro Yamada (5):
  libfdt: change fdt.h to a wrapper of scripts/dtc/libfdt/*
  libfdt: change libfdt_internal.h to a wrapper of scripts/dtc/libfdt/*
  tools: use files from scripts/dtc/libfdt where possible
  linux/types.h: add typedef of uintptr_t
  lib: libfdt: wrap scripts/dtc/libfdt/* where possible

 include/fdt.h                 |   2 +-
 include/libfdt_env.h          |   6 -
 include/linux/libfdt.h        |  17 +
 include/linux/libfdt_env.h    |  22 ++
 include/linux/types.h         |   2 +
 lib/libfdt/Makefile           |  17 +-
 lib/libfdt/fdt.c              | 212 +----------
 lib/libfdt/fdt.h              |  67 ----
 lib/libfdt/fdt_addresses.c    |  57 +--
 lib/libfdt/fdt_empty_tree.c   |  39 +-
 lib/libfdt/fdt_overlay.c      | 863 +-----------------------------------------
 lib/libfdt/fdt_strerror.c     |  63 +--
 lib/libfdt/fdt_sw.c           | 256 +------------
 lib/libfdt/libfdt_internal.h  |  51 +--
 tools/Makefile                |  15 +-
 tools/libfdt/fdt.c            |   2 +
 tools/libfdt/fdt_addresses.c  |   2 +
 tools/libfdt/fdt_empty_tree.c |   2 +
 tools/libfdt/fdt_overlay.c    |   2 +
 tools/libfdt/fdt_strerror.c   |   2 +
 tools/libfdt/fdt_sw.c         |   2 +
 21 files changed, 89 insertions(+), 1612 deletions(-)
 create mode 100644 include/linux/libfdt.h
 create mode 100644 include/linux/libfdt_env.h
 delete mode 100644 lib/libfdt/fdt.h
 create mode 100644 tools/libfdt/fdt.c
 create mode 100644 tools/libfdt/fdt_addresses.c
 create mode 100644 tools/libfdt/fdt_empty_tree.c
 create mode 100644 tools/libfdt/fdt_overlay.c
 create mode 100644 tools/libfdt/fdt_strerror.c
 create mode 100644 tools/libfdt/fdt_sw.c

Comments

Masahiro Yamada Nov. 7, 2017, 3:12 a.m. UTC | #1 
2017-10-17 22:30 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Recently, U-Boot switched to the bundled DTC approach.
> This means we have two copies, lib/libfdt and scripts/dtc/libfdt.
>
> Ideally, we should change lib/libfdt to #include scripts/dtc/libfdt.
>
> One big problem is lib/libfdt is locally modified
> (fdt_ro.c  fdt_wip.c fdt_rw.c) and makes our life difficult.
>
> For now I synced only 6 files.
>
> This series depends on
> "pylibfdt: compile pylibfdt in scripts/dtc/pylibfdt only when necessary"
> http://patchwork.ozlabs.org/project/uboot/list/?series=8554
>
>
>
> Masahiro Yamada (5):
>   libfdt: change fdt.h to a wrapper of scripts/dtc/libfdt/*
>   libfdt: change libfdt_internal.h to a wrapper of scripts/dtc/libfdt/*
>   tools: use files from scripts/dtc/libfdt where possible
>   linux/types.h: add typedef of uintptr_t
>   lib: libfdt: wrap scripts/dtc/libfdt/* where possible
>


This series does not cleanly apply any more.

Tom,
Do you need v2?
Tom Rini Nov. 7, 2017, 10:29 p.m. UTC | #2 
On Tue, Nov 07, 2017 at 12:12:03PM +0900, Masahiro Yamada wrote:
> 2017-10-17 22:30 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:

> > Recently, U-Boot switched to the bundled DTC approach.

> > This means we have two copies, lib/libfdt and scripts/dtc/libfdt.

> >

> > Ideally, we should change lib/libfdt to #include scripts/dtc/libfdt.

> >

> > One big problem is lib/libfdt is locally modified

> > (fdt_ro.c  fdt_wip.c fdt_rw.c) and makes our life difficult.

> >

> > For now I synced only 6 files.

> >

> > This series depends on

> > "pylibfdt: compile pylibfdt in scripts/dtc/pylibfdt only when necessary"

> > http://patchwork.ozlabs.org/project/uboot/list/?series=8554

> >

> >

> >

> > Masahiro Yamada (5):

> >   libfdt: change fdt.h to a wrapper of scripts/dtc/libfdt/*

> >   libfdt: change libfdt_internal.h to a wrapper of scripts/dtc/libfdt/*

> >   tools: use files from scripts/dtc/libfdt where possible

> >   linux/types.h: add typedef of uintptr_t

> >   lib: libfdt: wrap scripts/dtc/libfdt/* where possible

> 

> 

> This series does not cleanly apply any more.

> 

> Tom,

> Do you need v2?


I assume that it's failing now on the <...> -> "..." change, and that
there's been no changes in linux-next in this area since v1?  If so,
I'll just fix it when I apply after release, thanks!

-- 
Tom