diff mbox series

[SRU,I/raspi,H/raspi,F/raspi,1/1] UBUNTU: SAUCE: Install overlays/README

Message ID 20211215090047.36440-2-juergh@canonical.com
State New
Headers show
Series Missing overlays/README (LP: #1954757) | expand

Commit Message

Juerg Haefliger Dec. 15, 2021, 9 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1954757

The DTB overlay README file is used by the 'dtoverlay' command to display
help text for overlays (usage, params and such). Copy it when calling the
dtbs_install target.

Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 arch/arm/boot/dts/overlays/Makefile | 4 ++++
 scripts/Makefile.dtbinst            | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
index fbcc3e35a747..c186f49c5176 100644
--- a/arch/arm/boot/dts/overlays/Makefile
+++ b/arch/arm/boot/dts/overlays/Makefile
@@ -240,8 +240,12 @@  dtbo-$(CONFIG_ARCH_BCM2835) += \
 	wittypi.dtbo \
 	wm8960-soundcard.dtbo
 
+# These will simply be copied
+misc-$(CONFIG_ARCH_BCM2835) += README
+
 targets += dtbs dtbs_install
 targets += $(dtbo-y)
+targets += $(misc-y)
 
 always-y	:= $(dtbo-y)
 clean-files	:= *.dtbo
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
index 84c46c081218..5aed7390a62c 100644
--- a/scripts/Makefile.dtbinst
+++ b/scripts/Makefile.dtbinst
@@ -19,9 +19,10 @@  include $(src)/Makefile
 
 dtbs    := $(addprefix $(dst)/, $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-)))
 dtbos   := $(addprefix $(dst)/, $(dtbo-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-)))
+miscs   := $(addprefix $(dst)/, $(misc-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-)))
 subdirs := $(addprefix $(obj)/, $(subdir-y) $(subdir-m))
 
-__dtbs_install: $(dtbs) $(dtbos) $(subdirs)
+__dtbs_install: $(dtbs) $(dtbos) $(miscs) $(subdirs)
 	@:
 
 quiet_cmd_dtb_install = INSTALL $@
@@ -33,6 +34,9 @@  $(dst)/%.dtb: $(obj)/%.dtb
 $(dst)/%.dtbo: $(obj)/%.dtbo
 	$(call cmd,dtb_install)
 
+$(dst)/%: $(obj)/%
+	$(call cmd,dtb_install)
+
 PHONY += $(subdirs)
 $(subdirs):
 	$(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@)