[src/trunk]: src/sys/arch/evbarm/gemini Fix GEMINI build

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

details:   https://anonhg.NetBSD.org/src/rev/b1a003dce6ce
branches:  trunk
changeset: 834443:b1a003dce6ce
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Aug 12 18:42:08 2018 +0000

description:
Fix GEMINI build

diffstat:

 sys/arch/evbarm/gemini/gemini_machdep.c |  17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diffs (59 lines):

diff -r a50bb149500d -r b1a003dce6ce sys/arch/evbarm/gemini/gemini_machdep.c
--- a/sys/arch/evbarm/gemini/gemini_machdep.c   Sun Aug 12 18:39:59 2018 +0000
+++ b/sys/arch/evbarm/gemini/gemini_machdep.c   Sun Aug 12 18:42:08 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gemini_machdep.c,v 1.26 2018/07/31 06:46:26 skrll Exp $        */
+/*     $NetBSD: gemini_machdep.c,v 1.27 2018/08/12 18:42:08 skrll Exp $        */
 
 /* adapted from:
  *     NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.26 2018/07/31 06:46:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.27 2018/08/12 18:42:08 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_machdep.h"
@@ -237,10 +237,7 @@
  */
 #define KERNEL_BASE_PHYS ((paddr_t)&KERNEL_BASE_phys)
 
-#define KERN_VTOPHYS(va) \
-       ((paddr_t)((vaddr_t)va - KERNEL_BASE + GEMINI_DRAM_BASE))
-#define KERN_PHYSTOV(pa) \
-       ((vaddr_t)((paddr_t)pa - GEMINI_DRAM_BASE + KERNEL_BASE))
+u_long kern_vtopdiff;
 
 /* Prototypes */
 
@@ -632,6 +629,8 @@
        bootconfig.dram[0].address = physical_start;
        bootconfig.dram[0].pages = physmem;
 
+       kern_vtopdiff = KERNEL_BASE + GEMINI_DRAM_BASE;
+
        /*
         * Our kernel is at the beginning of memory, so set our free space to
         * all the memory after the kernel.
@@ -1145,16 +1144,16 @@
            KERN_PHYSTOV(physical_start), KERN_PHYSTOV(physical_end-1),
            (int)physmem);
        printf(mem_fmt, "text section",
-              KERN_VTOPHYS(KERNEL_BASE_virt), KERN_VTOPHYS(etext-1),
+              KERN_VTOPHYS((vaddr_t)KERNEL_BASE_virt), KERN_VTOPHYS((vaddr_t)etext-1),
               (vaddr_t)KERNEL_BASE_virt, (vaddr_t)etext-1,
               (int)(textsize / PAGE_SIZE));
        printf(mem_fmt, "data section",
-              KERN_VTOPHYS(__data_start), KERN_VTOPHYS(_edata),
+              KERN_VTOPHYS((vaddr_t)__data_start), KERN_VTOPHYS((vaddr_t)_edata),
               (vaddr_t)__data_start, (vaddr_t)_edata,
               (int)((round_page((vaddr_t)_edata)
                      - trunc_page((vaddr_t)__data_start)) / PAGE_SIZE));
        printf(mem_fmt, "bss section",
-              KERN_VTOPHYS(__bss_start), KERN_VTOPHYS(__bss_end__),
+              KERN_VTOPHYS((vaddr_t)__bss_start), KERN_VTOPHYS((vaddr_t)__bss_end__),
               (vaddr_t)__bss_start, (vaddr_t)__bss_end__,
               (int)((round_page((vaddr_t)__bss_end__)
                      - trunc_page((vaddr_t)__bss_start)) / PAGE_SIZE));