generate_flat_build: switch industrial-kit CDT to Mezzanine variant (subtype13) - #70
Open
xiuzhuo-shang wants to merge 1 commit into
Open
Conversation
xiuzhuo-shang
requested review from
Anuj Mittal (anujm1),
gyenugul and
shivshah3400
as code owners
August 28, 2026 03:06
xiuzhuo-shang
force-pushed
the
industrial-kit-subtype13-bt
branch
from
August 28, 2026 03:14
223402a to
6b4394d
Compare
Use rb3gen2-industrial-mezz-kit.zip (CDT subtype=13) instead of the standard rb3gen2-industrial-kit.zip (subtype=9). The RB3 Gen2 Industrial Mezzanine board underwent a hardware rework: the on-board M.2 QCC2072 Bluetooth module now routes over UART4 instead of USB, and the reworked board no longer supports the old USB-based BT path. CDT subtype=13 identifies this reworked hardware and selects the corresponding bt-uart.dtbo overlay; subtype=9 remains the correct choice for boards that have not been reworked (still using the USB-based BT path). The corresponding FIT mapping (conf-48 -> bt-uart.dtbo) is already present in the upstream qcom-dtb-metadata pin (f1596a6) used by this repo, so no additional qcom-dtb-metadata changes are required. Verified end-to-end on a reworked RB3 Gen2 Industrial Mezzanine board: QCC2072 is recognized by the kernel, firmware downloads successfully, and btftmdaemon completes a real handshake with the chip over the BlueZ HCI user-channel socket. Note: boards that have not undergone this hardware rework must keep using subtype=9 (this change only affects users who explicitly build for hardware with the BT-over-UART rework). Signed-off-by: Xiuzhuo Shang <xiuzhuo.shang@oss.qualcomm.com>
xiuzhuo-shang
force-pushed
the
industrial-kit-subtype13-bt
branch
from
August 28, 2026 03:18
6b4394d to
e3b4e97
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
qcs6490-rb3gen2-industrial-kitboard entry inscripts/generate_flat_build.shfrom the standard CDT (rb3gen2-industrial-kit.zip, subtype=9) to the Mezzanine variant CDT (rb3gen2-industrial-mezz-kit.zip, subtype=13).Background
The RB3 Gen2 Industrial Mezzanine board underwent a hardware rework: the on-board M.2 QCC2072 Bluetooth module now routes over UART4 instead of USB, and boards with this rework no longer support the old USB-based BT path. CDT subtype=13 identifies this reworked hardware and selects the corresponding
bt-uart.dtbooverlay (qcom,qcs6490-iot-subtype13->fdt-qcs6490-rb3gen2-industrial-mezzanine-bt-uart.dtbo).This mapping is already present upstream in
qcom-dtb-metadata(seeqcom-next-fitimage.itsconf-48, and kernel commit165c3854which introduced thebt-uart.dtso/.dtbooverlay). Since this repo's pinnedQCOM_DTB_METADATA_COMMIT(f1596a6) already includes that mapping, no additionalqcom-dtb-metadatachanges are required — only the CDT source needs to change here.Verification
Verified end-to-end on a reworked RB3 Gen2 Industrial Mezzanine board (M.2 QCC2072, BT-over-UART hardware):
dmesgconfirms the kernel driver recognizes the QCC2072 chip and downloads firmware successfully (hci0: setting up qcc2072,QCA setup on UART is completed).btftmdaemon(BlueZ HCI user-channel socket) completed a real handshake with the chip — version query and SoC reset commands both returned correctly, and the FTM initialization state machine progressed toReady for Client(QDart) Connection!.qcom,qcs6490-iot-subtype13is correctly matched and thebt-uart.dtbooverlay is selected.