Skip to content

[marvell-prestera] add Nokia support on trixie#44

Merged
saiarcot895 merged 6 commits intosaiarcot895:trixiefrom
yanmarkman:trixie
Oct 28, 2025
Merged

[marvell-prestera] add Nokia support on trixie#44
saiarcot895 merged 6 commits intosaiarcot895:trixiefrom
yanmarkman:trixie

Conversation

@yanmarkman
Copy link
Copy Markdown

Why I did it

Trixie build need changes in debian/rules, marvell platform, devices and .C source code

How I did it

Adjust rules, platform and devices, C-source code to Trixie.
Check the correct run-time working on Nokia board.

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106

Description for the changelog

A picture of a cute animal (not mandatory but encouraged)

yanmarkman and others added 6 commits October 22, 2025 09:38
device/marvell-prestera update required for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>
Signed-off-by: Yan Markman <ymarkman@marvell.com>
Signed-off-by: Yan Markman <ymarkman@marvell.com>
Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
Why I did it
AC5P-RD (arm64-marvell_rd98DX45xx_cn9131-r0) may have
disk scsi or mmcblk, but only scsi is handled.
On the "sonic-installer install" action the blk_dev is empty
instead of "blk_dev=/dev/mmcblk0"
leading to wrong Uboot env parameters
  sonic_boot_load= ... mmc 0: ...
  sonic_boot_load_old= ... mmc 0: ...
instead of correct "mmc 0:2"
The further reboot fails with
  Wrong Image Format for bootm command
  ERROR: can't get kernel image!

How I did it
Add mmc_bus="mmc0:0001" and use in get_install_device()
as last default.

How to test
sonic-installer install sonic-marvell-prestera-arm64.bin; reboot

Signed-off-by: Yan Markman <ymarkman@marvell.com>
NOKIA board 7215-a1
Adjust debian/rules and Kernel-module source for TRIXIE

Signed-off-by: Yan Markman <ymarkman@marvell.com>
@saiarcot895 saiarcot895 merged commit e61886e into saiarcot895:trixie Oct 28, 2025
saiarcot895 pushed a commit that referenced this pull request Nov 4, 2025
* device [marvell] marvell-prestera for trixie

device/marvell-prestera update required for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform submod [marvell] mrvl-prestera for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform submod [marvell] sonic-platform-marvell for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform [marvell] prestera - support AC5P-RD

Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>

* platform [marvell] prestera boot distinct mmcblk vs scsi

Why I did it
AC5P-RD (arm64-marvell_rd98DX45xx_cn9131-r0) may have
disk scsi or mmcblk, but only scsi is handled.
On the "sonic-installer install" action the blk_dev is empty
instead of "blk_dev=/dev/mmcblk0"
leading to wrong Uboot env parameters
  sonic_boot_load= ... mmc 0: ...
  sonic_boot_load_old= ... mmc 0: ...
instead of correct "mmc 0:2"
The further reboot fails with
  Wrong Image Format for bootm command
  ERROR: can't get kernel image!

How I did it
Add mmc_bus="mmc0:0001" and use in get_install_device()
as last default.

How to test
sonic-installer install sonic-marvell-prestera-arm64.bin; reboot

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform [marvell-prestera][nokia] debian/rules and 7215-a1 for trixie

NOKIA board 7215-a1
Adjust debian/rules and Kernel-module source for TRIXIE

Signed-off-by: Yan Markman <ymarkman@marvell.com>

---------

Signed-off-by: Yan Markman <ymarkman@marvell.com>
Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
Co-authored-by: Pavan Naregundi <pnaregundi@marvell.com>
saiarcot895 pushed a commit that referenced this pull request Nov 17, 2025
* device [marvell] marvell-prestera for trixie

device/marvell-prestera update required for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform submod [marvell] mrvl-prestera for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform submod [marvell] sonic-platform-marvell for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform [marvell] prestera - support AC5P-RD

Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>

* platform [marvell] prestera boot distinct mmcblk vs scsi

Why I did it
AC5P-RD (arm64-marvell_rd98DX45xx_cn9131-r0) may have
disk scsi or mmcblk, but only scsi is handled.
On the "sonic-installer install" action the blk_dev is empty
instead of "blk_dev=/dev/mmcblk0"
leading to wrong Uboot env parameters
  sonic_boot_load= ... mmc 0: ...
  sonic_boot_load_old= ... mmc 0: ...
instead of correct "mmc 0:2"
The further reboot fails with
  Wrong Image Format for bootm command
  ERROR: can't get kernel image!

How I did it
Add mmc_bus="mmc0:0001" and use in get_install_device()
as last default.

How to test
sonic-installer install sonic-marvell-prestera-arm64.bin; reboot

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform [marvell-prestera][nokia] debian/rules and 7215-a1 for trixie

NOKIA board 7215-a1
Adjust debian/rules and Kernel-module source for TRIXIE

Signed-off-by: Yan Markman <ymarkman@marvell.com>

---------

Signed-off-by: Yan Markman <ymarkman@marvell.com>
Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
Co-authored-by: Pavan Naregundi <pnaregundi@marvell.com>
saiarcot895 pushed a commit that referenced this pull request Nov 23, 2025
* device [marvell] marvell-prestera for trixie

