mbox

[U-Boot] Please pull u-boot-fdt

Message ID CAPnjgZ3yEZQDehxZ+iEV+kaUHGwSiGzkxXuC94StHL8T46cRqA@mail.gmail.com
State Changes Requested
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-fdt.git

Message

Simon Glass May 9, 2017, 10:53 p.m. UTC 
Hi Tom,

Here's the conversion to use the upstream pylibfdt implementation.


The following changes since commit 85ea850976daea57c8045f3569566fad5ce9fe0f:

  p1_p2_rdb: Fix unused variable warning (2017-05-09 09:11:04 -0400)

are available in the git repository at:

  git://git.denx.de/u-boot-fdt.git

for you to fetch changes up to 8fbd55f0f8730e3a6994798f4e533138d15be6aa:

  fdt: Drop fdt_select.py (2017-05-09 14:56:19 -0600)

----------------------------------------------------------------
Simon Glass (20):
      fdt: Add Python bindings
      pci: Correct cast for sandbox
      fdt: Correct cast for sandbox in fdtdec_setup_memory_size()
      fdt: Use SPDX format for licenses in the libfdt headers
      fdt: Move header files into lib/libfdt
      fdt: Allow swig options to be provided by Makefile
      fdt: Add all source files to the libfdt build
      fdt: Rename existing python libfdt module
      fdt: Build the new python libfdt module
      fdt: Update fdt_test to use 'dt' instead of 'fdt'
      fdt: dtoc: Add a full set of property tests
      fdt: Support use of the new python libfdt library
      fdt: Makefile: Build python libfdt library if needed
      fdt: Stop building the old python libfdt module
      fdt: Drop use of the legacy libfdt python module
      fdt: Drop fdt_fallback library
      binman: Drop a special case related to fdt_fallback
      fdt: Merge fdt_normal with its base class
      binman: Rename fdt variable to dtb
      fdt: Drop fdt_select.py

 Makefile                                    |   16 +-
 cmd/pci.c                                   |    3 +-
 include/fdt.h                               |  112 +---
 include/libfdt.h                            | 2138
+---------------------------------------------------------------------
 lib/fdtdec.c                                |    3 +-
 lib/libfdt/fdt.h                            |   67 +++
 lib/libfdt/libfdt.h                         | 2144
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/libfdt/libfdt.swig                      |  113 ----
 lib/libfdt/pylibfdt/libfdt.i                |  389 +++++++++++++
 lib/libfdt/pylibfdt/setup.py                |  123 +++++
 lib/libfdt/setup.py                         |   38 --
 scripts/Makefile.spl                        |   17 +-
 tools/Makefile                              |   43 +-
 tools/binman/binman.py                      |    3 +
 tools/binman/control.py                     |   12 +-
 tools/binman/etype/u_boot_dtb_with_ucode.py |   24 +-
 tools/binman/fdt_test.py                    |   64 ++-
 tools/binman/func_test.py                   |   48 +-
 tools/binman/test/45_prop_test.dts          |   23 +
 tools/dtoc/dtoc.py                          |    3 +-
 tools/dtoc/fdt.py                           |  183 +++++-
 tools/dtoc/fdt_fallback.py                  |  181 ------
 tools/dtoc/fdt_normal.py                    |  225 --------
 tools/dtoc/fdt_select.py                    |   36 --
 24 files changed, 3049 insertions(+), 2959 deletions(-)
 create mode 100644 lib/libfdt/fdt.h
 create mode 100644 lib/libfdt/libfdt.h
 delete mode 100644 lib/libfdt/libfdt.swig
 create mode 100644 lib/libfdt/pylibfdt/libfdt.i
 create mode 100755 lib/libfdt/pylibfdt/setup.py
 delete mode 100644 lib/libfdt/setup.py
 create mode 100644 tools/binman/test/45_prop_test.dts
 delete mode 100644 tools/dtoc/fdt_fallback.py
 delete mode 100644 tools/dtoc/fdt_normal.py
 delete mode 100644 tools/dtoc/fdt_select.py

Regards,
Simon

Comments

Tom Rini May 9, 2017, 11:59 p.m. UTC | #1 
On Tue, May 09, 2017 at 04:53:36PM -0600, Simon Glass wrote:

