Sudan's president al-Bashir to visit Ethiopia