I upgraded my iPhone to 2.1 last weekend on my MacBook. For whatever reason, I have not been able to upgrade my iPhone firmware or iPhone software on my Dell laptop. I have tried all the work-arounds but it always freezes. My work-around is to synch my iPhone to my Dell laptop, upgrade it on my MacBook and then re-synch on my Dell laptop.
This works for me!