Merge with /home/hs/jupiter/u-boot