ti: configs: family: k3: Update baseline to 12.00.00.07#9643
ti: configs: family: k3: Update baseline to 12.00.00.07#9643jonaswood01 merged 4 commits intoarmbian:mainfrom
Conversation
Signed-off-by: Jonas Wood <jw@ti.com>
📝 WalkthroughWalkthroughSwitches several TI K3 board ATF/OP-TEE/boot targets, adds a new ATF_PLAT variable to many board configs, updates k3 family source branch/tags (PSDK, kernel, ATF, OP-TEE, U-Boot), and applies large, heterogeneous changes to multiple linux-k3-*.config files. Changes
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ 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 |
github-actions
bot
added
05
|
@coderabbitai review |
✅ Actions performedReview triggered.
|
1 similar comment
✅ Actions performedReview triggered.
|
Signed-off-by: Jonas Wood <jw@ti.com>
jonaswood01
force-pushed
the
update-tags
branch
from
b874713 to
ab4aacb
Compare
github-actions
bot
added
size/medium
|
✅ This PR has been reviewed and approved — all set for merge! |
jonaswood01
dismissed
Grippy98’s stale review
Will retry approvals once I open PR.
Boards do not boot into kernel in current PR state.
Cause is definitely linux-k3-vendor*.config and linux-k3-edge.config needing sync following kernel 6.18 LTS migration, already done in TI/armbian-build for 12.0 release.
github-actions
bot
added
size/large
|
Boards now boot into kernel after adding commit that syncs kernel PR moved from draft to open, ready for review & merge pending approvals |
Completely replace previous .config using same procedure across TI SDK: - cd ~/ti-linux-kernel && git checkout <tag> - export ARCH=arm64 - make defconfig - scripts/kconfig/merge_config.sh .config kernel/configs/ti_arm64_prune.config - scripts/kconfig/merge_config.sh .config /tmp/armbian_k3_critical_final.config -- https://paste.armbian.com/umanujojon.makefile - (ONLY FOR RT): scripts/kconfig/merge_config.sh .config kernel/configs/ti_rt.config - make olddefconfig - make savedefconfig - cp defconfig ~/armbian-build/config/kernel/linux-k3-<branch>.config - cd ~/armbian-build - ./compile.sh rewrite-kernel-config BOARD=<board> BRANCH=<branch> KERNEL_GIT=full Signed-off-by: Jonas Wood <jw@ti.com>
Signed-off-by: Jonas Wood <jw@ti.com>
jonaswood01
force-pushed
the
update-tags
branch
from
cb3f725 to
502f4a0
Compare
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
♻️ Duplicate comments (4)
config/kernel/linux-k3-vendor.config (1)
1-1:⚠️ Potential issue | 🟠 MajorRegenerate this overlay too.
Same concern as the other
linux-k3-*.configfiles: the diff carries a lot of what looks like defconfig-inherited options (e.g. newCONFIG_ARCH_*block,CONFIG_CLK_SOPHGO_CV1800,CONFIG_CIX_MBOX, various bridge/ebtables legacy entries) thatmake savedefconfigwould normally strip. Please run./compile.sh rewrite-kernel-config BOARD=<board> BRANCH=vendorand commit the regenerated file so it stays a true minimal overlay. As per learnings, overlays underconfig/kernel/must be produced by the rewrite-kernel-config workflow rather than edited by hand.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@config/kernel/linux-k3-vendor.config` at line 1, This overlay contains inherited defconfig options (e.g. CONFIG_ARCH_*, CONFIG_CLK_SOPHGO_CV1800, CONFIG_CIX_MBOX and legacy bridge/ebtables entries) that should be removed by the rewrite workflow; regenerate the minimal overlay by running the provided workflow command ./compile.sh rewrite-kernel-config BOARD=<board> BRANCH=vendor and commit the regenerated linux-k3-vendor.config so it becomes a true savedefconfig-style overlay instead of a hand-edited file.config/kernel/linux-k3-edge.config (1)
1-1:⚠️ Potential issue | 🟠 MajorRegenerate this overlay via
rewrite-kernel-configbefore merge.Overlay still doesn't match what
./compile.sh rewrite-kernel-config BOARD=sk-am68 BRANCH=edgeproduces against this branch (per the earlier diff showing ~191 insertions / ~61 deletions of drift). Many of the changes here — e.g. explicitCONFIG_UNIX=y/CONFIG_INET=y, the broad legacy xtables/ebtables/IPv4/IPv6 NAT block,CONFIG_HSRremoval diverging from the vendor-edge variant — are the kind of churn that normally gets compacted/eliminated bymake savedefconfigand the Armbian post-processing. As per learnings,config/kernel/linux-*.configmust be minimal overlays regenerated via./compile.sh rewrite-kernel-config BOARD=<board> BRANCH=<branch>; manual edits drift from the real build output.Please re-run for each linux-k3-* branch (edge / vendor / vendor-rt / vendor-edge) and commit the regenerated files. No re-QA needed, since the build would produce these configs anyway.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@config/kernel/linux-k3-edge.config` at line 1, The kernel config overlay (linux-k3-edge.config) was not regenerated and drifts from the real build output; rerun the rewrite step to produce minimal overlays: run ./compile.sh rewrite-kernel-config BOARD=sk-am68 BRANCH=edge (and similarly for each linux-k3-* branch: edge, vendor, vendor-rt, vendor-edge), verify the regenerated linux-k3-*.config files match the output of make savedefconfig/Armbian post-processing, replace the current edited files with those regenerated files, and commit them so the overlays are compact and no manual churn (e.g., CONFIG_UNIX, CONFIG_INET, HSR removal, legacy xtables blocks) remains.config/kernel/linux-k3-vendor-rt.config (1)
1-1:⚠️ Potential issue | 🟠 MajorSame regeneration request as the edge overlay applies here.
This file exhibits the same overlay-drift pattern (e.g.
CONFIG_ARCH_AXIADO/BLAIZE/CIX/SOPHGO,CONFIG_PINCTRL_SOPHGO_SG2000,CONFIG_CLK_SOPHGO_CV1800,CONFIG_CIX_MBOX— options that are almost certainly already in the arm64 defconfig for 6.18 and should not need to live in the overlay). The earlier ask to re-run./compile.sh rewrite-kernel-configcovered alllinux-k3-*.configfiles; please regenerate this one as well so the committed overlay matches actual build output. As per learnings, these configs must be minimal overlays produced by the rewrite workflow.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@config/kernel/linux-k3-vendor-rt.config` at line 1, The committed overlay contains overlay-drift entries that duplicate upstream arm64 defconfig options (e.g. CONFIG_ARCH_AXIADO, CONFIG_ARCH_BLAIZE, CONFIG_ARCH_CIX, CONFIG_ARCH_SOPHGO, CONFIG_PINCTRL_SOPHGO_SG2000, CONFIG_CLK_SOPHGO_CV1800, CONFIG_CIX_MBOX); regenerate this file so it becomes a minimal overlay matching build output by re-running the kernel-config rewrite workflow (run ./compile.sh rewrite-kernel-config) to produce a new linux-k3-vendor-rt.config that omits options already present in the 6.18 defconfig and only contains true overlay changes. Ensure the regenerated file replaces the current one in the commit.config/kernel/linux-k3-vendor-edge.config (1)
1-1:⚠️ Potential issue | 🟠 MajorRegenerate this overlay too.
Same story here — please run
./compile.sh rewrite-kernel-config BOARD=<board> BRANCH=vendor-edgeand commit the result. The current diff carries the same defconfig-looking additions (CONFIG_ARCH_AXIADO/BLAIZE/CIX/SOPHGO, SOPHGO pinctrl/clk, CIX mailbox, broad legacy ebtables/xtables blocks, full TC ematch/action set) that would normally be elided bysavedefconfig. As per learnings,config/kernel/*.configmust be minimal overlays produced by the rewrite-kernel-config workflow; manual edits will drift from actual build output.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@config/kernel/linux-k3-vendor-edge.config` at line 1, The config overlay includes full defconfig-style entries (e.g. CONFIG_ARCH_AXIADO, CONFIG_ARCH_BLAIZE, CONFIG_ARCH_CIX, SOPHGO pinctrl/clk, CIX mailbox, full TC ematch/action set) instead of a minimal savedefconfig-style overlay; regenerate the overlay by running the rewrite workflow (./compile.sh rewrite-kernel-config BOARD=<board> BRANCH=vendor-edge) and commit the rewritten output so the file becomes the minimal overlay produced by that script rather than manually edited entries.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Duplicate comments:
In `@config/kernel/linux-k3-edge.config`:
- Line 1: The kernel config overlay (linux-k3-edge.config) was not regenerated
and drifts from the real build output; rerun the rewrite step to produce minimal
overlays: run ./compile.sh rewrite-kernel-config BOARD=sk-am68 BRANCH=edge (and
similarly for each linux-k3-* branch: edge, vendor, vendor-rt, vendor-edge),
verify the regenerated linux-k3-*.config files match the output of make
savedefconfig/Armbian post-processing, replace the current edited files with
those regenerated files, and commit them so the overlays are compact and no
manual churn (e.g., CONFIG_UNIX, CONFIG_INET, HSR removal, legacy xtables
blocks) remains.
In `@config/kernel/linux-k3-vendor-edge.config`:
- Line 1: The config overlay includes full defconfig-style entries (e.g.
CONFIG_ARCH_AXIADO, CONFIG_ARCH_BLAIZE, CONFIG_ARCH_CIX, SOPHGO pinctrl/clk, CIX
mailbox, full TC ematch/action set) instead of a minimal savedefconfig-style
overlay; regenerate the overlay by running the rewrite workflow (./compile.sh
rewrite-kernel-config BOARD=<board> BRANCH=vendor-edge) and commit the rewritten
output so the file becomes the minimal overlay produced by that script rather
than manually edited entries.
In `@config/kernel/linux-k3-vendor-rt.config`:
- Line 1: The committed overlay contains overlay-drift entries that duplicate
upstream arm64 defconfig options (e.g. CONFIG_ARCH_AXIADO, CONFIG_ARCH_BLAIZE,
CONFIG_ARCH_CIX, CONFIG_ARCH_SOPHGO, CONFIG_PINCTRL_SOPHGO_SG2000,
CONFIG_CLK_SOPHGO_CV1800, CONFIG_CIX_MBOX); regenerate this file so it becomes a
minimal overlay matching build output by re-running the kernel-config rewrite
workflow (run ./compile.sh rewrite-kernel-config) to produce a new
linux-k3-vendor-rt.config that omits options already present in the 6.18
defconfig and only contains true overlay changes. Ensure the regenerated file
replaces the current one in the commit.
In `@config/kernel/linux-k3-vendor.config`:
- Line 1: This overlay contains inherited defconfig options (e.g. CONFIG_ARCH_*,
CONFIG_CLK_SOPHGO_CV1800, CONFIG_CIX_MBOX and legacy bridge/ebtables entries)
that should be removed by the rewrite workflow; regenerate the minimal overlay
by running the provided workflow command ./compile.sh rewrite-kernel-config
BOARD=<board> BRANCH=vendor and commit the regenerated linux-k3-vendor.config so
it becomes a true savedefconfig-style overlay instead of a hand-edited file.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: a81a647c-556c-4910-ac60-3f46523d50f2
📒 Files selected for processing (4)
config/kernel/linux-k3-edge.configconfig/kernel/linux-k3-vendor-edge.configconfig/kernel/linux-k3-vendor-rt.configconfig/kernel/linux-k3-vendor.config
tabrisnet
left a comment
tabrisnet
left a comment
There was a problem hiding this comment.
nothing obviously wrong,
|
✅ This PR has been reviewed and approved — all set for merge! |
github-actions
bot
added
Ready to merge
Grippy98
left a comment
Grippy98
left a comment
There was a problem hiding this comment.
Great, once merged Ill reopen Badge without kernel changes.
3 participants
Description
Adds support for 6.18 kernel
.configfor 6.18 kernel (see commit msg for details)How Has This Been Tested?
sk-am62-lp: build log, boots ✅sk-am62-sip: build log, boots ✅sk-am62b: build log, boots ✅sk-am62p: build log, boots ✅tmds62levm: build log, boots ✅sk-am64b: build log, boots ✅sk-am68: build log, boot not testedsk-am69: build log, boot not testedsk-tda4vm: build log, boot not testedNotes:
vendorbranchChecklist:
Summary by CodeRabbit