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

Bump rk322x-box and rk3318-box to u-boot v2024.07-rc5 #6855

Merged
merged 2 commits into from
Jul 2, 2024

Conversation

paolosabatino
Copy link
Contributor

@paolosabatino paolosabatino commented Jul 1, 2024

Description

Move tv-box based rk3318-box and rk322x-box target to use u-boot v2024.07-rc5 from v2024.01, mostly for experimentation and also because v2024.07 contains some fixes for rockchip devices explained in this previous PR: #6731, in particular we can leverage uboot relocation for rockchip 64 bit devices and rk3328 hdmi/vop/phy drivers are now mainlined.

This PR also rework hdmi/vop/phy patches for rk322x and fixes usb issues on rk3318-box

The changes does not affect any other board, since none of them actually use v2024.07 of uboot (at the moment of writing the comment, it is still in RC5). The changes should not affect other bords. As @ColorfulRhino noted in the comments, there already are some boards which use v2024.07, but there is no patch directory since those boards work without patches. The v2024.07 patch directory has been prepared though and it is ready for others to jump in, if necessary.

GitHub issue reference:
Jira reference number AR-2400

How Has This Been Tested?

  • Various tests on rk322x-box system, including boot from sdcard, boot from emmc and checks about the expected boot order (sdcard -> usb -> emmc)
  • Same as above on rk3318-box system

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

@paolosabatino paolosabatino requested a review from a team July 1, 2024 15:23
@github-actions github-actions bot added size/large PR with 250 lines or more Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Jul 1, 2024
@ColorfulRhino
Copy link
Collaborator

Looks good to me!

The changes does not affect any other board, since none of them actually use v2024.07 of uboot (at the moment of writing the comment, it is still in RC5). The v2024.07 patch directory has been prepared though and it is ready for others to jump in.

There a some boards that use 2024.07 https://github.com/search?q=repo%3Aarmbian%2Fbuild%202024.07&type=code
but so far no patches were necessary 😄 I've been using 2024.07 for a whole while now and haven't had any issues :)

@ColorfulRhino
Copy link
Collaborator

Btw we implemented a woraround for rk3288 2022.04: 792d9d9

If this can also be bumped, we should remember to remove the workaround as well :)

Just as a headsup, I don't know how rk3318, rk322x and rk3288 are different.

@paolosabatino
Copy link
Contributor Author

There a some boards that use 2024.07 https://github.com/search?q=repo%3Aarmbian%2Fbuild%202024.07&type=code
but so far no patches were necessary 😄 I've been using 2024.07 for a whole while now and haven't had any issues :)

Ah, wasn't aware of that. I thought that, since the v2024.07 directory was missing, there were no targets using such version.
I wonder though why the bootpatchdir often pinpoints to the (non-existent) board patches directory and does not just point to the base v2024.07 directory. 🤔

I fix the wording in the description, since it is not accurate.

@paolosabatino
Copy link
Contributor Author

Btw we implemented a woraround for rk3288 2022.04: 792d9d9

If this can also be bumped, we should remember to remove the workaround as well :)

Just as a headsup, I don't know how rk3318, rk322x and rk3288 are different.

I can take a look to move rk3288 (Asus Tinkerboard mainly) to v2024.07 as well. I hope the usb mass storage patches apply though, since rebasing them could take a bit of time.

@ColorfulRhino
Copy link
Collaborator

I thought that, since the v2024.07 directory was missing, there were no targets using such version.

For all the newer Rockchips, this version works like a charm without any patches, it's great :D
I wonder why rk33xx needs quite a few patches in comparison since it's not that new anymore compared to rk35xx, maybe just noone bothered to mainline those fixes/changes?

I wonder though why the bootpatchdir often pinpoints to the (non-existent) board patches directory and does not just point to the base v2024.07 directory. 🤔

Maybe this was also me, not fully understanding the impact? 😶😂
I assume bootpatchdir=v2024.07 will use all patches indide the main dir and of all subdirs, while bootpatchdir=v2024.07/board_$BOARD will only use the patches inside this board specific dir?


Another topic: Would you mind renaming the patches from the old to the new u-boot version instead of duplicating them?
My plan is soon to go through the u-boot patch dirs and remove duplicated/old stuff like already done in the kernel patch dirs 😄 Let me know if that's not a good idea.

@ColorfulRhino
Copy link
Collaborator

I can take a look to move rk3288 (Asus Tinkerboard mainly) to v2024.07 as well. I hope the usb mass storage patches apply though, since rebasing them could take a bit of time.

Sure! If 2024.07 doesn't work out of the box, maybe 2024.01 or 2023.10 does, that would also be an upgrade.

@paolosabatino
Copy link
Contributor Author

For all the newer Rockchips, this version works like a charm without any patches, it's great :D I wonder why rk33xx needs quite a few patches in comparison since it's not that new anymore compared to rk35xx, maybe just noone bothered to mainline those fixes/changes?

Sometimes I need to alter the generic behaviour, for example the sdcard -> usb -> emmc boot order, but usually I need a customized device tree and other goodies that are not yet mainlined.

I wonder though why the bootpatchdir often pinpoints to the (non-existent) board patches directory and does not just point to the base v2024.07 directory. 🤔

Maybe this was also me, not fully understanding the impact? 😶😂 I assume bootpatchdir=v2024.07 will use all patches indide the main dir and of all subdirs, while bootpatchdir=v2024.07/board_$BOARD will only use the patches inside this board specific dir?

Nope, it should be that bootpatchdir=v2024.07 will use all the patches in that directory plus those within v2024.07/board_$BOARD directory by default.

Another topic: Would you mind renaming the patches from the old to the new u-boot version instead of duplicating them? My plan is soon to go through the u-boot patch dirs and remove duplicated/old stuff like already done in the kernel patch dirs 😄 Let me know if that's not a good idea.

I could remove them as well, no problem

@ColorfulRhino
Copy link
Collaborator

ColorfulRhino commented Jul 2, 2024

Sometimes I need to alter the generic behaviour, for example the sdcard -> usb -> emmc boot order, but usually I need a customized device tree and other goodies that are not yet mainlined.

Makes sense!

Nope, it should be that bootpatchdir=v2024.07 will use all the patches in that directory plus those within v2024.07/board_$BOARD directory by default.

Ah, this I didn't know. I never stumpled over the code that did this or anything else about this. Now I know!

I could remove them as well, no problem

Awesome! Muchos gracias :)

@paolosabatino
Copy link
Contributor Author

Awesome! Muchos gracias :)

Old v2022.04 and v2024.01 patches removed

@ColorfulRhino
Copy link
Collaborator

ColorfulRhino commented Jul 2, 2024

Old v2022.04 and v2024.01 patches removed

Lovely, thanks a lot! Would you mind if I squash the two commits together to allow Git to recognize it as a rename? From my understanding, renaming (by doing it in one commit) enables better tracking of changes in Git history/archeology. Please correct me if I'm mistaken. it's also totally fine if you prefer otherwise :)

 * leverage uboot relocation for rk3328
 * rework hdmi/vop patches
 * fix some usb issues on rk3318-box
@paolosabatino
Copy link
Contributor Author

@ColorfulRhino no problem in squashing for me, go ahead as you wish

@ColorfulRhino ColorfulRhino merged commit 7876017 into armbian:main Jul 2, 2024
7 checks passed
@paolosabatino paolosabatino deleted the rk3318-uboot-v2024.07 branch July 4, 2024 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... size/large PR with 250 lines or more
Development

Successfully merging this pull request may close these issues.

3 participants