I have an original iPhone running 1.1.4 jailbroken, but I upgraded to a 3G and my buddy would like my old one. I am going to upgrade it to 2.0 first, but what steps do I need to take to make the upgrade?

Mind you, I'd rather give it to him unjailbroken, so can I just do the official upgrade?