diff options
| author | Nobuhiro Iwamatsu <[email protected]> | 2007-12-07 01:20:16 +0900 |
|---|---|---|
| committer | Nobuhiro Iwamatsu <[email protected]> | 2007-12-07 01:20:16 +0900 |
| commit | 521dcd30b9cc5b72cd27ae04104f19369251aa20 (patch) | |
| tree | bc33710a3ae6f97f0dcae8f02fd6f3c91322d96d /libfdt/Makefile | |
| parent | 260eea5676ca46903a335686cc020b29c4ca46fe (diff) | |
| parent | 8d4f040a3c15036a6ea25a9c39e7d89fefa8440d (diff) | |
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/Makefile
Diffstat (limited to 'libfdt/Makefile')
| -rw-r--r-- | libfdt/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libfdt/Makefile b/libfdt/Makefile index 126fa2c02f7..d166cce7968 100644 --- a/libfdt/Makefile +++ b/libfdt/Makefile @@ -27,7 +27,7 @@ LIB = $(obj)libfdt.a SOBJS = -COBJS-y += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o +COBJS-$(CONFIG_OF_LIBFDT) += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o COBJS := $(COBJS-y) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) |