Merge with /home/stefan/git/u-boot/u-boot-ppc4xx