Module Name: src
Committed By: skrll
Date: Sun Aug 12 20:28:38 UTC 2018
Modified Files:
src/sys/arch/evbarm/zynq: zynq_machdep.c
Log Message:
Make PARALLELLA build
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/zynq/zynq_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/zynq/zynq_machdep.c
diff -u src/sys/arch/evbarm/zynq/zynq_machdep.c:1.2 src/sys/arch/evbarm/zynq/zynq_machdep.c:1.3
--- src/sys/arch/evbarm/zynq/zynq_machdep.c:1.2 Tue Jul 17 18:41:01 2018
+++ src/sys/arch/evbarm/zynq/zynq_machdep.c Sun Aug 12 20:28:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_machdep.c,v 1.2 2018/07/17 18:41:01 christos Exp $ */
+/* $NetBSD: zynq_machdep.c,v 1.3 2018/08/12 20:28:38 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_machdep.c,v 1.2 2018/07/17 18:41:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_machdep.c,v 1.3 2018/08/12 20:28:38 skrll Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_arm_debug.h"
@@ -78,8 +78,6 @@ u_int uboot_args[4] __attribute__((__sec
* kernel address space. *Not* for general use.
*/
#define KERN_VTOPDIFF ((vaddr_t)KERNEL_BASE_phys - (vaddr_t)KERNEL_BASE_virt)
-#define KERN_VTOPHYS(va) ((paddr_t)((vaddr_t)va + (vaddr_t)KERN_VTOPDIFF))
-#define KERN_PHYSTOV(pa) ((vaddr_t)((paddr_t)pa - (vaddr_t)KERN_VTOPDIFF))
#ifndef CONADDR
#define CONADDR (UART1_BASE)
@@ -147,6 +145,8 @@ static const struct pmap_devmap devmap[]
u_int
initarm(void *arg)
{
+ kern_vtopdiff = KERN_VTOPDIFF;
+
pmap_devmap_register(devmap);
zynq7000_bootstrap(KERNEL_IO_IOREG_VBASE);
