From 27d0b7b0fa009fe9edb6b7bed13a0915ac4e7413 Mon Sep 17 00:00:00 2001 From: matt Date: Wed, 12 Jun 2013 20:36:53 +0000 Subject: [PATCH] Now that VBAR support is present, switch to ARM_VECTORS_LOW. --- sys/arch/evbarm/beagle/beagle_machdep.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/arch/evbarm/beagle/beagle_machdep.c b/sys/arch/evbarm/beagle/beagle_machdep.c index 9419deb7da38..d43f7e4672cb 100644 --- a/sys/arch/evbarm/beagle/beagle_machdep.c +++ b/sys/arch/evbarm/beagle/beagle_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: beagle_machdep.c,v 1.43 2013/06/11 22:59:54 matt Exp $ */ +/* $NetBSD: beagle_machdep.c,v 1.44 2013/06/12 20:36:53 matt Exp $ */ /* * Machine dependent functions for kernel setup for TI OSK5912 board. @@ -125,7 +125,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.43 2013/06/11 22:59:54 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.44 2013/06/12 20:36:53 matt Exp $"); #include "opt_machdep.h" #include "opt_ddb.h" @@ -499,10 +499,11 @@ initarm(void *arg) #else const bool mapallmem_p = false; #endif + KASSERT((armreg_pfr1_read() & ARM_PFR1_SEC_MASK) != 0); arm32_bootmem_init(bootconfig.dram[0].address, ram_size, KERNEL_BASE_PHYS); - arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0, devmap, + arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_LOW, 0, devmap, mapallmem_p); /* "bootargs" env variable is passed as 4th argument to kernel */