diff --git a/patch/kernel/archive/meson64-6.10/general-add-overlay-compilation-support.patch b/patch/kernel/archive/meson64-6.10/general-add-overlay-compilation-support.patch index b2e233f4dd..3a0c05e60c 100644 --- a/patch/kernel/archive/meson64-6.10/general-add-overlay-compilation-support.patch +++ b/patch/kernel/archive/meson64-6.10/general-add-overlay-compilation-support.patch @@ -1,15 +1,15 @@ -From 088e1cd9b9dd113f0a5e9e19a7f31c37532e002a Mon Sep 17 00:00:00 2001 +From a8f9689004d59f0a454ce8cb06bf1556971c1bad Mon Sep 17 00:00:00 2001 From: Paolo Sabatino -Date: Sun, 2 Jun 2024 21:53:01 +0200 +Date: Sat, 20 Jul 2024 13:58:49 +0200 Subject: [PATCH] compile .scr and install overlays in right path --- - scripts/Makefile.dtbinst | 2 +- - scripts/Makefile.lib | 8 +++++++- - 2 files changed, 8 insertions(+), 2 deletions(-) + 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 67956f6496a5..151687728a60 100644 +index 9d920419a62c..9144a1b7c909 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -33,7 +33,18 @@ endef @@ -33,11 +33,25 @@ index 67956f6496a5..151687728a60 100644 endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 3179747cbd2c..59925208734a 100644 +index 9f06f6aaf7fc..67a7b73b6688 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -398,7 +398,7 @@ $(obj)/%.dtbo.S: $(obj)/%.dtbo FORCE +@@ -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 \ @@ -45,25 +59,6 @@ index 3179747cbd2c..59925208734a 100644 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) -@@ -423,12 +423,18 @@ quiet_cmd_dtb = $(quiet_cmd_dtc) - cmd_dtb = $(cmd_dtc) - endif - -+quiet_cmd_scr = MKIMAGE $@ -+cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@ -+ - $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE - $(call if_changed_dep,dtb) - - $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE - $(call if_changed_dep,dtc) - -+$(obj)/%.scr: $(src)/%.scr-cmd FORCE -+ $(call if_changed,scr) -+ - dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) - - # Bzip2 -- 2.34.1