From 0fc4aad404d62f7e32ccb9d727efef20b45ea4b9 Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Sun, 23 Oct 2016 07:39:01 -0500 Subject: 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 Reviewed-by: Tom Rini diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 3ddeb46..de6a060 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"); -- cgit v0.10.2