diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-12-16 17:16:34 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-12-16 17:16:34 +0100 |
| commit | 7f202217356f19e519e6ec57a29de9af73067037 (patch) | |
| tree | 1c3fe822cc37bf4df09ac9ece94c8a71ab9a25d0 /libfdt | |
| parent | 6cdadcb3f1b6eac4a1c4256acaa1438413f95351 (diff) | |
| parent | 584eedab66d0828f2d571a24b10526c4e65f547b (diff) | |
| download | u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.zip u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.gz u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.bz2 | |
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'libfdt')
| -rw-r--r-- | libfdt/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libfdt/Makefile b/libfdt/Makefile index ca2ad76..d6e2830 100644 --- a/libfdt/Makefile +++ b/libfdt/Makefile @@ -27,9 +27,13 @@ LIB = $(obj)libfdt.a SOBJS = -COBJS-$(CONFIG_OF_LIBFDT) += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o +COBJS-libfdt += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o -COBJS := $(COBJS-y) +COBJS-$(CONFIG_OF_LIBFDT) += $(COBJS-libfdt) +COBJS-$(CONFIG_FIT) += $(COBJS-libfdt) + + +COBJS := $(sort $(COBJS-y)) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) |