65 lines
2.2 KiB
Diff
65 lines
2.2 KiB
Diff
From a8f9689004d59f0a454ce8cb06bf1556971c1bad Mon Sep 17 00:00:00 2001
|
|
From: Paolo Sabatino <paolo.sabatino@gmail.com>
|
|
Date: Sat, 20 Jul 2024 13:58:49 +0200
|
|
Subject: [PATCH] compile .scr and install overlays in right path
|
|
|
|
---
|
|
scripts/Makefile.dtbinst | 13 ++++++++++++-
|
|
scripts/Makefile.lib | 8 +++++++-
|
|
2 files changed, 19 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
|
|
index 9d920419a62c..9144a1b7c909 100644
|
|
--- a/scripts/Makefile.dtbinst
|
|
+++ b/scripts/Makefile.dtbinst
|
|
@@ -33,7 +33,18 @@ endef
|
|
|
|
$(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))
|
|
|
|
-dtbs := $(notdir $(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
|
|
|
|
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
|
|
index 9f06f6aaf7fc..67a7b73b6688 100644
|
|
--- a/scripts/Makefile.lib
|
|
+++ b/scripts/Makefile.lib
|
|
@@ -394,15 +394,21 @@ quiet_cmd_wrap_S_dtb = WRAP $@
|
|
echo '.balign STRUCT_ALIGNMENT'; \
|
|
} > $@
|
|
|
|
+quiet_cmd_scr = MKIMAGE $@
|
|
+cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
|
|
+
|
|
$(obj)/%.dtb.S: $(obj)/%.dtb FORCE
|
|
$(call if_changed,wrap_S_dtb)
|
|
|
|
$(obj)/%.dtbo.S: $(obj)/%.dtbo FORCE
|
|
$(call if_changed,wrap_S_dtb)
|
|
|
|
+$(obj)/%.scr: $(src)/%.scr-cmd FORCE
|
|
+ $(call if_changed,scr)
|
|
+
|
|
quiet_cmd_dtc = DTC $@
|
|
cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
|
|
- $(DTC) -o $@ -b 0 \
|
|
+ $(DTC) -@ -o $@ -b 0 \
|
|
$(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
|
|
-d $(depfile).dtc.tmp $(dtc-tmp) ; \
|
|
cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
|
|
--
|
|
2.34.1
|
|
|