[src/trunk]: src/sys/arch/evbarm Build fix after recent KERN_{VTOPHYS, PHYSTOV...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c98ac00632d4
branches:  trunk
changeset: 834271:c98ac00632d4
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Aug 05 13:05:45 2018 +0000

description:
Build fix after recent KERN_{VTOPHYS,PHYSTOV} change

diffstat:

 sys/arch/evbarm/imx7/imx7_machdep.c           |   8 ++++----
 sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c |  12 ++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diffs (77 lines):

diff -r ae923f6cce4c -r c98ac00632d4 sys/arch/evbarm/imx7/imx7_machdep.c
--- a/sys/arch/evbarm/imx7/imx7_machdep.c       Sun Aug 05 07:49:02 2018 +0000
+++ b/sys/arch/evbarm/imx7/imx7_machdep.c       Sun Aug 05 13:05:45 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx7_machdep.c,v 1.7 2018/07/17 18:41:01 christos Exp $        */
+/*     $NetBSD: imx7_machdep.c,v 1.8 2018/08/05 13:05:45 skrll Exp $   */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.7 2018/07/17 18:41:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.8 2018/08/05 13:05:45 skrll Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
@@ -81,8 +81,6 @@
  * 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        (IMX7_AIPS_BASE + AIPS3_UART1_BASE)
@@ -160,6 +158,8 @@
 {
        psize_t memsize;
 
+       kern_vtopdiff = KERN_VTOPDIFF;
+
        pmap_devmap_register(devmap);
        imx7_bootstrap(KERNEL_IO_IOREG_VBASE);
 
diff -r ae923f6cce4c -r c98ac00632d4 sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
--- a/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c     Sun Aug 05 07:49:02 2018 +0000
+++ b/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c     Sun Aug 05 13:05:45 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nitrogen6_machdep.c,v 1.8 2018/07/17 18:41:01 christos Exp $   */
+/*     $NetBSD: nitrogen6_machdep.c,v 1.9 2018/08/05 13:05:45 skrll Exp $      */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.8 2018/07/17 18:41:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.9 2018/08/05 13:05:45 skrll Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
@@ -77,13 +77,7 @@
 /* filled in before cleaning bss. keep in .data */
 u_int uboot_args[4] __attribute__((__section__(".data")));
 
-/*
- * Macros to translate between physical and virtual for a subset of the
- * 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        (IMX6_AIPS2_BASE + AIPS2_UART1_BASE)
@@ -160,6 +154,8 @@
 {
        psize_t memsize;
 
+       kern_vtopdiff = KERN_VTOPDIFF;
+
        pmap_devmap_register(devmap);
        imx6_bootstrap(KERNEL_IO_IOREG_VBASE);