Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

khadas-edge2: add vendor uboot to images #6741

Closed
wants to merge 3 commits into from

Conversation

efectn
Copy link
Member

@efectn efectn commented Jun 14, 2024

Description

Khadas Edge 2 images has been shipped without Uboot and it may cause some problems like not-booting when eMMC and SPI is empty. This PR adds vendor's uboot to Edge 2 images.
I've also added BL32 blob because the board doesn't boot when SPI has BL32 blobs and SD card doesn't have.

cc @rpardini @viraniac

How Has This Been Tested?

  • SPI + SD card
  • Empty SPI + SD card
  • SPI + eMMC
  • Empty SPI + eMMC

Checklist:

Please delete options that are not relevant.

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

@efectn efectn requested review from igorpecovnik and a team as code owners June 14, 2024 12:40
@github-actions github-actions bot added size/medium PR with more then 50 and less then 250 lines Hardware Hardware related like kernel, U-Boot, ... labels Jun 14, 2024
@ColorfulRhino
Copy link
Collaborator

You can also try adding mainline U-Boot 2024.07 which works very well with the generic rk3588 defconfig, no specialization for the baord needed :)

@ColorfulRhino
Copy link
Collaborator

I've also added BL32 blob because the board doesn't boot when SPI has BL32 blobs and SD card doesn't have.

Does BL32/optee have any other advantages in your opinion? I am about to reseach more about optee, what it does exactly, including its advantages, and if there's a way to build it from source and include it in mainline U-Boot.

@efectn
Copy link
Member Author

efectn commented Jun 14, 2024

I've also added BL32 blob because the board doesn't boot when SPI has BL32 blobs and SD card doesn't have.

Does BL32/optee have any other advantages in your opinion? I am about to reseach more about optee, what it does exactly, including its advantages, and if there's a way to build it from source and include it in mainline U-Boot.

I don't have an idea, as well. I've never used it any TEE client before

@efectn
Copy link
Member Author

efectn commented Jun 14, 2024

You can also try adding mainline U-Boot 2024.07 which works very well with the generic rk3588 defconfig, no specialization for the baord needed :)

Maybe it's better to do it in another PR since Khadas uboot has some additions on board and cmds like kbi.

@efectn
Copy link
Member Author

efectn commented Jun 16, 2024

I've just tested 4 cases and all works well. I think the PR is now ready to merge

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 08 Milestone: Third quarter release labels Jun 16, 2024
@ColorfulRhino
Copy link
Collaborator

ColorfulRhino commented Jun 17, 2024

This PR has a merge conflict.
I tried to solve it by checking out this PR, using git merge main, resolving the conflict, but then git push does not work (also git push armbian HEAD:refs/pull/6741/head does not work).

Usually I use rebase instead of merge, I wanted to try merge this time. But since it doesn't work, I'm not going to try harder, I don't want to accidentally destroy this PR 😅
Let me know how you solved it in the end :)

@igorpecovnik
Copy link
Member

I couldn't force commit to yours. Replace PR with those commits:
main...edge2-add-uboot

@efectn
Copy link
Member Author

efectn commented Jun 17, 2024

I couldn't force commit to yours. Replace PR with those commits: main...edge2-add-uboot

I'm not at the home ATM and won't be for a while can you create a new PR instead

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
08 Milestone: Third quarter release Hardware Hardware related like kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/medium PR with more then 50 and less then 250 lines
Development

Successfully merging this pull request may close these issues.

3 participants