diff mbox

[1/2] Revert "dts, kbuild: dtbs_install installs .dtbo files too"

Message ID 1499856111-19201-2-git-send-email-paolo.pisati@canonical.com
State New
Headers show

Commit Message

Paolo Pisati July 12, 2017, 10:41 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1703802

This reverts commit 4833c0343531aee507e80771c83c086da7488a71.

Once we land a recent boot firmware in the archive, this commit can be reverted.

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 scripts/Makefile.dtbinst | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
index 43647b3..1c15717 100644
--- a/scripts/Makefile.dtbinst
+++ b/scripts/Makefile.dtbinst
@@ -29,7 +29,6 @@  ifeq ("$(dtbinst-root)", "$(obj)")
 endif
 
 dtbinst-files	:= $(dtb-y)
-dtboinst-files	:= $(dtbo-y)
 dtbinst-dirs	:= $(dts-dirs)
 
 # Helper targets for Installing DTBs into the boot directory
@@ -38,18 +37,15 @@  quiet_cmd_dtb_install =	INSTALL $<
 
 install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj))
 
-$(dtbinst-files) $(dtboinst-files) $(dtbinst-dirs): | __dtbs_install_prep
+$(dtbinst-files) $(dtbinst-dirs): | __dtbs_install_prep
 
 $(dtbinst-files): %.dtb: $(obj)/%.dtb
 	$(call cmd,dtb_install,$(install-dir))
 
-$(dtboinst-files): %.dtbo: $(obj)/%.dtbo
-	$(call cmd,dtb_install,$(install-dir))
-
 $(dtbinst-dirs):
 	$(Q)$(MAKE) $(dtbinst)=$(obj)/$@
 
-PHONY += $(dtbinst-files) $(dtboinst-files) $(dtbinst-dirs)
-__dtbs_install: $(dtbinst-files) $(dtboinst-files) $(dtbinst-dirs)
+PHONY += $(dtbinst-files) $(dtbinst-dirs)
+__dtbs_install: $(dtbinst-files) $(dtbinst-dirs)
 
 .PHONY: $(PHONY)