From: Adam Ford <aford173@gmail.com>
Date: Sun, 23 Oct 2016 12:39:01 +0000 (-0500)
Subject: omap3logic: Fix Auto detect Logic PD Models
X-Git-Tag: v2016.11-rc3~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0fc4aad404d62f7e32ccb9d727efef20b45ea4b9;p=u-boot

omap3logic: Fix Auto detect Logic PD Models

The autodetect feature doesn't allow users to specify the device tree.
This fix will make it only autodetect if 'fdtimage' is not defined.

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 3ddeb4647a..de6a06021c 100644
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -219,6 +219,10 @@ int board_init(void)
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {
+	/* If we do not have an fdtimage, let's autodetect it*/
+	if (getenv("fdtimage"))
+		return 0;
+
 	switch (gd->bd->bi_arch_number) {
 	case MACH_TYPE_DM3730_TORPEDO:
 		setenv("fdtimage", "logicpd-torpedo-37xx-devkit.dtb");