Merge with /home/mk/11-cmb1920/u-boot#4upstream