aboutsummaryrefslogtreecommitdiffstats
path: root/target/sdk/Makefile
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-08-03 13:45:27 +0200
committerJo-Philipp Wich <jo@mein.io>2018-08-03 13:47:29 +0200
commit4bb8a678e0e0eaf5c3651cc73f3b2c4cb1d267a2 (patch)
treeb26c3750f367f71b9f6c9e445c52de33900e7e30 /target/sdk/Makefile
parent13c66f88207149521e5ab675603fd6c650309dbf (diff)
downloadupstream-4bb8a678e0e0eaf5c3651cc73f3b2c4cb1d267a2.tar.gz
upstream-4bb8a678e0e0eaf5c3651cc73f3b2c4cb1d267a2.tar.bz2
upstream-4bb8a678e0e0eaf5c3651cc73f3b2c4cb1d267a2.zip
sdk: include arch/arm/ Linux includes along with arch/arm64/ ones
The Linux headers on arm64 architectures contain references to common arch/arm/ headers which were not bundled by the SDK so far. Check if we're packing the SDK for an arm64 target and if we do, also include arch/arm headers as well. Fixes FS#1725. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'target/sdk/Makefile')
-rw-r--r--target/sdk/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 499c2809dd..a9df8be7d2 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -49,6 +49,12 @@ BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C svn inf
BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git base $(PROJECT_GIT)/openwrt/openwrt.git$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR))
+KDIR_ARCHES = $(LINUX_KARCH)
+
+# arch/arm64/ includes reference files in arch/arm/, so we'll need both
+ifeq ($(LINUX_KARCH),arm64)
+ KDIR_ARCHES += arm
+endif
KERNEL_FILES_ARCH = \
Makefile* \
@@ -67,7 +73,7 @@ KERNEL_FILES_BASE := \
include \
Module.symvers \
modules.builtin \
- $(addprefix arch/$(LINUX_KARCH)/,$(KERNEL_FILES_ARCH))
+ $(foreach arch,$(KDIR_ARCHES),$(addprefix arch/$(arch)/,$(KERNEL_FILES_ARCH)))
KERNEL_FILES := $(patsubst $(TOPDIR)/%,%,$(wildcard $(addprefix $(LINUX_DIR)/,$(KERNEL_FILES_BASE))))