35c35
< __FBSDID("$FreeBSD: stable/10/sys/arm/allwinner/a10_machdep.c 259365 2013-12-14 00:16:08Z ian $");
---
> __FBSDID("$FreeBSD: stable/10/sys/arm/allwinner/a10_machdep.c 266084 2014-05-14 19:18:58Z ian $");
53,56d52
< /* Start of address space used for bootstrap map */
< #define DEVMAP_BOOTSTRAP_MAP_START 0xE0000000
<
<
61c57
< return (DEVMAP_BOOTSTRAP_MAP_START);
---
> return (arm_devmap_lastaddr());
67d62
<
80,84d74
< #define FDT_DEVMAP_MAX (1 + 2 + 1 + 1)
< static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
< { 0, 0, 0, 0, 0, }
< };
<
86c76,83
< * Construct pmap_devmap[] with DT-derived config data.
---
> * Set up static device mappings.
> *
> * This covers all the on-chip device with 1MB section mappings, which is good
> * for performance (uses fewer TLB entries for device access).
> *
> * XXX It also covers a block of SRAM and some GPU (mali400) stuff that maybe
> * shouldn't be device-mapped. The original code mapped a 4MB block, but
> * perhaps a 1MB block would be more appropriate.
91d87
< int i = 0;
93,97c89
< fdt_devmap[i].pd_va = 0xE1C00000;
< fdt_devmap[i].pd_pa = 0x01C00000;
< fdt_devmap[i].pd_size = 0x00400000; /* 4 MB */
< fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
< fdt_devmap[i].pd_cache = PTE_DEVICE;
---
> arm_devmap_add_entry(0x01C00000, 0x00400000); /* 4MB */
99,102d90
< i++;
<
< arm_devmap_register_table(&fdt_devmap[0]);
<