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

Commit 3e5d75b2 authored Aug 06, 2015 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Aug 06, 2015

Merge "defconfig: arm64: Enable DT appending for MSM8996"

parents cbd32df3 866148fe

arch/arm64/boot/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		# Based on the ia64 boot/Makefile.
		#

		include $(srctree)/arch/arm64/boot/dts/Makefile
		include $(srctree)/arch/arm64/boot/dts/qcom/Makefile

		targets := Image Image.gz

arch/arm64/boot/dts/Makefile

+0 −8

Original line number	Diff line number	Diff line
		@@ -4,14 +4,6 @@ dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb

		targets += dtbs

		DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES))
		ifneq ($(DTB_NAMES),)
		DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))
		else
		DTB_LIST := $(dtb-y)
		endif
		targets += $(DTB_LIST)

		#used for cleaning - not building
		subdir- := qcom

arch/arm64/configs/msm-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ CONFIG_ZSMALLOC=y
		CONFIG_BALANCE_ANON_FILE_RECLAIM=y
		CONFIG_ARMV8_DEPRECATED=y
		CONFIG_SWP_EMULATION=y
		CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y
		# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
		CONFIG_COMPAT=y
		CONFIG_PM_AUTOSLEEP=y

arch/arm64/configs/msm_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ CONFIG_ZSMALLOC=y
		CONFIG_BALANCE_ANON_FILE_RECLAIM=y
		CONFIG_ARMV8_DEPRECATED=y
		CONFIG_SWP_EMULATION=y
		CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y
		# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
		CONFIG_COMPAT=y
		CONFIG_PM_AUTOSLEEP=y