diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2caae284ae4c19..7f868f00283620 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -299,10 +299,7 @@ zinstall uinstall install: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ %.dtb: scripts - $(Q)$(MAKE) $(build)=$(subst $(wildcard $(srctree)//),,$(subst $(join /,$(subst dtb,dts,$@)),,$(firstword $(wildcard $(srctree)/$(boot)/dts/amlogic/$(subst dtb,dts,$@) $(srctree)/$(CUSTOMER_DIR_NAME)/meson/dt/$(subst dtb,dts,$@))))) \ - MACHINE=$(MACHINE) \ - $(subst $(wildcard $(srctree)//),,$(subst .dts,.dtb,$(firstword $(wildcard $(srctree)/$(boot)/dts/amlogic/$(subst dtb,dts,$@) $(srctree)/$(CUSTOMER_DIR_NAME)/meson/dt/$(subst dtb,dts,$@))))) - rm $(firstword $(wildcard $(srctree)/$(boot)/dts/amlogic/$(subst dtb,dts,$@) $(srctree)/$(CUSTOMER_DIR_NAME)/meson/dt/$(subst dtb,dts,$@))) + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ dtbs: scripts $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs diff --git a/backports/Kconfig b/backports/Kconfig index b952261caade8c..19c0afb949ad1f 100644 --- a/backports/Kconfig +++ b/backports/Kconfig @@ -4,7 +4,7 @@ config BACKPORT_INTEGRATE config BACKPORT_DIR string - default "backports/" + default "backports" config BACKPORT_VERSION string