30c30
< __FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx_machdep.c 257660 2013-11-04 22:45:26Z ian $");
---
> __FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx_machdep.c 257669 2013-11-05 02:57:34Z ian $");
90a91,97
> return (devmap_vaddr);
> }
>
> void
> initarm_early_init(void)
> {
>
94,108d100
<
< /*
< * Normally initarm() calls platform_devmap_init() much later in the
< * init process to set up static device mappings. To calculate the
< * highest available kva address we have to do that setup first. It
< * maps downwards from ARM_VECTORS_HIGH and the last usable kva address
< * is the point right before the virtual address of the first static
< * mapping. So go set up the static mapping table now, then we can
< * return the lowest static devmap vaddr as the end of usable kva.
< */
< imx_devmap_init();
<
< arm_devmap_register_table(devmap_entries);
<
< return (devmap_vaddr);
112c104
< platform_devmap_init(void)
---
> initarm_devmap_init(void)
115c107,108
< /* On imx this work is done during initarm_lastaddr(). */
---
> imx_devmap_init();
> arm_devmap_register_table(devmap_entries);