Merge with /home/wd/git/u-boot/custodian/u-boot-mpc86xx