CVS commit: src/sys/arch/evbarm/imx23_olinuxino

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Sun Aug 12 20:13:13 UTC 2018

Modified Files:
        src/sys/arch/evbarm/imx23_olinuxino: imx23_olinuxino_machdep.c

Log Message:
Fix IMX23_OLINUXINO build


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
    src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_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/imx23_olinuxino/imx23_olinuxino_machdep.c
diff -u src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.7 src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.8
--- src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.7	Tue Jul 31 06:46:26 2018
+++ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c	Sun Aug 12 20:13:13 2018
@@ -1,4 +1,4 @@
-/* $Id: imx23_olinuxino_machdep.c,v 1.7 2018/07/31 06:46:26 skrll Exp $ */
+/* $Id: imx23_olinuxino_machdep.c,v 1.8 2018/08/12 20:13:13 skrll Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -87,10 +87,6 @@ do {									\
 
 #define KERNEL_BASE_PHYS ((paddr_t)&KERNEL_BASE_phys)
 #define KERNEL_BASE_VIRT ((vaddr_t)&KERNEL_BASE_virt)
-#define KERN_VTOPHYS(va) \
-        ((paddr_t)((vaddr_t)(va) - KERNEL_BASE + KERNEL_BASE_PHYS))
-#define KERN_PHYSTOV(pa) \
-        ((vaddr_t)((paddr_t)(pa) + KERNEL_BASE_VIRT + KERNEL_BASE))
 
 /*
  * Static device map for i.MX23 peripheral address space.
@@ -142,6 +138,8 @@ initarm(void *arg)
 	if (set_cpufuncs())
 		panic("set_cpufuncs failed");
 
+	kern_vtopdiff = KERNEL_BASE + KERNEL_BASE_PHYS;
+
 	pmap_devmap_register(devmap);
 	consinit();