Commit c0170175393b94560fa7a5da6dd31377df5f4a72
Committed by
Wolfgang Denk
1 parent
45d6bdff68
Exists in
master
and in
54 other branches
tools/Makefile: Remove symlinks for fdt targets
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Showing 3 changed files with 8 additions and 32 deletions Side-by-side Diff
Makefile
... | ... | @@ -3532,8 +3532,7 @@ |
3532 | 3532 | $(obj)cscope.* $(obj)*.*~ |
3533 | 3533 | @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL) |
3534 | 3534 | @rm -f $(obj)tools/{crc32.c,env_embedded.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes} |
3535 | - @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c} | |
3536 | - @rm -f $(obj)tools/{fdt_wip.c} | |
3535 | + @rm -f $(obj)tools/{image.c} | |
3537 | 3536 | @rm -f $(obj)cpu/mpc824x/bedbug_603e.c |
3538 | 3537 | @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm |
3539 | 3538 | @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f |
tools/.gitignore
tools/Makefile
... | ... | @@ -22,6 +22,7 @@ |
22 | 22 | # |
23 | 23 | |
24 | 24 | TOOLSUBDIRS = |
25 | +LIBFDT_DIR = $(SRCTREE)/libfdt/ | |
25 | 26 | |
26 | 27 | # |
27 | 28 | # Mac OS X / Darwin's C preprocessor is Apple specific. It |
28 | 29 | |
29 | 30 | |
30 | 31 | |
31 | 32 | |
... | ... | @@ -223,19 +224,20 @@ |
223 | 224 | $(obj)mpc86x_clk.o: $(src)mpc86x_clk.c |
224 | 225 | $(CC) -g $(CFLAGS) -c -o $@ $< |
225 | 226 | |
226 | -$(obj)fdt.o: $(obj)fdt.c | |
227 | +$(obj)fdt.o: $(LIBFDT_DIR)fdt.c $(SRCTREE)/libfdt/libfdt_internal.h | |
227 | 228 | $(CC) -g $(FIT_CFLAGS) -c -o $@ $< |
228 | 229 | |
229 | -$(obj)fdt_ro.o: $(obj)fdt_ro.c | |
230 | +$(obj)fdt_ro.o: $(LIBFDT_DIR)fdt_ro.c $(SRCTREE)/libfdt/libfdt_internal.h | |
230 | 231 | $(CC) -g $(FIT_CFLAGS) -c -o $@ $< |
231 | 232 | |
232 | -$(obj)fdt_rw.o: $(obj)fdt_rw.c | |
233 | +$(obj)fdt_rw.o: $(LIBFDT_DIR)fdt_rw.c $(SRCTREE)/libfdt/libfdt_internal.h | |
233 | 234 | $(CC) -g $(FIT_CFLAGS) -c -o $@ $< |
234 | 235 | |
235 | -$(obj)fdt_strerror.o: $(obj)fdt_strerror.c | |
236 | +$(obj)fdt_strerror.o: $(LIBFDT_DIR)fdt_strerror.c \ | |
237 | + $(SRCTREE)/libfdt/libfdt_internal.h | |
236 | 238 | $(CC) -g $(FIT_CFLAGS) -c -o $@ $< |
237 | 239 | |
238 | -$(obj)fdt_wip.o: $(obj)fdt_wip.c | |
240 | +$(obj)fdt_wip.o: $(LIBFDT_DIR)fdt_wip.c $(SRCTREE)/libfdt/libfdt_internal.h | |
239 | 241 | $(CC) -g $(FIT_CFLAGS) -c -o $@ $< |
240 | 242 | |
241 | 243 | subdirs: |
... | ... | @@ -274,26 +276,6 @@ |
274 | 276 | $(obj)image.c: |
275 | 277 | @rm -f $(obj)image.c |
276 | 278 | ln -s $(src)../common/image.c $(obj)image.c |
277 | - | |
278 | -$(obj)fdt.c: $(SRCTREE)/libfdt/libfdt_internal.h | |
279 | - @rm -f $(obj)fdt.c | |
280 | - ln -s $(src)../libfdt/fdt.c $(obj)fdt.c | |
281 | - | |
282 | -$(obj)fdt_ro.c: $(SRCTREE)/libfdt/libfdt_internal.h | |
283 | - @rm -f $(obj)fdt_ro.c | |
284 | - ln -s $(src)../libfdt/fdt_ro.c $(obj)fdt_ro.c | |
285 | - | |
286 | -$(obj)fdt_rw.c: $(SRCTREE)/libfdt/libfdt_internal.h | |
287 | - @rm -f $(obj)fdt_rw.c | |
288 | - ln -s $(src)../libfdt/fdt_rw.c $(obj)fdt_rw.c | |
289 | - | |
290 | -$(obj)fdt_strerror.c: $(SRCTREE)/libfdt/libfdt_internal.h | |
291 | - @rm -f $(obj)fdt_strerror.c | |
292 | - ln -s $(src)../libfdt/fdt_strerror.c $(obj)fdt_strerror.c | |
293 | - | |
294 | -$(obj)fdt_wip.c: $(SRCTREE)/libfdt/libfdt_internal.h | |
295 | - @rm -f $(obj)fdt_wip.c | |
296 | - ln -s $(src)../libfdt/fdt_wip.c $(obj)fdt_wip.c | |
297 | 279 | |
298 | 280 | $(LOGO_H): $(obj)bmp_logo $(LOGO_BMP) |
299 | 281 | $(obj)./bmp_logo $(LOGO_BMP) >$@ |