[U-Boot] [PATCH v2] arm, imx6: fix NOR/OneNAND boot mode mix-up