From 3875290fe4d68f403d3f4a758dd4d20d55a3e2de Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sat, 14 Sep 2024 11:37:20 +0200 Subject: [PATCH] rockchip-rk3588-6.11: bump to v6.11-rc7; manually rebase `0001-general-add-overlay-support.patch` - this rebases manually around https://github.com/torvalds/linux/commit/8fcd8d1e63c05c48b3ac16d0c3e2cd6a7a5c8ec4 introduced in v6.11-rc5 (so much for "fixes only in rc's") --- .../0001-general-add-overlay-support.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/0001-general-add-overlay-support.patch b/patch/kernel/archive/rockchip-rk3588-6.11/0001-general-add-overlay-support.patch index 1b42e27aaa..dffc72914d 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.11/0001-general-add-overlay-support.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.11/0001-general-add-overlay-support.patch @@ -36,24 +36,24 @@ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 111111111111..222222222222 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -402,7 +402,7 @@ $(obj)/%.dtbo.S: $(obj)/%.dtbo FORCE +@@ -405,7 +405,7 @@ cmd_dtb_check = $(if $(dtb-check-enabled),; $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u - quiet_cmd_dtc = DTC $@ + quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@ 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) -@@ -438,12 +438,18 @@ quiet_cmd_dtb = $(quiet_cmd_dtc) - cmd_dtb = $(cmd_dtc) + cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) \ +@@ -430,12 +430,18 @@ DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.json + dtb-check-enabled = $(if $(filter %.dtb, $@),y) endif +quiet_cmd_scr = MKIMAGE $@ +cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@ + $(obj)/%.dtb: $(obj)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE - $(call if_changed_dep,dtb) + $(call if_changed_dep,dtc) $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE $(call if_changed_dep,dtc)