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

Commit 7fcf64dc authored Aug 17, 2020 by qctecmdr Committed by Gerrit - the friendly Code Review server Aug 17, 2020

Merge "defconfig: Add support for ARM_APPENDED_DTB for sdxlemur"

parents 214b829c ef059a6e

arch/arm/boot/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -14,10 +14,6 @@
		OBJCOPYFLAGS :=-O binary -R .comment -S

		include $(srctree)/arch/arm/boot/dts/Makefile
		ifneq ($(DTSSUBDIR),)
		DTSSUBDIR_INCS=$(foreach DIR, $(DTSSUBDIR), $(addsuffix /Makefile, $(addprefix $(srctree)/arch/arm/boot/dts/, $(DIR))))
		include $(DTSSUBDIR_INCS)
		endif

		# Note: the following conditions must always be true:
		# ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)

arch/arm/configs/vendor/sdxlemur.config

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ CONFIG_SLIMBUS=y
		CONFIG_IPC_LOGGING=y
		# CONFIG_USB_GADGET_DEBUG_FS is not set
		CONFIG_PINCTRL_SDXLEMUR=y
		CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y
		CONFIG_REGULATOR_PROXY_CONSUMER=y
		CONFIG_REGULATOR_STUB=y