[Action/cherry pick]dts: Add Micas M2-W6950-128OC BMC device tree into patches-sonic#593
[Action/cherry pick]dts: Add Micas M2-W6950-128OC BMC device tree into patches-sonic#593luka-micas wants to merge 1 commit into
Conversation
Signed-off-by: luka-micas <luka@micasnetworks.com>
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@bingwang-ms cherry pick #586 to 202605, this is the pr, please help review and merge it, thanks! |
|
@vaibhavhd Can you please review & merge? |
yxieca
left a comment
There was a problem hiding this comment.
Cherry-pick policy — backport justification needed before merge to 202605
The change itself is fine: it's an exact, faithful cherry-pick of the master patch — the series append is correct, the new files are self-contained, and it builds. No code-quality concerns here.
The blocker is process. 202605 is a stable release branch on the same kernel (6.12.41) as master, so this is net-new platform enablement, not a bugfix backport. Per cherry-pick policy, could you please add:
- Justification for taking new-platform support into 202605 — is M2-W6950-128OC committed for this release, and what breaks without it?
- Confirmation the master PR is merged (this should land on master first).
- Branch-owner sign-off for the feature backport.
Happy to approve once the rationale + branch-owner ack are in. Thanks!
|
For BMC related change, please raise PR to 202608 branch. Thanks |
Why I did it
Backport the device tree support for the Micas M2-W6950-128OC BMC platform to the 202605 release branch, to enable full hardware compatibility and normal boot capability for the Micas BMC platform on the 202605 SONiC release.
Included changes:
micas-m2-w6950-128oc.dtscontaining the complete Aspeed AST2700 hardware description for Micas BMCaspeed-g7-alt-flash-layout-64.dtsidefining the alternate flash partition layout (including u-boot, kernel, rootfs, and other relevant partitions)arch/arm64/boot/dts/aspeed/Makefileto add the compilation rule for micas-m2-w6950-128oc.dtbBackport reason: This is platform enablement support for the Micas M2-W6950-128OC BMC. Backporting to 202605 ensures the platform can boot properly and run with complete hardware description support on the 202605 SONiC release.
How I did it
Ported the corresponding device tree changes from the master branch to the 202605 kernel tree, with full alignment to the original submission. The changes enable the SONiC Linux kernel on 202605 branch to build the correct device tree binary (DTB) for the Micas M2-W6950-128OC BMC hardware, ensuring the platform boots correctly and exposes the expected hardware description to the kernel.
How to verify it
Applied the patch to the 202605 kernel tree, confirmed the expected new DTS/DTSI files and Makefile entries are present, and the target dtb can be compiled successfully. The device tree has been verified on Micas M2-W6950-128OC BMC hardware—kernel images built from the 202605 branch with these DTB files boot successfully and operate as expected on the target BMC.