diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index b9b35de..5270c11 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -293,6 +293,14 @@
 		}
 	}
 
+#ifdef CONFIG_OF_CONTROL
+	/* For now, put this check after the console is ready */
+	if (fdtdec_prepare_fdt()) {
+		panic("** CONFIG_OF_CONTROL defined but no FDT - please see "
+			"doc/README.fdt-control");
+	}
+#endif
+
 	debug("monitor len: %08lX\n", gd->mon_len);
 	/*
 	 * Ram is setup, size stored in gd !!