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
This commit is contained in:
parent
cda00e8ccd
commit
f73faab74b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=245329
@ -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).
|
||||
|
Loading…
Reference in New Issue
Block a user