Merge with /home/hs/Atronic/u-boot-dev-new