If it's not inter-lined, yes, I imagine you will. BA will presumably arrive at T5 and you'll have to transfer to T2. But six hours should be fine, and I imagine one advantage of self service check in is that it'll be available earlier than if you had to wait for a person to arrive at a desk. Good luck and enjoy the trip. I hope you'll love Ethiopia as much as we did!