Merge with /home/stefan/git/u-boot/acadia-nand