Author: rwatson
Date: Sat Jan 12 12:34:59 2013
New Revision: 245329
URL: http://svnweb.freebsd.org/changeset/base/245329
Log:
Merge Perforce change @219935 to head:
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
Sponsored by: DARPA, AFRL
Modified:
head/sys/mips/beri/beri_machdep.c
Modified: head/sys/mips/beri/beri_machdep.c
==============================================================================
--- head/sys/mips/beri/beri_machdep.c Sat Jan 12 11:36:23 2013
(r245328)
+++ head/sys/mips/beri/beri_machdep.c Sat Jan 12 12:34:59 2013
(r245329)
@@ -87,17 +87,6 @@ mips_init(void)
{
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 @@ platform_start(__register_t a0, __regist
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).
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
