diff options
| -rw-r--r-- | sys/arch/amd64/conf/files.amd64 | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 7 | ||||
| -rw-r--r-- | sys/dev/pci/amas.c (renamed from sys/arch/amd64/pci/amas.c) | 4 | ||||
| -rw-r--r-- | sys/dev/pci/amas.h (renamed from sys/arch/amd64/include/amas.h) | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64 index 7101f0b669f..3a83fb1b39b 100644 --- a/sys/arch/amd64/conf/files.amd64 +++ b/sys/arch/amd64/conf/files.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.amd64,v 1.46 2009/04/21 17:05:29 oga Exp $ +# $OpenBSD: files.amd64,v 1.47 2009/05/07 11:30:16 ariane Exp $ maxpartitions 16 maxusers 2 16 128 @@ -116,7 +116,7 @@ file arch/amd64/pci/pchb.c pchb # AMAS AMD memory address switch device amas attach amas at pci -file arch/amd64/pci/amas.c amas +file dev/pci/amas.c amas # AGP bridge support. most attach at pchb include "dev/pci/files.agp" diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 03393729c17..e04f3a48d87 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.656 2009/04/24 21:28:41 mk Exp $ +# $OpenBSD: GENERIC,v 1.657 2009/05/07 11:30:26 ariane Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -92,6 +92,7 @@ glxpcib* at pci? # AMD CS5536 PCI-ISA bridge gpio* at glxpcib? kate* at pci? # AMD K8 temperature sensor km* at pci? # AMD K10 temperature sensor +amas* at pci? disable # AMD memory configuration # power management and other environmental stuff elansc* at pci? # AMD Elan SC520 System Controller diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index f805def876d..9a32b6c71b0 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.188 2009/01/20 20:21:03 mlarkin Exp $ +# $OpenBSD: files.i386,v 1.189 2009/05/07 11:30:26 ariane Exp $ # # new style config file for i386 architecture # @@ -106,6 +106,11 @@ device pchb: pcibus, agpbus attach pchb at pci file arch/i386/pci/pchb.c pchb +# AMAS AMD memory address switch +device amas +attach amas at pci +file dev/pci/amas.c amas + # AGP bridge support. most attach at pchb include "dev/pci/files.agp" file arch/i386/pci/agp_machdep.c agp diff --git a/sys/arch/amd64/pci/amas.c b/sys/dev/pci/amas.c index 0dc07848d04..b4fcb018ff0 100644 --- a/sys/arch/amd64/pci/amas.c +++ b/sys/dev/pci/amas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amas.c,v 1.2 2009/04/20 20:29:11 ariane Exp $ */ +/* $OpenBSD: amas.c,v 1.1 2009/05/07 11:30:27 ariane Exp $ */ /* * Copyright (c) 2009 Ariane van der Steldt <ariane@stack.nl> @@ -24,7 +24,7 @@ * and contains mappings for memory to processor nodes. */ -#include <machine/amas.h> +#include <dev/pci/amas.h> #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/arch/amd64/include/amas.h b/sys/dev/pci/amas.h index ab5b90b942e..930e2f933e7 100644 --- a/sys/arch/amd64/include/amas.h +++ b/sys/dev/pci/amas.h @@ -1,4 +1,4 @@ -/* $OpenBSD: amas.h,v 1.1 2009/04/20 13:26:20 ariane Exp $ */ +/* $OpenBSD: amas.h,v 1.1 2009/05/07 11:30:27 ariane Exp $ */ /* * Copyright (c) 2009 Ariane van der Steldt <ariane@stack.nl> |