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

fix firefly itx3588j u-boot patches not applied #7063

Merged
merged 1 commit into from
Aug 13, 2024

Conversation

SeeleVolleri
Copy link
Contributor

Description

Moved patch from uboot 35xx to uboot 3588 In order to patch.
At before, the patch has not been patched.

How Has This Been Tested?

  • ./compile.sh build ARTIFACT_IGNORE_CACHE=yes BOARD=firefly-itx-3588j BRANCH=vendor BUILD_DESKTOP=yes BUILD_MINIMAL=no DESKTOP_ENVIRONMENT=gnome DESKTOP_ENVIRONMENT_CONFIG_NAME=config_base KERNEL_CONFIGURE=no RELEASE=bookworm
  • observed successful patch to uboot w/o error
  • u-boot said Starting Kernel ...

Checklist:

  • 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

@github-actions github-actions bot added the size/small PR with less then 50 lines label Aug 11, 2024
@SeeleVolleri SeeleVolleri changed the title Firefly itx3588j u-boot patches not applied fix firefly itx3588j u-boot patches not applied Aug 11, 2024
@github-actions github-actions bot added the Hardware Hardware related like kernel, U-Boot, ... label Aug 11, 2024
@SeeleVolleri
Copy link
Contributor Author

Hold on let me squash the commit......

@github-actions github-actions bot added the Patches Patches related to kernel, U-Boot, ... label Aug 11, 2024
@SeeleVolleri
Copy link
Contributor Author

done

@amazingfate
Copy link
Contributor

I was wondering why there is still patch in radxa-rk3588 since we have moved to rk35xx. This patch was added after our switch.

@SeeleVolleri
Copy link
Contributor Author

I just random build and find the problem

@SeeleVolleri
Copy link
Contributor Author

about 1 month before, it can patch automaticlly, but not yesterday's build, so I found out possible 3588 and 35xx naming issue, I tried and worked

@amazingfate
Copy link
Contributor

After this commit, u-boot-radxa-rk3588 is dropped.
I checkout your commit and build uboot for the board, your patch is not applied: https://paste.armbian.com/givijivuri
You should have not tested ater rebasing with commit 4573778 merged.
This pr #6867 was created after #6849, but it was merged ealier and broken the later commit after rebasing.

@SeeleVolleri
Copy link
Contributor Author

I'm sorry, I don't fully understand.
I build using docker can successful patch it, using SeeleVolleri/firefly which is only 1 commit ahead, and using the ./compile script.
https://paste.armbian.com/ozixelelej

@SeeleVolleri
Copy link
Contributor Author

probably git messed up, give me some time try re-clone the repo and recommit

@SeeleVolleri
Copy link
Contributor Author

No, git did not messed up. I was tried using git clone ssh://git@github.com/armbian/build and mv patch/u-boot/legacy/u-boot-radxa-rk3588/board_firefly-itx-3588j patch/u-boot/legacy/u-boot-radxa-rk35xx/ -v
https://paste.armbian.com/yedesazuro

@amazingfate
Copy link
Contributor

I'm talking about history commit #6849. Your fix is fine.

@igorpecovnik igorpecovnik added 08 Milestone: Third quarter release Needs review Seeking for review labels Aug 12, 2024
@igorpecovnik igorpecovnik added the Ready to merge Reviewed, tested and ready for merge label Aug 13, 2024
@igorpecovnik igorpecovnik merged commit cecf6a8 into armbian:main Aug 13, 2024
13 checks passed
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, ... Needs review Seeking for review Patches Patches related to kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/small PR with less then 50 lines
Development

Successfully merging this pull request may close these issues.

3 participants