Can the old version system.img be directly restored to the new version jetpack?

[KevinFFF]

@EEEXcalibur

To prevent this Assertion 3, I need to update this patch in my source code r35.6.2-updates, then rebuild the tos-optee_t234.img, all right?

Correct.

@EEEXcalibur

By the way, I also checked source code of r35.5.0-updates and r35.6.0-updates. There are many differences between the two. I’m using branch r35.5.0-updates, is it possible to fix those problems directly on that?

Since you are using Jetpack 5.1.3, I would suggest you using r35.5.0-updates branch to prevent unexpected error.
Please note that the fix is included in tos image rather than uefi binary.
The key point is to apply the fix and build uefi_StandaloneMmOptee_RELEASE.bin, which is required before you built op-tee.