Merge with /home/sr/git/u-boot/440epx-boot-msg