[src/trunk]: src/sys/arch/evbarm/rpi G/C

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

details:   https://anonhg.NetBSD.org/src/rev/5c551844318e
branches:  trunk
changeset: 973573:5c551844318e
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Jul 04 15:14:56 2020 +0000

description:
G/C

diffstat:

 sys/arch/evbarm/rpi/rpi.h         |  48 ---------------------------------------
 sys/arch/evbarm/rpi/vcprop_subr.c |   4 +--
 2 files changed, 1 insertions(+), 51 deletions(-)

diffs (70 lines):

diff -r 15c3e780c1ef -r 5c551844318e sys/arch/evbarm/rpi/rpi.h
--- a/sys/arch/evbarm/rpi/rpi.h Sat Jul 04 14:49:24 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*     $NetBSD: rpi.h,v 1.5 2017/12/10 21:38:27 skrll Exp $    */
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nick Hudson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _EVBARM_RPI_RPI_H
-#define _EVBARM_RPI_RPI_H
-
-#include <arm/broadcom/bcm2835reg.h>
-
-/*
- * Memory may be mapped VA:PA starting at 0x80000000:0x00000000
- * RPI2 has 1GB upto 0xc0000000
- *
- * Kernel VM space: 800MB at KERNEL_VM_BASE
- */
-#define        KERNEL_VM_BASE          0xc0000000
-#define        KERNEL_VM_SIZE          (BCM2835_PERIPHERALS_VBASE - KERNEL_VM_BASE)
-
-#define        RPI_REF_FREQ            19200000
-
-#endif /* _EVBARM_RPI_RPI_H */
diff -r 15c3e780c1ef -r 5c551844318e sys/arch/evbarm/rpi/vcprop_subr.c
--- a/sys/arch/evbarm/rpi/vcprop_subr.c Sat Jul 04 14:49:24 2020 +0000
+++ b/sys/arch/evbarm/rpi/vcprop_subr.c Sat Jul 04 15:14:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vcprop_subr.c,v 1.5 2018/01/01 17:03:25 skrll Exp $    */
+/*     $NetBSD: vcprop_subr.c,v 1.6 2020/07/04 15:14:56 skrll Exp $    */
 
 /*
  * Copyright (c) 2014 Michael Lorenz
@@ -43,8 +43,6 @@
 #include <evbarm/rpi/vcpm.h>
 #include <evbarm/rpi/vcprop.h>
 
-#include <evbarm/rpi/rpi.h>
-
 #include <dev/wscons/wsconsio.h>
 
 int