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