PERFORCE change 219935 for review

[Robert Watson]

http://p4web.freebsd.org/@@219935?ac=10

Change 219935 by rwatson at rwatson_zenith_cl_cam_ac_uk on 2013/01/02 10:09:18

	Initialise Openfirmware/FDT code earlier in the FreeBSD/beri boot,
	so that the results will be available for configuring the console
	UART (eventually).
	
	Suggested by:	thompsa

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/beri_machdep.c#7 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/beri_machdep.c#7 (text+ko) ====

@@ -87,17 +87,6 @@
 {
 	int i;
 
-#ifdef FDT
-#ifndef FDT_DTB_STATIC
-#error	"mips_init with FDT requires FDT_DTB_STATIC"
-#endif
-
-	if (OF_install(OFW_FDT, 0) == FALSE)
-		while (1);
-	if (OF_init(&fdt_static_dtb) != 0)
-		while (1);
-#endif
-
 	for (i = 0; i < 10; i++) {
 		phys_avail[i] = 0;
 	}
@@ -156,6 +145,17 @@
 
 	mips_pcpu0_init();
 
+#ifdef FDT
+#ifndef FDT_DTB_STATIC
+#error	"mips_init with FDT requires FDT_DTB_STATIC"
+#endif
+
+	if (OF_install(OFW_FDT, 0) == FALSE)
+		while (1);
+	if (OF_init(&fdt_static_dtb) != 0)
+		while (1);
+#endif
+
 	/*
 	 * XXXRW: We have no way to compare wallclock time to cycle rate on
 	 * BERI, so for now assume we run at the MALTA default (100MHz).