Yes, you only need to upload Form 1099-R with code 2. You can ignore Form 1099-R with code R.
@kenchadetta
