Bug Report: Rock 5B Plus does not boot with the correct device tree

[cplatt-iso]

What happened?

When booting a fresh installation of this distro, the device-tree model is incorrectly selected as "Radxa ROCK 5B"

root@ubuntu:~/dtb# strings /proc/device-tree/model
Radxa ROCK 5B

Using release: v2.3.2/ubuntu-24.04-preinstalled-server-arm64-rock-5b-plus.img.xz

This results in the following lspci with a drives present in both nvme slots:

ubuntu@ubuntu:~$ lspci
0000:00:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3588 (rev 01)
0000:01:00.0 Non-Volatile memory controller: Micron/Crucial Technology T500 NVMe PCIe SSD (rev 01)
0002:20:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3588 (rev 01)
0002:21:00.0 Network controller: Realtek Semiconductor Co., Ltd. RTL8852BE PCIe 802.11ax Wireless Network Controller
0004:40:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3588 (rev 01)
0004:41:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8125 2.5GbE Controller (rev 05)

When loading the proper device tree file this issue is resolved;

ubuntu@ubuntu:/etc/default$ cat /proc/device-tree/model
Radxa ROCK 5B Plus

ubuntu@ubuntu:/etc/default$ lspci
0000:00:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3588 (rev 01)
0000:01:00.0 Non-Volatile memory controller: Micron/Crucial Technology T500 NVMe PCIe SSD (rev 01)
0001:10:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3588 (rev 01)
0001:11:00.0 Non-Volatile memory controller: Micron/Crucial Technology T500 NVMe PCIe SSD (rev 01)
0002:20:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3588 (rev 01)
0002:21:00.0 Network controller: Realtek Semiconductor Co., Ltd. RTL8852BE PCIe 802.11ax Wireless Network Controller
0004:40:00.0 PCI bridge: Rockchip Electronics Co., Ltd RK3588 (rev 01)
0004:41:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8125 2.5GbE Controller (rev 05)

I resolved this by editing the extlinux.conf file and setting:
fdt /lib/firmware/6.1.0-1025-rockchip/device-tree/rockchip/rk3588-rock-5b-plus.dtb

I presume this is not the way to do this properly and u-boot should be fixed or something along those lines. However, everything does work when the proper device-tree file is loaded.

Kernel version

6.1.0-1025-rockchip

SBC model

Radxa ROCK 5B Plus

What operating system are you seeing this problem on?

Ubuntu 24.04 LTS (Noble Nombat)

Relevant logs

No response