Merge with /home/tur/proj/idmr/u-boot