diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-10-17 13:42:43 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-17 07:43:32 -0500 |
| commit | 15b97f5c5e6d88e0560c6928f3acd01c999a494d (patch) | |
| tree | 4b2416c2278d5a8c1ca3248a594d68753eea5673 /scripts/Makefile.spl | |
| parent | 999a78d5cf00dfb8cd8342454933ea492e955377 (diff) | |
| download | u-boot-15b97f5c5e6d88e0560c6928f3acd01c999a494d.tar.gz u-boot-15b97f5c5e6d88e0560c6928f3acd01c999a494d.tar.xz u-boot-15b97f5c5e6d88e0560c6928f3acd01c999a494d.zip | |
pylibfdt: move pylibfdt to scripts/dtc/pylibfdt and refactor makefile
The pylibfdt is used by dtoc (and, indirectly by binman), but there
is no reason why it must be generated in the tools/ directory.
Recently, U-Boot switched over to the bundled DTC, and the directory
structure under scripts/dtc/ now mirrors the upstream DTC project.
So, scripts/dtc/pylibfdt is the best location.
I also rewrote the Makefile in a cleaner Kbuild style.
The scripts from the upstream have been moved as follows:
lib/libfdt/pylibfdt/setup.py -> scripts/dtc/pylibfdt/setup.py
lib/libfdt/pylibfdt/libfdt.i -> scripts/dtc/pylibfdt/libfdt.i_shipped
The .i_shipped is coped to .i during building because the .i must be
located in the objtree when we build it out of tree.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/Makefile.spl')
| -rw-r--r-- | scripts/Makefile.spl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 49b27ac926..065bb259d5 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -257,7 +257,7 @@ quiet_cmd_fdtgrep = FDTGREP $@ $(obj)/$(SPL_BIN).dtb: dts/dt.dtb $(objtree)/tools/fdtgrep FORCE $(call if_changed,fdtgrep) -pythonpath = PYTHONPATH=tools +pythonpath = PYTHONPATH=scripts/dtc/pylibfdt quiet_cmd_dtocc = DTOC C $@ cmd_dtocc = $(pythonpath) $(srctree)/tools/dtoc/dtoc -d $(obj)/$(SPL_BIN).dtb -o $@ platdata @@ -381,7 +381,7 @@ ifneq ($(cmd_files),) endif checkdtoc: tools - @if ! ( echo 'import libfdt' | ( PYTHONPATH=tools $(PYTHON) )); then \ + @if ! ( echo 'import libfdt' | ( PYTHONPATH=scripts/dtc/pylibfdt $(PYTHON) )); then \ echo '*** dtoc needs the Python libfdt library. Either '; \ echo '*** install it on your system, or try:'; \ echo '***'; \ |