qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rockchip: generalize dtb installation makefile

This commit is contained in:
Paolo Sabatino 2024-06-04 16:51:55 +02:00 committed by Igor
parent af5a766940
commit d3ff61144c
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
patch/kernel/archive/rockchip-6.9/patches.armbian/general-add-overlay-compilation-support.patch
View File

@ -9,15 +9,26 @@ Subject: [PATCH] compile .scr and install overlays in right path
2 files changed, 8 insertions(+), 2 deletions(-) 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
index 67956f6496a5..1882d264306c 100644 index 67956f6496a5..151687728a60 100644
--- a/scripts/Makefile.dtbinst --- a/scripts/Makefile.dtbinst
+++ b/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst
@@ -33,7 +33,7 @@ endef @@ -33,7 +33,18 @@ endef
$(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d)))) $(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))
-dtbs := $(notdir $(dtbs)) -dtbs := $(notdir $(dtbs))
+dtbs := $(subst rockchip/,,$(dtbs)) +# Very convoluted way to flatten all the device tree
+# directories, but keep the "/overlay/" directory
+
+# topmost directory (ie: from rockchip/overlay/rk322x-emmc.dtbo extracts rockchip)
+topmost_dir = $(firstword $(subst /, ,$(dtbs)))
+# collect dtbs entries which starts with "$topmost_dir/overlay/", then remove "$topmost_dir"
+dtbs_overlays = $(subst $(topmost_dir)/,,$(filter $(topmost_dir)/overlay/%, $(dtbs)))
+# collect the non-overlay dtbs
+dtbs_regular = $(filter-out $(topmost_dir)/overlay/%, $(dtbs))
+# compose the dtbs variable flattening all the non-overlays entries
+# and appending the overlays entries
+dtbs := $(notdir $(dtbs_regular)) $(dtbs_overlays)
endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL