summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-24 13:21:02 +0900
committerSascha Hauer <s.hauer@pengutronix.de>2015-01-05 12:27:19 +0100
commitccbe2cd91c53248d7f6c0b82901012b672233dfb (patch)
tree2e5812651075595aa9a650df856591f3edab1f85 /Makefile
parenta1a9665113e415fc6ebd2943927f2089160d2308 (diff)
downloadbarebox-ccbe2cd91c53248d7f6c0b82901012b672233dfb.tar.gz
barebox-ccbe2cd91c53248d7f6c0b82901012b672233dfb.tar.xz
kbuild: do not create include2 directory
include/asm-$(SRCARCH) does not exist. Creating include2 directory is meaningless. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 2978439f35..5676b295f8 100644
--- a/Makefile
+++ b/Makefile
@@ -291,7 +291,7 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve
# Use LINUXINCLUDE when you must reference the include/ directory.
# Needed to be compatible with the O= option
LINUXINCLUDE := -Iinclude -I$(srctree)/dts/include \
- $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
+ $(if $(KBUILD_SRC), -I$(srctree)/include) \
-I$(srctree)/arch/$(ARCH)/include \
-I$(objtree)/arch/$(ARCH)/include \
-include $(srctree)/include/linux/kconfig.h
@@ -789,7 +789,6 @@ PHONY += prepare-all
# prepare3 is used to check if we are building in a separate output directory,
# and if so do:
# 1) Check that make has not been executed in the kernel src $(srctree)
-# 2) Create the include2 directory, used for the second asm symlink
prepare3: include/config/kernel.release
ifneq ($(KBUILD_SRC),)
@echo ' Using $(srctree) as source for kernel'
@@ -798,10 +797,6 @@ ifneq ($(KBUILD_SRC),)
echo " in the '$(srctree)' directory.";\
false; \
fi;
- $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
- $(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/barebox.h ]; then \
- ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
- fi
endif
# prepare2 creates a makefile if using a separate output directory
@@ -964,7 +959,7 @@ CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \
barebox.efi barebox.canon-a1100.bin
# Directories & files removed with 'make mrproper'
-MRPROPER_DIRS += include/config include2 usr/include
+MRPROPER_DIRS += include/config usr/include
MRPROPER_FILES += .config .config.old include/asm .version .old_version \
include/generated/autoconf.h include/generated/version.h \
include/generated/utsrelease.h include/config.h \