device/marvell-prestera update required for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform submod [marvell] mrvl-prestera for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform submod [marvell] sonic-platform-marvell for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform [marvell] prestera - support AC5P-RD

Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>

* platform [marvell] prestera boot distinct mmcblk vs scsi

Why I did it
AC5P-RD (arm64-marvell_rd98DX45xx_cn9131-r0) may have
disk scsi or mmcblk, but only scsi is handled.
On the "sonic-installer install" action the blk_dev is empty
instead of "blk_dev=/dev/mmcblk0"
leading to wrong Uboot env parameters
  sonic_boot_load= ... mmc 0: ...
  sonic_boot_load_old= ... mmc 0: ...
instead of correct "mmc 0:2"
The further reboot fails with
  Wrong Image Format for bootm command
  ERROR: can't get kernel image!

How I did it
Add mmc_bus="mmc0:0001" and use in get_install_device()
as last default.

How to test
sonic-installer install sonic-marvell-prestera-arm64.bin; reboot

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform [marvell-prestera][nokia] debian/rules and 7215-a1 for trixie

NOKIA board 7215-a1
Adjust debian/rules and Kernel-module source for TRIXIE

Signed-off-by: Yan Markman <ymarkman@marvell.com>

---------

Signed-off-by: Yan Markman <ymarkman@marvell.com>
Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
Co-authored-by: Pavan Naregundi <pnaregundi@marvell.com>
saiarcot895 pushed a commit that referenced this pull request Nov 26, 2025
* device [marvell] marvell-prestera for trixie

device/marvell-prestera update required for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform submod [marvell] mrvl-prestera for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform submod [marvell] sonic-platform-marvell for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform [marvell] prestera - support AC5P-RD

Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>

* platform [marvell] prestera boot distinct mmcblk vs scsi

Why I did it
AC5P-RD (arm64-marvell_rd98DX45xx_cn9131-r0) may have
disk scsi or mmcblk, but only scsi is handled.
On the "sonic-installer install" action the blk_dev is empty
instead of "blk_dev=/dev/mmcblk0"
leading to wrong Uboot env parameters
  sonic_boot_load= ... mmc 0: ...
  sonic_boot_load_old= ... mmc 0: ...
instead of correct "mmc 0:2"
The further reboot fails with
  Wrong Image Format for bootm command
  ERROR: can't get kernel image!

How I did it
Add mmc_bus="mmc0:0001" and use in get_install_device()
as last default.

How to test
sonic-installer install sonic-marvell-prestera-arm64.bin; reboot

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform [marvell-prestera][nokia] debian/rules and 7215-a1 for trixie

NOKIA board 7215-a1
Adjust debian/rules and Kernel-module source for TRIXIE

Signed-off-by: Yan Markman <ymarkman@marvell.com>

---------

Signed-off-by: Yan Markman <ymarkman@marvell.com>
Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
Co-authored-by: Pavan Naregundi <pnaregundi@marvell.com>
saiarcot895 pushed a commit that referenced this pull request Nov 30, 2025
* device [marvell] marvell-prestera for trixie

device/marvell-prestera update required for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform submod [marvell] mrvl-prestera for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform submod [marvell] sonic-platform-marvell for trixie

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform [marvell] prestera - support AC5P-RD

Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>

* platform [marvell] prestera boot distinct mmcblk vs scsi

Why I did it
AC5P-RD (arm64-marvell_rd98DX45xx_cn9131-r0) may have
disk scsi or mmcblk, but only scsi is handled.
On the "sonic-installer install" action the blk_dev is empty
instead of "blk_dev=/dev/mmcblk0"
leading to wrong Uboot env parameters
  sonic_boot_load= ... mmc 0: ...
  sonic_boot_load_old= ... mmc 0: ...
instead of correct "mmc 0:2"
The further reboot fails with
  Wrong Image Format for bootm command
  ERROR: can't get kernel image!

How I did it
Add mmc_bus="mmc0:0001" and use in get_install_device()
as last default.

How to test
sonic-installer install sonic-marvell-prestera-arm64.bin; reboot

Signed-off-by: Yan Markman <ymarkman@marvell.com>

* platform [marvell-prestera][nokia] debian/rules and 7215-a1 for trixie

NOKIA board 7215-a1
Adjust debian/rules and Kernel-module source for TRIXIE

Signed-off-by: Yan Markman <ymarkman@marvell.com>

---------

Signed-off-by: Yan Markman <ymarkman@marvell.com>
Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
Co-authored-by: Pavan Naregundi <pnaregundi@marvell.com>
@yanmarkman yanmarkman deleted the trixie branch December 24, 2025 12:25
saiarcot895 pushed a commit that referenced this pull request Mar 25, 2026
How I did it
562f89b (HEAD -> main, origin/main, origin/HEAD) [H6-128] Change HWSKU name and remove port I2C clock setting (#44)
1babc9b [H6-64] Update thermal algo, FW upgrade, PSU modules (#43)
d742aeb [H6-128] Add support for H6-128 Platform (#42)
f2dbdd7 Fix the UnboundLocalError to address thermalctld stacktrace
54e453a Add _cpm_firmware_upgrade_reboot_IMMs method
908d62a Fix the Unable_to_reach_CPM reboot-cause show issue

Signed-off-by: y7zhou <yi.1.zhou@nokia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants