41c41
< __FBSDID("$FreeBSD: stable/10/sys/arm/ti/ti_machdep.c 259365 2013-12-14 00:16:08Z ian $");
---
> __FBSDID("$FreeBSD: stable/10/sys/arm/ti/ti_machdep.c 266084 2014-05-14 19:18:58Z ian $");
57,58c57
< /* Start of address space used for bootstrap map */
< #define DEVMAP_BOOTSTRAP_MAP_START 0xF0000000
---
> void (*ti_cpu_reset)(void) = NULL;
60,61d58
< void (*ti_cpu_reset)(void);
<
66c63
< return (DEVMAP_BOOTSTRAP_MAP_START);
---
> return (arm_devmap_lastaddr());
72,73d68
<
< ti_cpu_reset = NULL;
86,91d80
< #define FDT_DEVMAP_MAX (2) // FIXME
< static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
< { 0, 0, 0, 0, 0, }
< };
<
<
93c82,83
< * Construct pmap_devmap[] with DT-derived config data.
---
> * Construct static devmap entries to map out the most frequently used
> * peripherals using 1mb section mappings.
98d87
< int i = 0;
100,105c89,90
< fdt_devmap[i].pd_va = 0xF8000000;
< fdt_devmap[i].pd_pa = 0x48000000;
< fdt_devmap[i].pd_size = 0x1000000;
< fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
< fdt_devmap[i].pd_cache = PTE_DEVICE;
< i++;
---
> arm_devmap_add_entry(0x48000000, 0x01000000); /*16mb L4_PER devices */
> arm_devmap_add_entry(0x4A000000, 0x01000000); /*16mb L4_CFG devices */
107,112c92,98
< fdt_devmap[i].pd_va = 0xF4C00000;
< fdt_devmap[i].pd_pa = 0x44C00000; /* L4_WKUP */
< fdt_devmap[i].pd_size = 0x400000; /* 4 MB */
< fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
< fdt_devmap[i].pd_cache = PTE_DEVICE;
< i++;
---
> arm_devmap_add_entry(0x44C00000, 0x00400000); /* 4mb L4_WKUP devices*/
> arm_devmap_add_entry(0x47400000, 0x00100000); /* 1mb USB */
> arm_devmap_add_entry(0x47800000, 0x00100000); /* 1mb mmchs2 */
> arm_devmap_add_entry(0x48000000, 0x01000000); /*16mb L4_PER devices */
> arm_devmap_add_entry(0x49000000, 0x00100000); /* 1mb edma3 */
> arm_devmap_add_entry(0x49800000, 0x00300000); /* 3mb edma3 */
> arm_devmap_add_entry(0x4A000000, 0x01000000); /*16mb L4_FAST devices*/
116,117d101
<
< arm_devmap_register_table(&fdt_devmap[0]);