Skip to content

Commit 583964b

Browse files
committed
k3-beagle: fix malformed csi0-imx219 overlay patch (bad hunk count)
The BeagleY-AI CSI0 IMX219 overlay patch failed to apply on edge/6.18 kernel builds: patch: **** malformed patch at line 152: -- Failed to parse unidiff ... 'Hunk is longer than expected' The new-file hunk header declared "@@ -0,0 +1,130 @@" but the body contains only 128 added lines, so patch(1) ran past the hunk and consumed the "--"/"2.43.0" git signature footer. The footer's trailing space had also been stripped ("--" instead of "-- "). Correct the hunk count to 128, align the diffstat (128/129 insertions), and restore the "-- " signature separator. The overlay content is unchanged and complete (brace/bracket balanced). Verified with both `git apply --check` and `patch -p1 --dry-run` (exit 0). Signed-off-by: Igor Pecovnik <igor@armbian.com>
1 parent 37032d1 commit 583964b

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

patch/kernel/archive/k3-beagle-6.18/0003-arm64-dts-ti-add-beagley-ai-csi0-imx219-overlay.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ then consume the raw frames through the TI media graph.
1515
Assisted-by: Codex <codex@openai.com>
1616
---
1717
arch/arm64/boot/dts/ti/Makefile | 1 +
18-
.../dts/ti/k3-am67a-beagley-ai-csi0-imx219.dtso | 130 +++++++++++++++++++++
19-
2 files changed, 131 insertions(+)
18+
.../dts/ti/k3-am67a-beagley-ai-csi0-imx219.dtso | 128 +++++++++++++++++++++
19+
2 files changed, 129 insertions(+)
2020
create mode 100644 arch/arm64/boot/dts/ti/k3-am67a-beagley-ai-csi0-imx219.dtso
2121

2222
diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile
@@ -36,7 +36,7 @@ new file mode 100644
3636
index 000000000000..333333333333
3737
--- /dev/null
3838
+++ b/arch/arm64/boot/dts/ti/k3-am67a-beagley-ai-csi0-imx219.dtso
39-
@@ -0,0 +1,130 @@
39+
@@ -0,0 +1,128 @@
4040
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
4141
+/*
4242
+ * DT Overlay for Raspberry Pi Camera V2.1 on BeagleY-AI CSI0.
@@ -165,5 +165,5 @@ index 000000000000..333333333333
165165
+&dphy0 {
166166
+ status = "okay";
167167
+};
168-
--
168+
--
169169
2.43.0

0 commit comments

Comments
 (0)