Board: Add Mekotronics R58S2

[HeyMeco]

Description

This PR adds support for the Mekotronics R58S2 with mainline u-boot 2026.04 and the vendor kernel 6.1.
Legacy u-boot is tested and included but disabled.

How Has This Been Tested?

• Boot into Debian 13 Trixie with Desktop Gnome
• Connect to WiFi and list Bluetooth devices
  • iPerf3: WiFi 5Ghz: 140 Mbps download / 40 Mbps upload
• Extension: mesa-vpu -> Working GPU
• HDMI
• Both USB-A ports
• Ethernet
• Audio via HDMI

Dependent changes

• arm64: dts: rockchip: add Mekotronics R58S2 linux-rockchip#461

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

---

Note

Use squash merge option for this PR

Summary by CodeRabbit

• New Features
  • Added support for the Mekotronics R58S2 board with complete hardware and bootloader configuration, enabling use on Rockchip RK3588S systems.

[coderabbitai]

📝 Walkthrough

Walkthrough

Introduces board support for the Mekotronics R58S2 Rockchip RK3588S-based system through a primary board configuration file and corresponding U-Boot build configurations and device tree files for multiple firmware versions.

Changes

Cohort / File(s)	Summary
Board Configuration config/boards/mekotronics-r58s2.conf	Adds board metadata (name, vendor, family, maintainer), kernel and boot settings, and board-specific post-configuration functions for audio device renaming, bcmdhd firmware/NVRAM setup, mainline u-boot parameters, and rockchip boot order patching.
U-Boot Legacy Branch patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58s2-rk3588_defconfig, patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588s-blueberry-rp01a.dts	Enables Rockchip RK3588 SPL, FIT imaging, storage, networking, and USB subsystems in defconfig; adds device tree with GPIO-driven heartbeat LED and HS400-capable eMMC controller configuration for Blueberry variant.
U-Boot v2026.04 Branch patch/u-boot/v2026.04/defconfig/mekotronics-r58s2-rk3588s_defconfig, patch/u-boot/v2026.04/dt_upstream_rockchip/rk3588s-mekotronics-r58s2.dts	Configures u-boot build features (SPL, FIT, ATF, commands, hardware drivers) in defconfig; adds device tree with board identifiers, GPIO LED, HS400 eMMC, USB gadget mode, and multiple hardware block enablement via phandle references.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Poem

🐰 Hops with glee across the configs bright,
New board support—the R58S2 takes flight!
Device trees dancing, defconfigs aligned,
Rockchip RK3588 to hardware bind! ✨

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly summarizes the main objective of adding support for the Mekotronics R58S2 board, which aligns with the PR's primary purpose.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

Actionable comments posted: 1

🧹 Nitpick comments (2)

config/boards/mekotronics-r58s2.conf (2)

68-73: Fail when the boot-order rewrite stops matching.

Line 71's sed -i still exits successfully on a no-op. If include/configs/rockchip-common.h changes upstream, the build will silently keep the default boot order. Add a post-check and abort when the replacement was not applied.

🧪 Suggested hardening

 	sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
+	grep -qxF "#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"" include/configs/rockchip-common.h || \
+		exit_with_error "Failed to patch BOOT_TARGETS in include/configs/rockchip-common.h"
 	regular_git diff -u include/configs/rockchip-common.h || true
 }

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@config/boards/mekotronics-r58s2.conf` around lines 68 - 73, The sed
replacement in
pre_config_uboot_target__meko_r58s2_patch_rockchip_common_boot_order can be a
no-op and still exit zero, so add a post-check to verify the intended change was
applied to include/configs/rockchip-common.h and abort the build if not; after
running the existing sed -i ... command and regular_git diff, search the file
for the expected `#define` BOOT_TARGETS line matching the value of
rockchip_uboot_targets and call an error/exit path (e.g., display_alert + exit
non-zero) from within
pre_config_uboot_target__meko_r58s2_patch_rockchip_common_boot_order if the
verification fails so upstream format changes won’t silently keep the default
boot order.

---

60-64: Remove the private write_uboot_platform() copy.

config/sources/families/include/rockchip64_common.inc:285-305 already writes u-boot-rockchip.bin with the same bs=32k seek=1 parameters. Keeping a board-local clone means family-side fixes to the Rockchip write path won't reach this board.

♻️ Suggested cleanup

 	declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
-	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
-
-	function write_uboot_platform() {
-		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
-	}
+	unset uboot_custom_postprocess
 
 }

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@config/boards/mekotronics-r58s2.conf` around lines 60 - 64, Remove the
board-local override of the Rockchip U-Boot write routine so the family
implementation is used: delete the private write_boot_platform() function
definition in this file (the function that calls dd "if=$1/u-boot-rockchip.bin"
"of=$2" bs=32k seek=1 ...) and also remove the preceding unset line that
re-declares/overrides write_uboot_platform, leaving the family-provided
write_uboot_platform (from rockchip64_common.inc) to handle the write path.

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@patch/u-boot/v2026.04/dt_upstream_rockchip/rk3588s-mekotronics-r58s2.dts`:
- Around line 29-33: The device tree node labeled green_led: green-led is
exposed only as "green-led" but the defconfig uses 'led STATUS ...', so add a
matching label/alias so the preboot blink can find it; update the green_led:
green-led node to include label = "STATUS"; or alternatively add an /aliases
entry (e.g., led-status = &green_led;) pointing to &green_led so the LED is
exposed as STATUS.

---

