Skip to content

Flashrom refactoring for broadcom platforms#7693

Merged
jleveque merged 3 commits intosonic-net:masterfrom
santhosh-kt:flashrom-ref
Jun 22, 2021
Merged

Flashrom refactoring for broadcom platforms#7693
jleveque merged 3 commits intosonic-net:masterfrom
santhosh-kt:flashrom-ref

Conversation

@santhosh-kt
Copy link
Copy Markdown
Contributor

@santhosh-kt santhosh-kt commented May 24, 2021

Why I did it

  • To build flashrom properly with dependency tracking.

How I did it

  • Moved flashrom code from platform/broadcom/sonic-platform-modules-dell/tools directory to src/flashrom directory.
  • At the end, flashrom_0.9.7_amd64.deb package is build which will be installed in the devices.
  • Currently flashrom builds only for Dell S6100 platforms.

How to verify it

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

  • 201811
  • 201911
  • 202006
  • 202012

Description for the changelog

On branch flashrom-ref
Changes to be committed:
(use "git reset HEAD ..." to unstage)

    modified:   build_debian.sh
    modified:   platform/broadcom/platform-modules-dell.mk
    modified:   platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install
    deleted:    platform/broadcom/sonic-platform-modules-dell/tools/flashrom.sh
    new file:   rules/flashrom.dep
    new file:   rules/flashrom.mk
    new file:   src/flashrom/Makefile
    renamed:    platform/broadcom/sonic-platform-modules-dell/tools/0002-Flashrom-support-for-Intel-Rangeley-and-Denverton-CP.patch -> src/flashrom/patch/0002-Flashrom-support-for-Intel-Rangeley-and-Denverton-CP.patch
    new file:   src/flashrom/patch/0003-Debian-package-base.patch
    new file:   src/flashrom/patch/0004-Flashrom-remove-tmpl.patch
    new file:   src/flashrom/patch/series

Please dont approve the changes till the build for all arch gets success.

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

jleveque
jleveque previously approved these changes May 28, 2021
@santhosh-kt
Copy link
Copy Markdown
Contributor Author

On checking the build artifact, flashrom deb package was not included in the broadcom.bin image(Must be an issue with local build which already generated flashrom deb package).
Updated the commit changes,
Local build completed successful in both broadcom and marvell-armhf images.
Will do another sanity check with the generating build artifact before code merge.

@santhosh-kt
Copy link
Copy Markdown
Contributor Author

Building is blocked because previous build iteration didnt generate target/debs/buster/flashrom_*.deb package.
Is there any way to re-run the build cleanly?

@santhosh-kt santhosh-kt changed the title Flashrom refactoring for amd64 platforms Flashrom refactoring for broadcom platforms Jun 1, 2021
@jleveque
Copy link
Copy Markdown
Contributor

jleveque commented Jun 1, 2021

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@jleveque
Copy link
Copy Markdown
Contributor

jleveque commented Jun 1, 2021

@qiluo-msft, @xumia: Can you please review, also?

@jleveque jleveque merged commit f8eb5b0 into sonic-net:master Jun 22, 2021
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
#### Why I did it
- To build flashrom properly with dependency tracking.

#### How I did it
- Moved flashrom code from platform/broadcom/sonic-platform-modules-dell/tools directory to src/flashrom directory.
- At the end, flashrom_0.9.7_amd64.deb package is build which will be installed in the devices.
- Currently flashrom builds only for Dell S6100 platforms.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants