The US president says he has told Iran it has to do "two things" to avoid military action, as the US builds up its forces in the Gulf.