Sorry that was our fault that we thought they are the same assertion issue before.
Yes, you can also apply the patch to your r36.3.0 BSP.
Please refer to the following steps to update tos image rather than uefi_jetson.bin
(i.e. the change is included in tos image.)
Step 1. apply the patch(https://github.com/NVIDIA/edk2-nvidia/pull/110/commits/8d0b58c5374f24ebaffe8472a0956354cd725f25) to UEFI source
Step 2. run the following command to build uefi_StandaloneMmOptee_RELEASE.bin
$ edk2_docker edk2-nvidia/Platform/NVIDIA/StandaloneMmOptee/build.sh
Step 3. refer to the steps in atf_and_optee_README.txt to build tos image (<Linux_for_Tegra>/bootloader/tos-optee_t234.img)
Step 4. flash the QSPI only to apply the change
$ sudo ./flash.sh -c bootloader/generic/cfg/flash_t234_qspi.xml jetson-orin-nano-devkit mmcblk0p1