Merge with /home/hs/U-Boot/u-boot-dev