Merge "ipq40xx: Add support for Micron 1GB NAND flash"