58c58
< __FBSDID("$FreeBSD: head/sys/powerpc/aim/machdep.c 275268 2014-11-29 20:54:33Z jhibbits $");
---
> __FBSDID("$FreeBSD: head/sys/powerpc/aim/machdep.c 277334 2015-01-18 18:32:43Z nwhitehorn $");
226c226
< extern char kernel_text[], _end[];
---
> extern vm_offset_t __startkernel, __endkernel;
247d246
< char save_trap_init[0x2f00]; /* EXC_LAST */
250,251c249
< powerpc_init(vm_offset_t startkernel, vm_offset_t endkernel,
< vm_offset_t basekernel, void *mdp)
---
> powerpc_init(vm_offset_t fdt, vm_offset_t toc, vm_offset_t ofentry, void *mdp)
253a252
> vm_offset_t startkernel, endkernel;
276,277c275,276
< /* Save trap vectors. */
< ofw_save_trap_vec(save_trap_init);
---
> /* Store boot environment state */
> OF_initial_setup((void *)fdt, NULL, (int (*)(void *))ofentry);
278a278,281
> /* First guess at start/end kernel positions */
> startkernel = __startkernel;
> endkernel = __endkernel;
>
492a496,498
>
> /* Set TOC base so that the interrupt code can get at it */
> *((register_t *)TRAP_TOCBASE) = toc;