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

Sync helios64 to its updated 6.9 dts #6707

Merged
merged 1 commit into from
Jun 9, 2024
Merged

Conversation

prahal
Copy link
Collaborator

@prahal prahal commented Jun 8, 2024

Description

Per Igor comment helios64 required work to sync with upstream changes.
I took the liberty to keep more of upstream than in Armbian 6.8, namely:

  • I kept nodes at their upstream location to remove unnecessary work when syncing to the upstream
  • keep "ethernet0 = &gmac;" in aliases, to let the ethernet MAC retrieved from OTP in u-boot apply. This will restore this feature (the u-boot was still functional). U-boot retried ethernet MACs are in u-boot printenv output "ethaddr" and "eth1addr". Seems for a few years I had the Linux kernel autogenerated one but my config still had the correct one commented (I did not find why it broke back then).
  • I removed the overclock disabling code as the overclock is not included in the dts so no need to disable it (will lower the sync to upstream burden)
  • kept upstream fix 93b36e1d3748c352a70c69aa378715e6572e51d1 "arm64: dts: rockchip: Fix USB interface compatible string on kobol-helios64"
  • from upstream in vcc3v0_sd node I kept "enable-active-high;" and "gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;"
  • sync to upstream from helios64::status to helios64:green:status for system_leds : status_led
  • kept startup-delay-us = <2000000> on hdd nodes from upstream (I believe they should not be the same value for rail a and b of the HDD, one should do as in the helios64 u-boot code where one is started after the other to lower the current load)
  • I also did not sync with upstream the differences of gpio pull config for "power > sdmmc0_pwr_h" and "pinctrl > pmic > pmic_int_l"
  • I kept the upstream DTS model "Kobol Helios64" instead of the armbian "Helios64". Ethernet rename from armbian-hardware-optimization works.

Documentation summary for feature / change

  • short restore ethernet MACs for eth0 read from OTP via u-boot
  • This will restore the original intent which is to have the eth0 mAC be defined from the mainboard. This might affect MAC-based DHCP definitions
  • ip l to get the Linux-defined eth0/end0 MAC, printenv in u-boot to see ethaddr and eth1addr for eth0/end0 and eth1

How Has This Been Tested?

  • Compile, installed, and reboot, checked assigned IP was from the dnsmasq dhcp-host definition for this ethernet MAC. Did a few other reboots.

Checklist:

  • [ x ] My code follows the style guidelines of this project
  • [ x ] I have performed a self-review of my own code
  • [ x ] My changes generate no new warnings

Also move most node in the same order as upstream to lower the work
required to sync.
@prahal prahal requested a review from igorpecovnik as a code owner June 8, 2024 13:44
@github-actions github-actions bot added size/large PR with 250 lines or more Hardware Hardware related like kernel, U-Boot, ... labels Jun 8, 2024
@igorpecovnik
Copy link
Member

Great job! Thank you.

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 08 Milestone: Third quarter release labels Jun 9, 2024
@igorpecovnik igorpecovnik merged commit cbaf67f into armbian:main Jun 9, 2024
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/large PR with 250 lines or more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants