Revert merge of git://www.denx.de/git/u-boot-arm, commit 62479b18: