qcs6490-rb3gen2: Add U-Boot support for RB3Gen2

U-Boot is an option for BL33 payload with TF-A, so let's add the corresponding
RB3Gen2 U-Boot recipe support. Along with that let's limit RB1 changes to the
corresponding machine.

Signed-off-by: Sumit Garg <[email protected]>

Author: b49020

conf/machine/qcs6490-rb3gen2-core-kit.conf

@@ -23,3 +23,4 @@ QCOM_BOOT_FILES_SUBDIR = "qcm6490"
 QCOM_PARTITION_FILES_SUBDIR ?= "partitions/qcs6490-rb3gen2/ufs"
 
 QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qcs6490"
+UBOOT_MACHINE = "qcm6490_defconfig"

recipes-bsp/u-boot/files/0001-dts-qcs6490-rb3gen2-u-boot-Add-OP-TEE-node.patch

@@ -0,0 +1,36 @@
+From d71a6fdb741455cf669f31fd4596f2ec4c757ebe Mon Sep 17 00:00:00 2001
+From: Sumit Garg <[email protected]>
+Date: Fri, 31 Oct 2025 11:10:19 +0530
+Subject: [PATCH] dts: qcs6490-rb3gen2-u-boot: Add OP-TEE node
+
+Since we currently only support DT based OP-TEE driver probe, lets add the
+OP-TEE node here for the time being. In future we want to migrate OP-TEE
+probing over to FF-A bus and then we can drop this DT node.
+
+Signed-off-by: Sumit Garg <[email protected]>
+Upstream-Status: Inappropriate [temporary workaround]
+---
+ arch/arm/dts/qcs6490-rb3gen2-u-boot.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm/dts/qcs6490-rb3gen2-u-boot.dtsi b/arch/arm/dts/qcs6490-rb3gen2-u-boot.dtsi
+index fbe72595f5a..e60905cb6a2 100644
+--- a/arch/arm/dts/qcs6490-rb3gen2-u-boot.dtsi
++++ b/arch/arm/dts/qcs6490-rb3gen2-u-boot.dtsi
+@@ -15,6 +15,13 @@
+ 		      <0 0xC3400000 0 0x3CC00000>,
+ 		      <1 0x00000000 1 0x00000000>;
+ 	};
++
++	firmware {
++		optee {
++			compatible = "linaro,optee-tz";
++			method = "smc";
++		};
++	};
+ };
+ 
+ &usb_1_dwc3 {
+-- 
+2.48.1
+

recipes-bsp/u-boot/u-boot_%.bbappend

@@ -1,13 +1,19 @@
 # This is a bbappend to add support for generating Android style boot images for chainloading u-boot from ABL
 
-DEPENDS:append:qcom = " skales-native xxd-native"
+FILESEXTRAPATHS:prepend:qcm6490 := "${THISDIR}/files:"
+SRC_URI:append:qcm6490 = " \
+        file://0001-dts-qcs6490-rb3gen2-u-boot-Add-OP-TEE-node.patch \
+"
+
+DEPENDS:append:qcom = " xxd-native"
+DEPENDS:append:qcm2290 = " skales-native"
 
 # Don't add extra dependencies for non-qcom machines and layers
 COMPILE_EXTRA_DEPENDS = ""
-COMPILE_EXTRA_DEPENDS:qcom = "virtual/kernel:do_deploy"
+COMPILE_EXTRA_DEPENDS:qcm2290 = "virtual/kernel:do_deploy"
 do_compile[depends] += "${COMPILE_EXTRA_DEPENDS}"
 
-uboot_compile_config:append:qcom() {
+uboot_compile_config:append:qcm2290() {
     cd ${B}/${builddir}
     touch empty-file
     rm -f u-boot-nodtb.bin.gz
@@ -17,6 +23,6 @@ uboot_compile_config:append:qcom() {
 }
 
 # Symlink the 'main' u-boot.bin to boot.img so the qcom image bbclass pick it up
-uboot_deploy_config:append:qcom() {
+uboot_deploy_config:append:qcm2290() {
     cd ${DEPLOYDIR} && ln -sf u-boot-${type}-${PV}-${PR}.bin boot-${MACHINE}.img
 }