Rockpis family

[brentr]

Description

Removed families for RockPI 3308 based boards (RockPI-S and Rock-S0)

GitHub issue reference:
#6904

Jira reference number [AR-9999]
Jira ticket: AR-2409

Documentation summary for feature / change

None needed -- Only changing internal config files.

How Has This Been Tested?

Built and tested new Current and Edge images for both effected boards.
(4 images in total)

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

[brentr]

@JohnTheCoolingFan: Thank you for correcting the base branch!

[Kwiboo]

You should probably also update U-Boot for Rock Pi S, since v2024.07 and u-boot/u-boot@3149925 SDNAND boot should work without use of loader images.

Recommend you to update to U-Boot v2024.10 for improved Rock Pi S v1.5 support and drop the use of sdnand loader.

[brentr]

@Kwiboo Thanks for that tip. Could you please add it as a new issue in Jira or a Git task?
It certainly is not part of this one.

[Kwiboo]

Could you please add it as a new issue in Jira or a Git task?

Sorry, this is something you will have to do, I am not an Armbian user, just wanted to let you know about the fixed upstream version.

[paolosabatino]

I opened the jira ticket for u-boot v2024.10: https://armbian.atlassian.net/browse/AR-2514

[paolosabatino]

I fail to see why boot-rock-s0.cmd has been renamed to boot-rockchip64-ttyS0.cmd.
It looks to me it has no references to the serial debug port, just received those $bootpart_distro upgrades.

You could have kept the original name or boot-rockpi-s.cmd if it requires specific customizations to boot a soc/board.

[brentr]

@paolosabatino
The reference in boot-rockchip64.cmd is here:

if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,1500000 ${consoleargs}"; fi

Note that ttyS2 is changed to ttyS0 in boot-rockchip64-ttyS0.cmd

Changing the file name from boot-rockpi-s.cmd seemed to make sense, as there is nothing rockpi-s specific in this file. It is just the standard boot script with the console redirected to ttyS0. It's currently used for the rockpi-s and rock-s0, but could just as well be used for any other rockchip64 based board.

Another reason for changing the name was to make clear that this boot script should be kept updated with any changes made to boot-rockchip64.cmd. It had been getting out of date.

The u-boot console on the RK3308 boards was moved to ttyS0 for two reasons:

1. The first stage boot console runs on ttyS0
2. ttyS2 is one of only two RK3308 serial ports that supports hardware RTS/CTS handshake, but hardware handshake is not appropriate for the Linux console port.
   Using ttyS2 on the Linux console makes that port unavailable for modems, etc. where RTS/CTS handshake may well be needed.

[brentr]

@paolosabatino
Thanks for creating the Jira request to update the u-boot.
I'd like to address that in a separate pull request -- not tack it on to this one, which is tested and ready to merge.
I'll follow up with the PR to update the boot loader next week. It sounds like a good idea if it can eliminate some of the special handling for the RK3308 boards.

[Tonymac32]

@paolosabatino The reference in boot-rockchip64.cmd is here:

if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,1500000 ${consoleargs}"; fi

I wonder if we could make this board config and remove the hard definition from the boot commands entirely...

Note that ttyS2 is changed to ttyS0 in boot-rockchip64-ttyS0.cmd

Changing the file name from boot-rockpi-s.cmd seemed to make sense, as there is nothing rockpi-s specific in this file. It is just the standard boot script with the console redirected to ttyS0. It's currently used for the rockpi-s and rock-s0, but could just as well be used for any other rockchip64 based board.

Another reason for changing the name was to make clear that this boot script should be kept updated with any changes made to boot-rockchip64.cmd. It had been getting out of date.

You're assuming a level of maturity and organization that I'm afraid you won't find here

The u-boot console on the RK3308 boards was moved to ttyS0 for two reasons:

1. The first stage boot console runs on ttyS0
2. ttyS2 is one of only two RK3308 serial ports that supports hardware RTS/CTS handshake, but hardware handshake is not appropriate for the Linux console port.
   Using ttyS2 on the Linux console makes that port unavailable for modems, etc. where RTS/CTS handshake may well be needed.
   Logical

I have no issues with this change. If I don't see anything to the contrary and no one else approves by tomorrow I'll give it a last look and approve.

[brentr]

Making consoleargs board config sounds like a great idea.
It could default to
consoleargs=ttyS2,1500000
if not overrriden by the specific rockchip64 board, so that most boards' configs would not need to change

I'll look into it -- for a new PR...

[paolosabatino]

@brentr thanks for pointing out the ttyS2/ttyS0 change; I admit I could have paid more attention...

more about the default console: isn't it possible to just add console=ttyS0,1500000 in /etc/armbianEnv.txt?
That configuration file is sourced by the uboot script as is, that parameter should just override the default.

I thought the main reason for the alternative bootscript presence was the limited amount of memory on those rk3308 devices and thus juggling with load addresses; but if the main reason is the default console, then armbianEnv.txt just does the trick.

By the way, moving to recent u-boot (>= v2024.07) would also solve any potential issues coming from load address because of the various fixes and proper relocation (see #6855 and #6731 for some past references)

edit: mmh, it looks that console argument is a bit more cumbersome... you should set it to something that does not evaluates to serial nor both nor display and then set consoleargs in armbianEnv.txt.

A small change that would be backward compatible would be to treat both, serial and display (perhaps none too?) as keywords for console argument; when console is set to anything else, it is assigned as is to consoleargs. Such way this would happen:

console=ttyS0,1500000  # console goes only to ttyS0
console=both  # console goes to display and default uart (ttyS2)
console=none # no console at all

[brentr]

@paolosabatino
The problem I see with interpreting the console env var as consoleargs is that, if it is set to "both", there's no way to override the consoleargs. I'd favor leaving the console env var interpretation unchanged, but providing a means to override consoleargs.

I'll be happy to investigate this for another PR. I really do think providing a means to override consoleargs in the board config and updating the u-boot for the RK3308 devices are both good ideas!
However...

This PR was intended to address the issues raised in its description. I rather not expand it. Could someone please review it in that context?

[paolosabatino]

Well it's pretty ok for me, just don't like the idea of having more pending files that will be forgotten there in the long run.

I approve this PR, then open a Jira ticket for some things I have noticed that can be enhanced on rockpi-s.
The consoleargs thing would require some more bit of discussion, because it has the potential to be an inter-family feature and consistence across the families would be a nice thing.

edit: BTW, just for the sake of knowledge, hacking armbianEnv with:

console=none
consoleargs=console=ttyS0,1500000

accomplishes the task with the regular rockchip64 bootscript