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