Sorry - I run into the same problem with the R350 on my early board - but I thought it would be fixed on the boards shipping. So I don't mentioned it.
Can you please update you tools using adi_update_tools.sh?
The calibration routine should do the cross over automatically - so once finished all should be in sync.
-Michael