From 3cd43b017d7fb1a2ea8b7181631dd69a4e2d2311 Mon Sep 17 00:00:00 2001 From: oxmc <67136658+oxmc@users.noreply.github.com> Date: Thu, 4 Jun 2026 17:02:17 -0700 Subject: [PATCH] rpi5: set androidboot.boot_devices for by-name partition mounts Mirror of the rpi4 fix. First-stage init only creates /dev/block/by-name/* symlinks for partitions on a declared boot device, and our fstab mounts by-name. RPi5 USB is on the RP1 chip behind the internal PCIe and RP1's xHCI is a platform device, so init matches at the .usb node (deeper than RPi4's VL805). List NVMe (external PCIe) and the RP1 USB controllers; exact-match set makes extra entries harmless. To be verified/trimmed against an RPi5 serial log. --- BoardConfig.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/BoardConfig.mk b/BoardConfig.mk index 47c28ae..71ff36f 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -42,6 +42,17 @@ BOARD_CUSTOM_BOOTIMG := true BOARD_CUSTOM_BOOTIMG_MK := $(DEVICE_PATH)/mkbootimg.mk BOARD_KERNEL_CMDLINE := console=ttyAMA10,115200 androidboot.hardware=rpi5 +# Boot devices — see pawlet_rpi4/BoardConfig.mk for the rationale. First-stage +# init only creates /dev/block/by-name/* symlinks for partitions on a declared +# boot device (exact match vs uevent path minus /devices/platform/). +# RPi5 differs from RPi4: USB is on the RP1 chip behind the internal PCIe, and +# RP1's xHCI is itself a platform device, so init matches at the .usb node: +# NVMe (external PCIe HAT): axi/1000110000.pcie +# USB (RP1 xHCI on PCIe): axi/1000120000.pcie/1f00200000.usb (and .../1f00300000.usb) +# Extra entries are harmless (exact-match set). Verify/trim against an RPi5 +# serial boot log (the sda / nvme0n1 /devices/platform/... path). +BOARD_KERNEL_CMDLINE += androidboot.boot_devices=axi/1000110000.pcie,axi/1000120000.pcie/1f00200000.usb,axi/1000120000.pcie/1f00300000.usb,axi/1000120000.pcie + # Manifest DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(DEVICE_PATH)/framework_compatibility_matrix.xml DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml