Skip to contentSkip to conversation

Makefile: do not create a symbolic link to arch/${ARCH}/include/asm

PATCH Superseded Masahiro Yamada 1 participant 2 messages Oct 7, 2013 – Nov 1, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Makefile: do not create a symbolic link to arch/${ARCH}/include/asm

In-tree build:
- Do not create a symbolic link

      from include/asm to arch/${ARCH}/include/asm

- Instead, add ${SRCTREE}/arch/arm/include into the header search path

Out-of-tree build:
- Do not create a directory ${OBJTREE}/include2
- Do not create a symbolic link

      from ${OBJTREE}/include2/asm to ${SRCTREE}/arch/${ARCH}/include/asm

- Instead, add ${SRCTREE}/arch/arm/include into the header search path

---

Note:
The symbolic links "asm/arch" and "asm/proc" (ARM only)
are created the same as before.
I personally do not like these ugly symbolic links and directory structure, but fixing this gives a so big impact that I did not touch this in this commit.

 config.mk           |  4 ++--
 mkconfig            | 14 ++++++--------
 tools/Makefile      |  2 +-
 tools/env/Makefile  |  2 +-
 tools/imls/Makefile |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)
config.mk +2 -2
index 48913f6..702eb02 100644
@@ -257,10 +257,10 @@ endif
 endif
 
 ifneq ($(OBJTREE),$(SRCTREE))
-CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include
+CPPFLAGS += -I$(OBJTREE)/include
 endif
 
-CPPFLAGS += -I$(TOPDIR)/include
+CPPFLAGS += -I$(TOPDIR)/include -I$(SRCTREE)/arch/$(ARCH)/include
 CPPFLAGS += -fno-builtin -ffreestanding -nostdinc	\
 	-isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)
 
mkconfig +6 -8
index 1d06c8e..40db991 100755
@@ -96,17 +96,11 @@ fi
 #
 if [ "$SRCTREE" != "$OBJTREE" ] ; then
 	mkdir -p ${OBJTREE}/include
-	mkdir -p ${OBJTREE}/include2
-	cd ${OBJTREE}/include2
-	rm -f asm
-	ln -s ${SRCTREE}/arch/${arch}/include/asm asm
 	LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
-	cd ../include
+	cd ${OBJTREE}/include
 	mkdir -p asm
 else
-	cd ./include
-	rm -f asm
-	ln -s ../arch/${arch}/include/asm asm
+	cd arch/${arch}/include
 fi
 
 rm -f asm/arch
@@ -122,6 +116,10 @@ if [ "${arch}" = "arm" ] ; then
 	ln -s ${LNPREFIX}proc-armv asm/proc
 fi
 
+if [ "$SRCTREE" = "$OBJTREE" ] ; then
+	cd ${SRCTREE}/include
+fi
+
 #
 # Create include file for Make
 #
tools/Makefile +1 -1
index c36cde2..f5bebe3 100644
@@ -160,7 +160,7 @@ NOPEDOBJS := $(addprefix $(obj),$(NOPED_OBJ_FILES-y))
 #
 HOSTCPPFLAGS =	-include $(SRCTREE)/include/libfdt_env.h \
 		-idirafter $(SRCTREE)/include \
-		-idirafter $(OBJTREE)/include2 \
+		-idirafter $(SRCTREE)/arch/$(ARCH)/include \
 		-idirafter $(OBJTREE)/include \
 	        -I $(SRCTREE)/lib/libfdt \
 		-I $(SRCTREE)/tools \
tools/env/Makefile +1 -1
index 14d131b..27892f7 100644
@@ -14,7 +14,7 @@ HEADERS	:= fw_env.h $(OBJTREE)/include/config.h
 
 # Compile for a hosted environment on the target
 HOSTCPPFLAGS  = -idirafter $(SRCTREE)/include \
-		-idirafter $(OBJTREE)/include2 \
+		-idirafter $(SRCTREE)/arch/$(ARCH)/include \
 		-idirafter $(OBJTREE)/include \
 		-idirafter $(SRCTREE)/tools/env \
 		-DUSE_HOSTCC \
tools/imls/Makefile +1 -1
index 1be1edb..502613c 100644
@@ -37,7 +37,7 @@ LIBFDT_OBJS	:= $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
 # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
 #
 HOSTCPPFLAGS  = -idirafter $(SRCTREE)/include \
-		-idirafter $(OBJTREE)/include2 \
+		-idirafter $(SRCTREE)/arch/$(ARCH)/include \
 		-idirafter $(OBJTREE)/include \
 	        -I $(SRCTREE)/lib/libfdt \
 		-I $(SRCTREE)/tools \
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 Makefile: do not create a symbolic link to arch/${ARCH}/include/asm

Hi.

To make your life easier,
I posted v2 rebased on the current u-boot/master.

Best Regards
Masahiro Yamada