diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index 1072edf8ddf7..b7a011b0e52c 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -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) diff --git a/arch/arm/configs/vendor/sdxlemur.config b/arch/arm/configs/vendor/sdxlemur.config index 5bef209bfafc..14374701e45d 100644 --- a/arch/arm/configs/vendor/sdxlemur.config +++ b/arch/arm/configs/vendor/sdxlemur.config @@ -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