Merge with /home/tur/git/u-boot#cm1_qp1