Merge branch 'Makefile' of git://git.denx.de/u-boot-arm