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

nanopi-r5s: bump blobs & u-boot enhancements for UMS/otg/bootorder #6833

Conversation

rpardini
Copy link
Member

@rpardini rpardini commented Jun 29, 2024

nanopi-r5s: bump blobs & u-boot enhancements for UMS/otg/bootorder

  • nanopi-r5s: make u-boot fancy (ums, rockusb, leds, tcp networking stuff)
    • use preboot to flash all leds for 100ms, then leave power LED on
  • nanopi-r5s: u-boot: 2024.04: boot order: usb -> sd -> nvme -> scsi -> emmc
  • nanopi-r5s: u-boot: 2024.04: usb otg in u-boot for working UMS/RockUSB

@github-actions github-actions bot added the size/medium PR with more then 50 and less then 250 lines label Jun 29, 2024
@github-actions github-actions bot added Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Jun 29, 2024
@rpardini rpardini requested a review from a team June 29, 2024 13:49
@rpardini rpardini marked this pull request as ready for review June 29, 2024 13:49
@rpardini rpardini self-assigned this Jun 29, 2024
@ColorfulRhino
Copy link
Collaborator

ColorfulRhino commented Jun 29, 2024

Nice!
This will clash with #6822 though.

I think we can integrate ROCKUSB_BLOB into rockchip64.conf instead of having it on each board separately, what do you think?

@ColorfulRhino
Copy link
Collaborator

By the way, I have just realized that MINILOADER_BLOB is the same as ROCKUSB_BLOB (at least very likely), for some reason two varibales were introduced 😄

@rpardini
Copy link
Member Author

Nice! This will clash with #6822 though.

That one is more significant, merge that and I shall rebase/adapt to it.

I think we can integrate ROCKUSB_BLOB into rockchip64.conf instead of having it on each board separately, what do you think?

Yep. I shall remove from this board and use the common one.

@rpardini
Copy link
Member Author

By the way, I have just realized that MINILOADER_BLOB is the same as ROCKUSB_BLOB (at least very likely), for some reason two varibales were introduced 😄

The nomenclature-crazy is caused by Rockchip. Seems like the "miniloader" is what the spl_loader is called when used on Windows?

@rpardini rpardini force-pushed the pr/nanopi-r5s-bump-blobs--u-boot-enhancements-for-UMSotgbootorder branch from d34921d to 7b63ad6 Compare June 29, 2024 16:45
@ColorfulRhino
Copy link
Collaborator

By the way, I have just realized that MINILOADER_BLOB is the same as ROCKUSB_BLOB (at least very likely), for some reason two varibales were introduced 😄

The nomenclature-crazy is caused by Rockchip. Seems like the "miniloader" is what the spl_loader is called when used on Windows?

Miniloader is I think what Rockchip calls their loader. At least the devtools always coome with a MINILOADERALL.bin
Probably someone just chose this name at some point and that's how it is today :)

Maybe we can rename ROCKUSB_BLOB to MINILOADER_BLOB or the other way around at some point.

@rpardini
Copy link
Member Author

Maybe we can rename ROCKUSB_BLOB to MINILOADER_BLOB or the other way around at some point.

Hmm. grep for MINILOADER_BLOB -- you'll see this is related to BOOT_SCENARIO=only-blobs, used by a few boards I don't have. There's some lost history there, but it looks to me this is unrelated to Maskrom/Loader mode/RockUSB.

@rpardini rpardini force-pushed the pr/nanopi-r5s-bump-blobs--u-boot-enhancements-for-UMSotgbootorder branch from 7b63ad6 to 580d377 Compare June 30, 2024 07:50
@rpardini
Copy link
Member Author

Reworked after #6822 landed, thanks @ColorfulRhino

@igorpecovnik igorpecovnik added 08 Milestone: Third quarter release Needs review Seeking for review labels Jun 30, 2024
@rpardini rpardini force-pushed the pr/nanopi-r5s-bump-blobs--u-boot-enhancements-for-UMSotgbootorder branch from 580d377 to 15119bf Compare June 30, 2024 14:53
@rpardini rpardini force-pushed the pr/nanopi-r5s-bump-blobs--u-boot-enhancements-for-UMSotgbootorder branch from 15119bf to 38cda82 Compare July 1, 2024 22:23
@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge and removed Needs review Seeking for review labels Jul 2, 2024
@igorpecovnik igorpecovnik merged commit f5c0ec9 into armbian:main Jul 2, 2024
9 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, ... Patches Patches related to 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