Skip to contentSkip to conversation

Fix out of tree building issue

PATCH New Anatolij Gustschin 2 participants 2 messages Mar 26, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix out of tree building issue

Currently U-Boot building in some external directory doesn't work. This patch tries to fix the problem.

---
 tools/Makefile |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)
tools/Makefile +13 -7
index 9f0dedf..8784a6d 100644
@@ -37,7 +37,7 @@ endif
 #OBJ_FILES	+= mpc86x_clk.o
 #endif
 
-LIBFDT_OBJ_FILES	= fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_wip.o
+LIBFDT_OBJ_FILES	= $(obj)fdt.o $(obj)fdt_ro.o $(obj)fdt_rw.o $(obj)fdt_strerror.o $(obj)fdt_wip.o
 
 LOGO_H	= $(OBJTREE)/include/bmp_logo.h
 
@@ -251,24 +251,30 @@ $(obj)sha1.c:
 $(obj)image.c:
 		@rm -f $(obj)image.c
 		ln -s $(src)../common/image.c $(obj)image.c
-
-$(obj)fdt.c:	libfdt_internal.h
+		if [ ! -f $(obj)mkimage.h ] ; then \
+			ln -s $(src)../tools/mkimage.h $(obj)mkimage.h; \
+		fi
+		if [ ! -f $(obj)fdt_host.h ] ; then \
+			ln -s $(src)../tools/fdt_host.h $(obj)fdt_host.h; \
+		fi
+
+$(obj)fdt.c:	$(obj)libfdt_internal.h
 		@rm -f $(obj)fdt.c
 		ln -s $(src)../libfdt/fdt.c $(obj)fdt.c
 
-$(obj)fdt_ro.c:	libfdt_internal.h
+$(obj)fdt_ro.c:	$(obj)libfdt_internal.h
 		@rm -f $(obj)fdt_ro.c
 		ln -s $(src)../libfdt/fdt_ro.c $(obj)fdt_ro.c
 
-$(obj)fdt_rw.c:	libfdt_internal.h
+$(obj)fdt_rw.c:	$(obj)libfdt_internal.h
 		@rm -f $(obj)fdt_rw.c
 		ln -s $(src)../libfdt/fdt_rw.c $(obj)fdt_rw.c
 
-$(obj)fdt_strerror.c:	libfdt_internal.h
+$(obj)fdt_strerror.c:	$(obj)libfdt_internal.h
 		@rm -f $(obj)fdt_strerror.c
 		ln -s $(src)../libfdt/fdt_strerror.c $(obj)fdt_strerror.c
 
-$(obj)fdt_wip.c:	libfdt_internal.h
+$(obj)fdt_wip.c:	$(obj)libfdt_internal.h
 		@rm -f $(obj)fdt_wip.c
 		ln -s $(src)../libfdt/fdt_wip.c $(obj)fdt_wip.c
 
Signature · 1 line
1.5.3.3
#1 lore raw

PATCH 1/1 Fix out of tree building issue

Quoted 4 lines · In message <[email protected]> you wrote:

Currently U-Boot building in some external directory doesn't work. This patch tries to fix the problem.

Applied. Thanks again, Anatolij!

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"An open mind has but one disadvantage: it collects dirt."
                                                    - a saying at RPI