summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-09-01 16:35:01 +0100
committerJon Medhurst <tixy@linaro.org>2015-09-01 16:35:01 +0100
commit14ea5f56912eda646fb82850921ee1c4c13cb619 (patch)
tree577008a46aad975793d438870d5012f0dfb9874a
parentb6c4e597359472a796b5a5bafe2b0e3151eff1e1 (diff)
downloadcommon-linaro-lollipop-experimental.tar.gz
Update tasks/kernel.mk for Linux 3.18 DTBslinaro-lollipop-experimental
The Makefile in Linux 3.18 does not support building specific named device-trees, so use the 'dtbs' build target to build all those configured for the current kernel. (That build target also works on 3.10 kernels.) Also, the source files for device-trees trees are now spread out into sub-directories named by vendor, so switch to using the 'find' command to find the built dtb files we want to copy. Change-Id: I1523db96a3013da017fd119a9650afec17a4e00a Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--tasks/kernel.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/tasks/kernel.mk b/tasks/kernel.mk
index 6729dce..b5b9a24 100644
--- a/tasks/kernel.mk
+++ b/tasks/kernel.mk
@@ -196,8 +196,8 @@ all_dtbs : $(INSTALLED_KERNEL_TARGET)
cd $(KERNEL_SRC) && \
if [ `echo $(KERNEL_TOOLS_PREFIX) |cut -b1` = "/" ]; then KTP="$(KERNEL_TOOLS_PREFIX)"; else KTP="$(REALTOP)/$(KERNEL_TOOLS_PREFIX)"; fi ; \
if [ -e $${KTP}ld.bfd ]; then LD=$${KTP}ld.bfd; else LD=$${KTP}ld; fi && \
- $(MAKE) O=$(KERNEL_OUT) ARCH=$(ARCH) CROSS_COMPILE="$${KTP}" $(DTB_TARGETS)
- -mv -f $(KERNEL_OUT)/arch/$(ARCH)/boot/dts/*.dtb $(KERNEL_OUT)/arch/$(ARCH)/boot/
+ $(MAKE) O=$(KERNEL_OUT) ARCH=$(ARCH) CROSS_COMPILE="$${KTP}" dtbs
+ find $(KERNEL_OUT)/arch/$(ARCH)/boot/dts/ -name '*.dtb' -exec mv -f {} $(KERNEL_OUT)/arch/$(ARCH)/boot/ \;
ifeq ($(TARGET_PRODUCT), full_jacinto6evm)
cp $(KERNEL_OUT)/arch/$(ARCH)/boot/*.dtb $(PRODUCT_OUT)/dtb.img