From: Tim Harvey <tharvey@gateworks.com>
Date: Tue, 26 May 2015 18:04:58 +0000 (-0700)
Subject: imx: ventana: skip mtdparts fixup if no flash
X-Git-Tag: v2015.07-rc2~6^2~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c2fd3f57040d4d8e858f0449afe46416cfad95da;p=u-boot

imx: ventana: skip mtdparts fixup if no flash

This avoids an error message on NAND-less boards.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---

diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 221069f810..3b7c82b1dc 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -811,9 +811,11 @@ int ft_board_setup(void *blob, bd_t *bd)
 		return 0;
 	}
 
-	/* Update partition nodes using info from mtdparts env var */
-	puts("   Updating MTD partitions...\n");
-	fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
+	if (test_bit(EECONFIG_NAND, info->config)) {
+		/* Update partition nodes using info from mtdparts env var */
+		puts("   Updating MTD partitions...\n");
+		fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
+	}
 
 	/* Update display timings from display env var */
 	if (display) {