kernel: k3-6.18: fix BeagleBadge e-ink overlay patch not applying - #10380
Conversation
The overlay patch's Makefile hunk anchored on a base-board line "k3-am62l3-badge.dtb" that does not exist in the ti-linux 6.18 kernel: the board is named k3-am62l3-beaglebadge.dtb there (and sits after the "# Boards with AM62Lx SoCs" comment). The hunk rejected, failing kernel patching for the whole k3 family (e.g. sk-am62-lp). Re-anchor the hunk onto the real k3-am62l3-beaglebadge.dtb line so the overlay entry is added next to its board. Verified with the exact command the build uses (patch --batch -p1 -N) against the ti-linux 6.18 Makefile: applies cleanly, no rejects. Signed-off-by: Igor Pecovnik <igor@armbian.com>
📝 WalkthroughWalkthroughAdds a GDEY042T81 e-paper device-tree overlay for the AM62L BeagleBadge. The overlay configures SPI0, pin multiplexing, display control GPIOs, and a 2 MHz display device. The K3 DTB build now registers the overlay. ChangesBeagleBadge e-paper support
Estimated code review effort: 2 (Simple) | ~10 minutes Possibly related PRs
Suggested labels: Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
@igorpecovnik I think you might have gotten the wrong Andrei. |
|
You are right, appologize. |
…10392) The k3 branches use different kernel snapshots that name/place the board differently in arch/arm64/boot/dts/ti/Makefile: - vendor / vendor-rt (TI PSDK tag 12.00.00.07): k3-am62l3-badge.dtb - edge / vendor-edge (ti-linux-6.18.y branch): k3-am62l3-beaglebadge.dtb The previous anchor (k3-am62l3-beaglebadge.dtb, PR #10380) fixed edge but broke vendor/vendor-rt (e.g. beaglebadge/vendor-rt: "Hunk #1 FAILED at 67"). Re-anchor the Makefile hunk to the evm overlay entries (…-eqep/mcan/pwm.dtbo), which are identical and contiguous in both snapshots, and add the eink .dtbo there. Overlay entry belongs with the other overlays anyway. Verified with the build's exact command (patch --batch -p1 -N) against both the PSDK tag 12.00.00.07 and the ti-linux-6.18.y branch Makefiles: applies clean, no rejects, on both. Signed-off-by: Igor Pecovnik <igor@armbian.com>
Problem
k3kernel builds (e.g.sk-am62-lp/BRANCH=vendor-edge) fail during kernel patching:(reported via a build log paste)
Root cause
The overlay patch's
arch/arm64/boot/dts/ti/Makefilehunk anchors on a base-board line:That line isn't in the
ti-linux6.18 kernel. The board is actually namedk3-am62l3-beaglebadge.dtbthere (and lives after the# Boards with AM62Lx SoCscomment). The patch was generated against a tree that named/placed the board differently, so the hunk context never matches and the whole k3 patch series fails.Fix
Re-anchor the Makefile hunk onto the real
k3-am62l3-beaglebadge.dtbline, adding the overlay entry next to its board. Only the patch's Makefile hunk changes; the.dtsopayload is untouched.Verification
Applied the patch with the exact command the build uses —
patch --batch -p1 -N --reject-file=… --quoting-style=c(fromlib/tools/common/patching_utils.py) — against the realti-linux6.18arch/arm64/boot/dts/ti/Makefile:.dtsooverlay file is created.diff -uhunk applies at GNU patch's default fuzz (the previous hand-anchor needed fuzz 3, which the build's default-fuzzpatchcall would reject).Note
The base BeagleBadge board is
k3-am62l3-beaglebadge, but the overlay this patch adds is still namedk3-am62l3-badge-eink-gdey042t81(as the original author wrote it). It compiles fine standalone. If the maintainer (@Andrei1998 / the SSD16xx series) wants naming consistency, the overlay could be renamed tok3-am62l3-beaglebadge-eink-gdey042t81in a follow-up — out of scope for this unblock.Summary by CodeRabbit