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

Move the generic arm32 files into arm/arm32 from arm32/arm32, tested kernel builds on cats and riscpc.

This commit is contained in:
chris 2001-07-28 13:28:03 +00:00
parent 9c823196e0
commit 27f96e8440
19 changed files with 37 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arch/arm32/arm32/machdep.c → sys/arch/arm/arm32/arm32_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.98 2001/06/11 11:56:58 rearnsha Exp $ */
/* $NetBSD: arm32_machdep.c,v 1.1 2001/07/28 13:28:03 chris Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.

2
sys/arch/arm32/arm32/bus_dma.c → sys/arch/arm/arm32/bus_dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_dma.c,v 1.25 2001/07/28 11:17:15 chris Exp $ */
/* $NetBSD: bus_dma.c,v 1.1 2001/07/28 13:28:03 chris Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.

2
sys/arch/arm32/arm32/cpuswitch.S → sys/arch/arm/arm32/cpuswitch.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpuswitch.S,v 1.35 2001/05/23 21:49:57 chris Exp $ */
/* $NetBSD: cpuswitch.S,v 1.1 2001/07/28 13:28:03 chris Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.

2
sys/arch/arm32/arm32/exception.S → sys/arch/arm/arm32/exception.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: exception.S,v 1.14 2000/03/24 17:05:30 ws Exp $ */
/* $NetBSD: exception.S,v 1.1 2001/07/28 13:28:03 chris Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.

2
sys/arch/arm32/arm32/fault.c → sys/arch/arm/arm32/fault.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fault.c,v 1.57 2001/07/19 16:13:00 wiz Exp $ */
/* $NetBSD: fault.c,v 1.1 2001/07/28 13:28:03 chris Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.

2
sys/arch/arm32/arm32/fusu.S → sys/arch/arm/arm32/fusu.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: fusu.S,v 1.9 2000/12/12 06:36:19 mycroft Exp $ */
/* $NetBSD: fusu.S,v 1.1 2001/07/28 13:28:03 chris Exp $ */
/*
* Copyright (c) 1996-1998 Mark Brinicombe.

2
sys/arch/arm32/arm32/intr.c → sys/arch/arm/arm32/intr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.c,v 1.24 2001/04/24 18:21:10 bjh21 Exp $ */
/* $NetBSD: intr.c,v 1.1 2001/07/28 13:28:03 chris Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.

2
sys/arch/arm32/arm32/mem.c → sys/arch/arm/arm32/mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.18 2001/07/28 11:17:15 chris Exp $ */
/* $NetBSD: mem.c,v 1.1 2001/07/28 13:28:03 chris Exp $ */
/*
* Copyright (c) 1988 University of Utah.

2
sys/arch/arm32/arm32/procfs_machdep.c → sys/arch/arm/arm32/procfs_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: procfs_machdep.c,v 1.1 2001/01/17 00:07:21 fvdl Exp $ */
/* $NetBSD: procfs_machdep.c,v 1.1 2001/07/28 13:28:03 chris Exp $ */
#include <sys/param.h>
#include <sys/systm.h>

