leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Prior to this commit, tools/Makefile pulls all libfdt files from
lib/libfdt.

lib/libfdt/ and scripts/dtc/libfdt have the same copies for the
followings 6 files:
  fdt.c fdt_addresses.c fdt_empty_tree.c fdt_overlay.c fdt_strerr.c
  fdt_sw.c

This commit changes them to #include ones from scripts/dtc/libfdt.

Unfortunately, U-Boot locally modified the following 3 files:
  fdt_ro.c fdt_wip.c fdt_rw.c

I did not touch them in order to avoid unpredictable impact.

The fdt_region.c is U-Boot own file.  This is also borrowed from
lib/libfdt/.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2017-10-17 22:30:18 +09:00 committed by Tom Rini
parent 35a33baea5
commit b38ad663a4
7 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/Makefile
View File

@ -58,12 +58,17 @@ hostprogs-y += dumpimage mkimage
hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info fit_check_sign
FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := common/image-sig.o
# Flattened device tree objects
LIBFDT_CSRCS := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c \
fdt_empty_tree.c fdt_addresses.c fdt_overlay.c \
fdt_region.c
LIBFDT_OBJS := $(addprefix lib/libfdt/, $(patsubst %.c, %.o, $(LIBFDT_CSRCS)))
# The following files are synced with upstream DTC.
# Use synced versions from scripts/dtc/libfdt/.
LIBFDT_SRCS_SYNCED := fdt.c fdt_sw.c fdt_strerror.c fdt_empty_tree.c \
fdt_addresses.c fdt_overlay.c
# The following files are locally modified for U-Boot (unfotunately).
# Use U-Boot own versions from lib/libfdt/.
LIBFDT_SRCS_UNSYNCED := fdt_ro.c fdt_wip.c fdt_rw.c fdt_region.c
LIBFDT_OBJS := $(addprefix libfdt/, $(patsubst %.c, %.o, $(LIBFDT_SRCS_SYNCED))) \
$(addprefix lib/libfdt/, $(patsubst %.c, %.o, $(LIBFDT_SRCS_UNSYNCED)))
RSA_OBJS-$(CONFIG_FIT_SIGNATURE) := $(addprefix lib/rsa/, \
rsa-sign.o rsa-verify.o rsa-checksum.o \

2
tools/libfdt/fdt.c Normal file
View File

@ -0,0 +1,2 @@
#include "fdt_host.h"
#include "../scripts/dtc/libfdt/fdt.c"

2
tools/libfdt/fdt_addresses.c Normal file
View File

@ -0,0 +1,2 @@
#include "fdt_host.h"
#include "../scripts/dtc/libfdt/fdt_addresses.c"

2
tools/libfdt/fdt_empty_tree.c Normal file
View File

@ -0,0 +1,2 @@
#include "fdt_host.h"
#include "../scripts/dtc/libfdt/fdt_empty_tree.c"

2
tools/libfdt/fdt_overlay.c Normal file
View File

@ -0,0 +1,2 @@
#include "fdt_host.h"
#include "../scripts/dtc/libfdt/fdt_overlay.c"

2
tools/libfdt/fdt_strerror.c Normal file
View File

@ -0,0 +1,2 @@
#include "fdt_host.h"
#include "../scripts/dtc/libfdt/fdt_strerror.c"

2
tools/libfdt/fdt_sw.c Normal file
View File

@ -0,0 +1,2 @@
#include "fdt_host.h"
#include "../scripts/dtc/libfdt/fdt_sw.c"