Merge with /home/hs/MAN/u-boot-dev