44c44
< __FBSDID("$FreeBSD: stable/10/sys/arm/broadcom/bcm2835/bcm2835_machdep.c 259365 2013-12-14 00:16:08Z ian $");
---
> __FBSDID("$FreeBSD: stable/10/sys/arm/broadcom/bcm2835/bcm2835_machdep.c 266084 2014-05-14 19:18:58Z ian $");
62,64d61
< /* Start of address space used for bootstrap map */
< #define DEVMAP_BOOTSTRAP_MAP_START 0xE0000000
<
69c66
< return (DEVMAP_BOOTSTRAP_MAP_START);
---
> return (arm_devmap_lastaddr());
102,107d98
< #define FDT_DEVMAP_MAX (2) // FIXME
< static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
< { 0, 0, 0, 0, 0, }
< };
<
<
109c100,102
< * Construct pmap_devmap[] with DT-derived config data.
---
> * Set up static device mappings.
> * All on-chip peripherals exist in a 16MB range starting at 0x20000000.
> * Map the entire range using 1MB section mappings.
114d106
< int i = 0;
116,123c108
< fdt_devmap[i].pd_va = 0xf2000000;
< fdt_devmap[i].pd_pa = 0x20000000;
< fdt_devmap[i].pd_size = 0x01000000; /* 1 MB */
< fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
< fdt_devmap[i].pd_cache = PTE_DEVICE;
< i++;
<
< arm_devmap_register_table(&fdt_devmap[0]);
---
> arm_devmap_add_entry(0x20000000, 0x01000000);