2
sys/arch/arm32/arm32/setcpsr.S → sys/arch/arm/arm32/setcpsr.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: setcpsr.S,v 1.4 1998/04/01 22:59:25 mark Exp $ */
/* $NetBSD: setcpsr.S,v 1.1 2001/07/28 13:28:03 chris Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.

2
sys/arch/arm32/arm32/setstack.S → sys/arch/arm/arm32/setstack.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: setstack.S,v 1.4 1998/04/01 23:00:14 mark Exp $ */
/* $NetBSD: setstack.S,v 1.1 2001/07/28 13:28:03 chris Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.

2
sys/arch/arm32/arm32/spl.S → sys/arch/arm/arm32/spl.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: spl.S,v 1.7 1999/10/26 06:53:41 cgd Exp $ */
/* $NetBSD: spl.S,v 1.1 2001/07/28 13:28:04 chris Exp $ */
/*
* Copyright (c) 1996-1998 Mark Brinicombe.

2
sys/arch/arm32/arm32/stubs.c → sys/arch/arm/arm32/stubs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: stubs.c,v 1.33 2001/03/31 12:22:38 toshii Exp $ */
/* $NetBSD: stubs.c,v 1.1 2001/07/28 13:28:04 chris Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.

8
sys/arch/arm32/arm32/vm_machdep.c → sys/arch/arm/arm32/vm_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vm_machdep.c,v 1.58 2001/06/02 18:09:10 chs Exp $ */
/* $NetBSD: vm_machdep.c,v 1.1 2001/07/28 13:28:04 chris Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -276,8 +276,8 @@ pagemove(from, to, size)
printf("pagemove: V%p to %p size %08x\n", from, to, size);
#endif /* PMAP_DEBUG */
fpte = vtopte(from);
tpte = vtopte(to);
fpte = vtopte((vaddr_t)from);
tpte = vtopte((vaddr_t)to);
/*
* Make sure the cache does not have dirty data for the
@ -293,7 +293,7 @@ pagemove(from, to, size)
*fpte++ = 0;
size -= NBPG;
}
cpu_tlb_flushD();
//cpu_tlb_flushD();
}
extern struct vm_map *phys_map;

16
sys/arch/arm/conf/files.arm
View File

@ -1,4 +1,4 @@
# $NetBSD: files.arm,v 1.34 2001/07/10 20:43:57 bjh21 Exp $
# $NetBSD: files.arm,v 1.35 2001/07/28 13:28:08 chris Exp $
# temporary define to allow easy moving to ../arch/arm/arm32
defopt ARM32
@ -58,11 +58,25 @@ file arch/arm/arm/undefined.c
file arch/arm/arm/vm_machdep_arm.c
# files common to arm32 implementations
file arch/arm/arm32/arm32_machdep.c arm32
file arch/arm/arm32/ast.c arm32
file arch/arm/arm32/bus_dma.c arm32
file arch/arm/arm32/cpu.c arm32 & cpu
file arch/arm/arm32/cpuswitch.S arm32
file arch/arm/arm32/exception.S arm32
file arch/arm/arm32/fault.c arm32
file arch/arm/arm32/fusu.S arm32
file arch/arm/arm32/intr.c arm32
file arch/arm/arm32/mem.c arm32
file arch/arm/arm32/pmap.c arm32
file arch/arm/arm32/procfs_machdep.c arm32 & procfs
file arch/arm/arm32/setcpsr.S arm32
file arch/arm/arm32/setstack.S arm32
file arch/arm/arm32/spl.S arm32
file arch/arm/arm32/stubs.c arm32
file arch/arm/arm32/syscall.c arm32
file arch/arm/arm32/sys_machdep.c arm32
file arch/arm/arm32/vm_machdep.c arm32
# arm32 library functions
file arch/arm/arm32/bcopy_page.S arm32

16
sys/arch/arm32/conf/files.arm32
View File

@ -1,4 +1,4 @@
# $NetBSD: files.arm32,v 1.124 2001/07/08 15:41:55 bjh21 Exp $
# $NetBSD: files.arm32,v 1.125 2001/07/28 13:28:04 chris Exp $
#
# First try for arm-specific configuration info
#
@ -337,21 +337,7 @@ file arch/arm32/vidc/console/dumb.c vt
# Generic MD files
file arch/arm32/arm32/autoconf.c
file arch/arm32/arm32/bus_dma.c
file arch/arm32/arm32/conf.c
file arch/arm32/arm32/cpuswitch.S
file arch/arm32/arm32/stubs.c
file arch/arm32/arm32/exception.S
file arch/arm32/arm32/fault.c
file arch/arm32/arm32/mem.c
file arch/arm32/arm32/procfs_machdep.c procfs
file arch/arm32/arm32/machdep.c
file arch/arm32/arm32/vm_machdep.c
file arch/arm32/arm32/fusu.S
file arch/arm32/arm32/setcpsr.S
file arch/arm32/arm32/setstack.S
file arch/arm32/arm32/spl.S
file arch/arm32/arm32/intr.c
file arch/arm/arm/disksubr.c disk
file arch/arm/arm/disksubr_acorn.c disk

16
sys/arch/cats/conf/files.cats
View File

@ -1,4 +1,4 @@
# $NetBSD: files.cats,v 1.7 2001/06/20 22:14:34 chris Exp $
# $NetBSD: files.cats,v 1.8 2001/07/28 13:28:04 chris Exp $
#
# First try for arm-specific configuration info
#
@ -74,20 +74,6 @@ major {cd = 26}
file arch/cats/cats/autoconf.c
file arch/cats/cats/conf.c
file arch/cats/cats/cats_machdep.c
file arch/arm32/arm32/bus_dma.c
file arch/arm32/arm32/cpuswitch.S
file arch/arm32/arm32/exception.S
file arch/arm32/arm32/fault.c
file arch/arm32/arm32/fusu.S
file arch/arm32/arm32/intr.c
file arch/arm32/arm32/machdep.c
file arch/arm32/arm32/mem.c
file arch/arm32/arm32/procfs_machdep.c procfs
file arch/arm32/arm32/setcpsr.S
file arch/arm32/arm32/setstack.S
file arch/arm32/arm32/spl.S
file arch/arm32/arm32/stubs.c
file arch/arm32/arm32/vm_machdep.c
# library functions

19
sys/arch/dnard/conf/files.dnard
View File

@ -1,4 +1,4 @@
# $NetBSD: files.dnard,v 1.12 2001/06/21 23:11:48 chris Exp $
# $NetBSD: files.dnard,v 1.13 2001/07/28 13:28:04 chris Exp $
#
# First try for arm-specific configuration info
#
@ -83,23 +83,6 @@ include "dev/scsipi/files.scsipi"
major {sd = 24}
major {cd = 26}
# Generic MD files
file arch/arm32/arm32/bus_dma.c
file arch/arm32/arm32/conf.c
file arch/arm32/arm32/cpuswitch.S
file arch/arm32/arm32/exception.S
file arch/arm32/arm32/fault.c
file arch/arm32/arm32/fusu.S
file arch/arm32/arm32/intr.c
file arch/arm32/arm32/machdep.c
file arch/arm32/arm32/mem.c
file arch/arm32/arm32/procfs_machdep.c procfs
file arch/arm32/arm32/setcpsr.S
file arch/arm32/arm32/setstack.S
file arch/arm32/arm32/spl.S
file arch/arm32/arm32/stubs.c
file arch/arm32/arm32/vm_machdep.c
# library functions
file arch/arm/arm/disksubr.c disk

20
sys/arch/netwinder/conf/files.netwinder
View File

@ -1,4 +1,4 @@
# $NetBSD: files.netwinder,v 1.13 2001/06/20 22:14:35 chris Exp $
# $NetBSD: files.netwinder,v 1.14 2001/07/28 13:28:04 chris Exp $
#
# First try for arm-specific configuration info
#
@ -72,27 +72,11 @@ include "dev/scsipi/files.scsipi"
major {sd = 24}
major {cd = 26}
# Generic MD files
file arch/netwinder/netwinder/autoconf.c
file arch/netwinder/netwinder/conf.c
file arch/netwinder/netwinder/netwinder_machdep.c
# Generic MD files
file arch/arm32/arm32/bus_dma.c
file arch/arm32/arm32/cpuswitch.S
file arch/arm32/arm32/stubs.c
file arch/arm32/arm32/exception.S
file arch/arm32/arm32/fault.c
file arch/arm32/arm32/mem.c
file arch/arm32/arm32/procfs_machdep.c procfs
file arch/arm32/arm32/machdep.c
file arch/arm32/arm32/vm_machdep.c
file arch/arm32/arm32/fusu.S
file arch/arm32/arm32/setcpsr.S
file arch/arm32/arm32/setstack.S
file arch/arm32/arm32/spl.S
file arch/arm32/arm32/intr.c
file arch/arm/arm/disksubr.c disk
file arch/arm/arm/disksubr_acorn.c disk
file arch/arm/arm/disksubr_mbr.c disk