Nitpick comments:
In `@config/boards/mekotronics-r58s2.conf`:
- Around line 68-73: The sed replacement in
pre_config_uboot_target__meko_r58s2_patch_rockchip_common_boot_order can be a
no-op and still exit zero, so add a post-check to verify the intended change was
applied to include/configs/rockchip-common.h and abort the build if not; after
running the existing sed -i ... command and regular_git diff, search the file
for the expected `#define` BOOT_TARGETS line matching the value of
rockchip_uboot_targets and call an error/exit path (e.g., display_alert + exit
non-zero) from within
pre_config_uboot_target__meko_r58s2_patch_rockchip_common_boot_order if the
verification fails so upstream format changes won’t silently keep the default
boot order.
- Around line 60-64: Remove the board-local override of the Rockchip U-Boot
write routine so the family implementation is used: delete the private
write_boot_platform() function definition in this file (the function that calls
dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 ...) and also remove the
preceding unset line that re-declares/overrides write_uboot_platform, leaving
the family-provided write_uboot_platform (from rockchip64_common.inc) to handle
the write path.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 408f1850-7a33-496b-83d5-97bbcaf001e6

📥 Commits

Reviewing files that changed from the base of the PR and between b993528 and 7a4cb7b.

📒 Files selected for processing (5)

• config/boards/mekotronics-r58s2.conf
• patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58s2-rk3588_defconfig
• patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588s-blueberry-rp01a.dts
• patch/u-boot/v2026.04/defconfig/mekotronics-r58s2-rk3588s_defconfig
• patch/u-boot/v2026.04/dt_upstream_rockchip/rk3588s-mekotronics-r58s2.dts

[coderabbitai]

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@config/boards/mekotronics-r58s2.conf`:
- Line 9: The BOOT_FDT_FILE variable is hardcoded to
"rockchip/rk3588s-blueberry-rp01a-v10.dtb" which can point builds at a DTB not
present in the downstream kernel; either wait until armbian/linux-rockchip#461
is merged/published before landing this board or change the board config to pin
it to a kernel ref that already contains that DTB (do this by updating the
BOOT_FDT_FILE assignment in the board config or by switching the board's kernel
ref to a commit/tag that ships the DTB), ensuring builds only reference DTBs
that exist in the targeted kernel tree.

In `@patch/u-boot/v2026.04/defconfig/mekotronics-r58s2-rk3588s_defconfig`:
- Line 27: CONFIG_PREBOOT currently uses the non-existent LED identifier
"STATUS"; update the preboot sequence to use the actual registered LED node name
"green-led" (or add a label property in the DTS and use that label) so the
U-Boot "led" command can find it — modify the CONFIG_PREBOOT value that
references "led STATUS" to reference "led green-led" (or ensure the DTS LED node
has label "STATUS" if you prefer the original name).

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 9052a225-ae0a-4037-9424-e7094fe95ee6

📥 Commits

Reviewing files that changed from the base of the PR and between b993528 and 7a4cb7b.

📒 Files selected for processing (5)

• config/boards/mekotronics-r58s2.conf
• patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58s2-rk3588_defconfig
• patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588s-blueberry-rp01a.dts
• patch/u-boot/v2026.04/defconfig/mekotronics-r58s2-rk3588s_defconfig
• patch/u-boot/v2026.04/dt_upstream_rockchip/rk3588s-mekotronics-r58s2.dts

[coderabbitai]

Actionable comments posted: 3

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@config/boards/mekotronics-r58s2.conf`:
- Around line 14-15: The BOOT_SCENARIO value "tpl-blob-atf-mainline" conflicts
with the board's later changes that unset uboot_custom_postprocess and switch to
a binman-style u-boot-rockchip.bin layout; update the board to use the matching
scenario or restore the tpl post-processing: either change BOOT_SCENARIO to
"binman-atf-mainline" to match the binman/u-boot-rockchip.bin packaging, or
re-enable the tpl/ATF postprocess by removing the unset of
uboot_custom_postprocess so the idbloader.img path in rockchip64_common.inc
remains valid.
- Around line 6-9: This board enables KERNEL_TARGET="vendor" and sets
BOOT_FDT_FILE="rockchip/rk3588s-blueberry-rp01a-v10.dtb" but the required vendor
kernel DTB is not provided in this PR; update the board config
(mekotronics-r58s2.conf) to either switch KERNEL_TARGET back to "mainline" or
remove/clear BOOT_FDT_FILE until the vendor kernel patch
(armbian/linux-rockchip#461) is merged, or add the missing DTB to the repo;
specifically modify the KERNEL_TARGET and/or BOOT_FDT_FILE entries so builds no
longer depend on the absent vendor kernel DTB.

In `@patch/u-boot/v2026.04/defconfig/mekotronics-r58s2-rk3588s_defconfig`:
- Around line 26-27: The preboot string in CONFIG_PREBOOT uses "led STATUS"
which doesn't match the DTS node label; update CONFIG_PREBOOT to reference the
actual LED identifier used in the device tree (e.g., replace "led STATUS" with
"led green-led" to match the green-led node, or use "led green_led" if your DTS
uses that snake_case label) so the preboot command will successfully control the
LED; ensure the new identifier appears in the CONFIG_PREBOOT value.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 6f6af345-4a09-48d1-ae12-45ad4bb74dd5

📥 Commits

Reviewing files that changed from the base of the PR and between b993528 and 7a4cb7b.

📒 Files selected for processing (5)

• config/boards/mekotronics-r58s2.conf
• patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58s2-rk3588_defconfig
• patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588s-blueberry-rp01a.dts
• patch/u-boot/v2026.04/defconfig/mekotronics-r58s2-rk3588s_defconfig
• patch/u-boot/v2026.04/dt_upstream_rockchip/rk3588s-mekotronics-r58s2.dts

[HeyMeco]

@igorpecovnik this is ready now.

[github-actions]

✅ This PR has been reviewed and approved — all set for merge!