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

Commit 3850b28e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Ic9a04f8d,I318a1d11,I74b1ed98 into msm-next

* changes:
  arch: arm64: Enable APPENDED_DTB in Makefile
  scripts: Makefile: Remove flags which are not support by EXT_DTC
  arm64: add config option to enable DT overlay
parents 9f2cdbd8 d4ae6106
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -1140,6 +1140,11 @@ config BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES
	  Space separated list of names of dtbs to append when
	  building a concatenated Image.gz-dtb.

config BUILD_ARM64_DT_OVERLAY
	bool "enable DT overlay compilation support"
	depends on OF
	help
	  This option enables support for DT overlay compilation.
endmenu

menu "Userspace binary formats"
+4 −1
Original line number Diff line number Diff line
@@ -122,8 +122,11 @@ endif

KBUILD_DTBS	:= dtbs

all:	Image.gz $(KBUILD_DTBS) $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME))
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
export DTC_FLAGS := -@
endif

all:	Image.gz $(KBUILD_DTBS) $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME))

Image: vmlinux
	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))
else
DTB_LIST := $(dtb-y)
endif
DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST))
DTB_OBJS := $(shell find $(obj)/dts/ -name \*.dtb)

$(obj)/Image: vmlinux FORCE
	$(call if_changed,objcopy)
+4 −2
Original line number Diff line number Diff line
@@ -280,8 +280,10 @@ DTC ?= $(objtree)/scripts/dtc/dtc

# Disable noisy checks by default
ifeq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),)
DTC_FLAGS += -Wno-unit_address_vs_reg \
	-Wno-simple_bus_reg \
DTC_FLAGS += -Wno-unit_address_vs_reg
endif
ifeq ($(DTC_EXT),)
DTC_FLAGS += -Wno-simple_bus_reg \
	-Wno-unit_address_format \
	-Wno-pci_bridge \
	-Wno-pci_device_bus_num \