overlays: Use dtbs-list for overlay installation

Update the overlay build rules to use the dtbs-list mechanism. Also
include the README, and don't set the executable bits.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
This commit is contained in:
Phil Elwell
2024-04-03 16:26:59 +01:00
committed by Dom Cobley
parent 549316ebf3
commit 42fec197be
4 changed files with 10 additions and 4 deletions

View File

@@ -1,6 +1,6 @@
# Overlays for the Raspberry Pi platform
dtb-$(CONFIG_ARCH_BCM2835) += overlay_map.dtb hat_map.dtb
dtb-$(CONFIG_ARCH_BCM2835) += overlay_map.dtb hat_map.dtb README
dtbo-$(CONFIG_ARCH_BCM2835) += \
act-led.dtbo \

View File

@@ -419,7 +419,7 @@ cmd_gen_order = { $(foreach m, $(real-prereqs), \
$(obj)/modules.order: $(obj-m) FORCE
$(call if_changed,gen_order)
$(obj)/dtbs-list: $(dtb-y) FORCE
$(obj)/dtbs-list: $(dtb-y) $(dtbo-y) FORCE
$(call if_changed,gen_order)
#

View File

@@ -31,9 +31,14 @@ $(dst)/%: $(obj)/$(1)%
$$(call cmd,dtb_install)
endef
$(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))
define overlays_install_rules
$(dst)/overlays/%: $(obj)/$(1)%
$$(call cmd,dtb_install)
endef
dtbs := $(notdir $(dtbs))
$(foreach d, $(sort $(dir $(dtbs))), $(if $(findstring "overlays/","$(d)"),$(eval $(call overlays_install_rules,$(d))),$(eval $(call gen_install_rules,$(d)))))
dtbs := $(foreach d, $(dtbs), $(if $(findstring overlays/,$(d)),$(d),$(notdir $(d))))
endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL

View File

@@ -105,6 +105,7 @@ real-obj-y := $(addprefix $(obj)/,$(real-obj-y))
real-obj-m := $(addprefix $(obj)/,$(real-obj-m))
multi-obj-m := $(addprefix $(obj)/, $(multi-obj-m))
dtb-y := $(addprefix $(obj)/, $(dtb-y))
dtbo-y := $(addprefix $(obj)/, $(dtbo-y))
multi-dtb-y := $(addprefix $(obj)/, $(multi-dtb-y))
real-dtb-y := $(addprefix $(obj)/, $(real-dtb-y))
subdir-ym := $(addprefix $(obj)/,$(subdir-ym))