diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-08-03 13:45:27 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-08-04 13:44:10 +0200 |
| commit | b7e3f10e801998781cf123b9c81c305004f03439 (patch) | |
| tree | ed228415f32a9cba7c87698d20a6401bacd484df /target/sdk | |
| parent | d93ef3c8c8a22768ae33ad7c7ca603d12a5c88f8 (diff) | |
| download | upstream-b7e3f10e801998781cf123b9c81c305004f03439.tar.gz upstream-b7e3f10e801998781cf123b9c81c305004f03439.tar.bz2 upstream-b7e3f10e801998781cf123b9c81c305004f03439.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>
(cherry picked from commit 4bb8a678e0e0eaf5c3651cc73f3b2c4cb1d267a2)
Diffstat (limited to 'target/sdk')
| -rw-r--r-- | target/sdk/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 80deedbbd6..ae4bce5260 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -48,6 +48,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 https://git.lede-project.org/source.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* \ @@ -66,7 +72,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)))) |