Merge with /home/mk/8-benq/u-boot