Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fix after recent KERN_{VTOPHYS,PHYSTOV} change

This commit is contained in:
skrll 2018-08-05 13:05:45 +00:00
parent 770538cbfb
commit aefb400316
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/evbarm/imx7/imx7_machdep.c
View File

@ -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 @@ u_int uboot_args[4] __attribute__((__section__(".data")));
* 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 @@ initarm(void *arg)
{
psize_t memsize;
kern_vtopdiff = KERN_VTOPDIFF;
pmap_devmap_register(devmap);
imx7_bootstrap(KERNEL_IO_IOREG_VBASE);

12
sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
View File

@ -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 @@ char *boot_args = NULL;
/* 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 @@ initarm(void *arg)
{
psize_t memsize;
kern_vtopdiff = KERN_VTOPDIFF;
pmap_devmap_register(devmap);
imx6_bootstrap(KERNEL_IO_IOREG_VBASE);