> Hi Tom,
> 
> Here's the conversion to use the upstream pylibfdt implementation.
> 
> 
> The following changes since commit 85ea850976daea57c8045f3569566fad5ce9fe0f:
> 
>   p1_p2_rdb: Fix unused variable warning (2017-05-09 09:11:04 -0400)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-fdt.git
> 
> for you to fetch changes up to 8fbd55f0f8730e3a6994798f4e533138d15be6aa:
> 
>   fdt: Drop fdt_select.py (2017-05-09 14:56:19 -0600)
> 

NAK.  I get:
$ ./test/py/test.py --bd sandbox --build
make O=/home/trini/work/u-boot/u-boot/build-sandbox -s sandbox_defconfig
make O=/home/trini/work/u-boot/u-boot/build-sandbox -s -j8
Assembler messages:
Fatal error: can't create
build/temp.linux-x86_64-2.7/../lib/libfdt/fdt.o: No such file or
directory
error: command 'x86_64-linux-gnu-gcc' failed with exit status 1
make[2]: *** [tools/_libfdt.so] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [tools] Error 2
make: *** [sub-make] Error 2
Exit code: 2
Simon Glass May 10, 2017, 2:29 p.m. UTC | #2 
Hi Tom,

On 9 May 2017 at 17:59, Tom Rini <trini@konsulko.com> wrote:
> On Tue, May 09, 2017 at 04:53:36PM -0600, Simon Glass wrote:
>
>> Hi Tom,
>>
>> Here's the conversion to use the upstream pylibfdt implementation.
>>
>>
>> The following changes since commit 85ea850976daea57c8045f3569566fad5ce9fe0f:
>>
>>   p1_p2_rdb: Fix unused variable warning (2017-05-09 09:11:04 -0400)
>>
>> are available in the git repository at:
>>
>>   git://git.denx.de/u-boot-fdt.git
>>
>> for you to fetch changes up to 8fbd55f0f8730e3a6994798f4e533138d15be6aa:
>>
>>   fdt: Drop fdt_select.py (2017-05-09 14:56:19 -0600)
>>
>
> NAK.  I get:
> $ ./test/py/test.py --bd sandbox --build
> make O=/home/trini/work/u-boot/u-boot/build-sandbox -s sandbox_defconfig
> make O=/home/trini/work/u-boot/u-boot/build-sandbox -s -j8
> Assembler messages:
> Fatal error: can't create
> build/temp.linux-x86_64-2.7/../lib/libfdt/fdt.o: No such file or
> directory
> error: command 'x86_64-linux-gnu-gcc' failed with exit status 1
> make[2]: *** [tools/_libfdt.so] Error 1
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [tools] Error 2
> make: *** [sub-make] Error 2
> Exit code: 2

I did see that once on a buildman run some weeks ago and could not
repeat it after various tries. I'll try harder.

Regards,
Simon
Simon Glass May 19, 2017, 12:40 a.m. UTC | #3 
Hi Tom,

On 9 May 2017 at 17:59, Tom Rini <trini@konsulko.com> wrote:
>
> On Tue, May 09, 2017 at 04:53:36PM -0600, Simon Glass wrote:
>
> > Hi Tom,
> >
> > Here's the conversion to use the upstream pylibfdt implementation.
> >
> >
> > The following changes since commit 85ea850976daea57c8045f3569566fad5ce9fe0f:
> >
> >   p1_p2_rdb: Fix unused variable warning (2017-05-09 09:11:04 -0400)
> >
> > are available in the git repository at:
> >
> >   git://git.denx.de/u-boot-fdt.git
> >
> > for you to fetch changes up to 8fbd55f0f8730e3a6994798f4e533138d15be6aa:
> >
> >   fdt: Drop fdt_select.py (2017-05-09 14:56:19 -0600)
> >
>
> NAK.  I get:
> $ ./test/py/test.py --bd sandbox --build
> make O=/home/trini/work/u-boot/u-boot/build-sandbox -s sandbox_defconfig
> make O=/home/trini/work/u-boot/u-boot/build-sandbox -s -j8
> Assembler messages:
> Fatal error: can't create
> build/temp.linux-x86_64-2.7/../lib/libfdt/fdt.o: No such file or
> directory
> error: command 'x86_64-linux-gnu-gcc' failed with exit status 1
> make[2]: *** [tools/_libfdt.so] Error 1
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [tools] Error 2
> make: *** [sub-make] Error 2
> Exit code: 2

This is due to some weirdness with setup.py not allowing source files
to come from a patch starting with "..". I'll send an updated patch,
pull it in and then resend the pull request.

>
> --
> Tom

Regards,
Simon