Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79b844d0 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge branch 'lsk-v3.18-15.07-android-with-usb-fixup' into 'msm-3.18' 



Catch msm-3.18 up with the latest Android Linaro Stable Kernel (LSK)
tag, lsk-v3.18-15.07-android. Rather than merging in tag directly,
a branch based on that tag, containing some USB fixups, is merged
instead. This avoids significant merge conflicts in USB/Gadget.

As part of the merge resolution, resolve a few trivial style/context
conflicts, and also rework the device tree Makefiles to support device
tree subdirectories (such as the 'arch/arm/boot/dts/qcom' used on
qcom/msm targets).

Conflicts:
	arch/arm/Makefile
	arch/arm/boot/dts/Makefile
	arch/arm64/Makefile
	arch/arm64/boot/dts/Makefile
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/kernel/cpuinfo.c
	drivers/clk/clk.c
	include/net/route.h
	net/ipv4/route.c

Change-Id: I479d6d42d9d09d936e6fe8c376203304cf7aafbe
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents 8b477bbf c2d771db

android/configs/android-base.cfg

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_IP6_NF_TARGET_REJECT=y

CONFIG_IP6_NF_TARGET_REJECT_SKERR=y

CONFIG_IPV6=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

arch/arm/Makefile

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

arch/arm/boot/Makefile

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES)) 
else

DTB_LIST := $(dtb-y)

endif

DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST))

DTB_OBJS := $(addprefix $(obj)/dts/qcom/,$(DTB_LIST))



ifeq ($(CONFIG_XIP_KERNEL),y)

arch/arm/boot/dts/Makefile

100644 → 100755
+0 −13
Original line number Diff line number Diff line
@@ -517,25 +517,12 @@ dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \ 
	dove-dove-db.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb



DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))

ifneq ($(DTB_NAMES),)

DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))

else

DTB_LIST := $(dtb-y)

endif



targets += dtbs dtbs_install

targets += $(DTB_LIST)



#used for cleaning - not building

subdir- := qcom

endif



# *.dtb used to be generated in the directory above. Clean out the

# old build results so people don't accidentally use them.

dtbs: $(addprefix $(obj)/, $(DTB_LIST))

	$(Q)rm -f $(obj)/../*.dtb



clean-files := *.dtb



dtbs_install: $(addsuffix _dtbinst_, $(dtb-y))

arch/arm/boot/dts/qcom/Makefile

100644 → 100755
+7 −7
Original line number Diff line number Diff line 
ifeq ($(CONFIG_OF),y)



dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \

	msm8996-v2-pmi8994-mtp.dtb \

	msm8996-v2-pmi8994-pmk8001-cdp.dtb \
@@ -55,14 +53,16 @@ dtb-$(CONFIG_ARCH_MSM8916) += msm8952-qrd-skum.dtb \ 
       msm8952-ext-codec-cdp.dtb \

       msm8952-mtp.dtb





ifeq ($(CONFIG_ARM64),y)

always          := $(dtb-y)

subdir-y        := $(dts-dirs)

else

targets += dtbs

targets += $(addprefix ../, $(dtb-y))

endif



$(obj)/../%.dtb: $(src)/%.dts FORCE

        $(call if_changed_dep,dtc)



dtbs: $(addprefix $(obj)/../,$(dtb-y))



dtbs: $(addprefix $(obj)/,$(dtb-y))

endif

clean-files := *.dtb