Fix machid for CubieBoard2. Select nandc as default nand boot partition.
Merge branch 'lichee-dev-a20' of https://github.com/EddyBeaupre/u-boot into lichee-dev-a20