upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge Perforce change @219935 to head:

Browse source 
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
This commit is contained in:
Robert Watson 2013-01-12 12:34:59 +00:00
parent cda00e8ccd
commit f73faab74b
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sys/mips/beri/beri_machdep.c
View file

@ -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, __register_t a1, __register_t a2,
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).