Merge with /home/wd/git/u-boot/testing-NAND/ to add new NAND handling.