Index: sys/arch/evbarm/gumstix/gumstix_machdep.c =================================================================== RCS file: /cvsroot/src/sys/arch/evbarm/gumstix/gumstix_machdep.c,v retrieving revision 1.50 diff -u -r1.50 gumstix_machdep.c --- sys/arch/evbarm/gumstix/gumstix_machdep.c 7 Jun 2014 10:30:13 -0000 1.50 +++ sys/arch/evbarm/gumstix/gumstix_machdep.c 20 Aug 2015 23:57:21 -0000 @@ -191,9 +191,9 @@ * Core-logic registers and I/O mappings occupy 0xfd000000 - 0xffffffff */ #ifndef KERNEL_VM_BASE -#define KERNEL_VM_BASE 0xc1000000 +#define KERNEL_VM_BASE (KERNEL_BASE + 0x01000000) #endif -#define KERNEL_VM_SIZE 0x0f000000 +#define KERNEL_VM_SIZE 0x0c000000 BootConfig bootconfig; /* Boot config storage */ static char bootargs[MAX_BOOT_STRING]; @@ -484,7 +484,9 @@ bootconfig.dram[0].address = SDRAM_START; bootconfig.dram[0].pages = ram_size / PAGE_SIZE; +#ifdef OVERO KASSERT(ram_size <= KERNEL_VM_BASE - KERNEL_BASE); +#endif arm32_bootmem_init(bootconfig.dram[0].address, ram_size, (uintptr_t) KERNEL_BASE_phys); @@ -494,7 +496,13 @@ #elif defined(CPU_CORTEXA8) ARM_VECTORS_HIGH, #endif - 0, gumstix_devmap, true); + 0, gumstix_devmap, +#if defined(OVERO) + true +#elif defined(GUMSTIX) + false +#endif + ); evbarm_device_register = gumstix_device_register;