diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/armv7/Makefile (renamed from sys/arch/beagle/Makefile) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/armv7_start.S (renamed from sys/arch/beagle/beagle/beagle_start.S) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/autoconf.c (renamed from sys/arch/beagle/beagle/autoconf.c) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/genassym.cf | 1 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/intr.c (renamed from sys/arch/beagle/beagle/intr.c) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/uboot_tags.c (renamed from sys/arch/beagle/beagle/uboot_tags.c) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/compile/.cvsignore (renamed from sys/arch/beagle/compile/.cvsignore) | 0 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/GENERIC-OMAP (renamed from sys/arch/beagle/conf/GENERIC) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/Makefile.armv7 (renamed from sys/arch/beagle/conf/Makefile.beagle) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/RAMDISK-OMAP (renamed from sys/arch/beagle/conf/RAMDISK) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/files.armv7 (renamed from sys/arch/beagle/conf/files.beagle) | 58 | ||||
| -rw-r--r-- | sys/arch/armv7/include/_float.h | 3 | ||||
| -rw-r--r-- | sys/arch/armv7/include/_types.h (renamed from sys/arch/beagle/include/_types.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/apmvar.h | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/asm.h (renamed from sys/arch/beagle/include/asm.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/atomic.h (renamed from sys/arch/beagle/include/atomic.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/bootconfig.h (renamed from sys/arch/beagle/include/bootconfig.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/bus.h (renamed from sys/arch/beagle/include/bus.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/cdefs.h | 3 | ||||
| -rw-r--r-- | sys/arch/armv7/include/conf.h (renamed from sys/arch/beagle/include/conf.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/cpu.h (renamed from sys/arch/beagle/include/cpu.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/db_machdep.h (renamed from sys/arch/beagle/include/db_machdep.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/disklabel.h | 3 | ||||
| -rw-r--r-- | sys/arch/armv7/include/elf_abi.h | 3 | ||||
| -rw-r--r-- | sys/arch/armv7/include/endian.h (renamed from sys/arch/beagle/include/endian.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/exec.h | 3 | ||||
| -rw-r--r-- | sys/arch/armv7/include/fenv.h | 3 | ||||
| -rw-r--r-- | sys/arch/armv7/include/fp.h (renamed from sys/arch/beagle/include/fp.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/frame.h (renamed from sys/arch/beagle/include/frame.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/ieee.h (renamed from sys/arch/beagle/include/ieee.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/ieeefp.h (renamed from sys/arch/beagle/include/ieeefp.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/intr.h (renamed from sys/arch/beagle/include/intr.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/irqhandler.h (renamed from sys/arch/beagle/include/irqhandler.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/isa_machdep.h (renamed from sys/arch/beagle/include/isa_machdep.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/limits.h (renamed from sys/arch/beagle/include/limits.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/loadfile_machdep.h (renamed from sys/arch/beagle/include/loadfile_machdep.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/lock.h (renamed from sys/arch/beagle/include/lock.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/machine_reg.h (renamed from sys/arch/beagle/include/machine_reg.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/math.h (renamed from sys/arch/beagle/include/math.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/mutex.h | 3 | ||||
| -rw-r--r-- | sys/arch/armv7/include/param.h (renamed from sys/arch/beagle/include/param.h) | 6 | ||||
| -rw-r--r-- | sys/arch/armv7/include/pcb.h (renamed from sys/arch/beagle/include/pcb.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/pio.h (renamed from sys/arch/beagle/include/pio.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/pmap.h (renamed from sys/arch/beagle/include/pmap.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/proc.h (renamed from sys/arch/beagle/include/proc.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/profile.h (renamed from sys/arch/beagle/include/profile.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/ptrace.h (renamed from sys/arch/beagle/include/ptrace.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/reg.h (renamed from sys/arch/beagle/include/reg.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/reloc.h | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/rtc.h (renamed from sys/arch/beagle/include/rtc.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/setjmp.h (renamed from sys/arch/beagle/include/setjmp.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/signal.h (renamed from sys/arch/beagle/include/signal.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/spinlock.h (renamed from sys/arch/beagle/include/spinlock.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/stdarg.h (renamed from sys/arch/beagle/include/stdarg.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/sysarch.h (renamed from sys/arch/beagle/include/sysarch.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/tcb.h | 3 | ||||
| -rw-r--r-- | sys/arch/armv7/include/trap.h (renamed from sys/arch/beagle/include/trap.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/include/vmparam.h (renamed from sys/arch/beagle/include/vmparam.h) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/am335x.c (renamed from sys/arch/beagle/dev/am335x.c) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/am335x_cm_padconf.c (renamed from sys/arch/beagle/dev/am335x_cm_padconf.c) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/am335x_prcmreg.h (renamed from sys/arch/beagle/dev/am335x_prcmreg.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/beagle_machdep.c (renamed from sys/arch/beagle/beagle/beagle_machdep.c) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/dmtimer.c (renamed from sys/arch/beagle/dev/dmtimer.c) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/gptimer.c (renamed from sys/arch/beagle/dev/gptimer.c) | 6 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/if_cpsw.c (renamed from sys/arch/beagle/dev/if_cpsw.c) | 8 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/if_cpswreg.h (renamed from sys/arch/beagle/dev/if_cpswreg.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/intc.c (renamed from sys/arch/beagle/dev/intc.c) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/intc.h (renamed from sys/arch/beagle/dev/intc.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omap.c (renamed from sys/arch/beagle/dev/omap.c) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omap3.c (renamed from sys/arch/beagle/dev/omap3.c) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omap3_prcmreg.h (renamed from sys/arch/beagle/dev/omap3_prcmreg.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omap4.c (renamed from sys/arch/beagle/dev/omap4.c) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omap4_prcmreg.h (renamed from sys/arch/beagle/dev/omap4_prcmreg.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omap_com.c (renamed from sys/arch/beagle/dev/omap_com.c) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omapid.c (renamed from sys/arch/beagle/dev/omapid.c) | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omapvar.h (renamed from sys/arch/beagle/dev/omapvar.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omdisplay.c (renamed from sys/arch/beagle/dev/omdisplay.c) | 6 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omdog.c (renamed from sys/arch/beagle/dev/omdog.c) | 6 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omehci.c (renamed from sys/arch/beagle/dev/omehci.c) | 10 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omehcivar.h (renamed from sys/arch/beagle/dev/omehcivar.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omgpio.c (renamed from sys/arch/beagle/dev/omgpio.c) | 6 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omgpiovar.h (renamed from sys/arch/beagle/dev/omgpiovar.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/ommmc.c (renamed from sys/arch/beagle/dev/ommmc.c) | 6 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omohci.c (renamed from sys/arch/beagle/dev/omohci.c) | 6 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/omusbtll.c (renamed from sys/arch/beagle/dev/omusbtll.c) | 6 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/prcm.c (renamed from sys/arch/beagle/dev/prcm.c) | 12 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/prcmvar.h (renamed from sys/arch/beagle/dev/prcmvar.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/sitara_cm.c (renamed from sys/arch/beagle/dev/sitara_cm.c) | 8 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/sitara_cm.h (renamed from sys/arch/beagle/dev/sitara_cm.h) | 2 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/sitara_cmreg.h (renamed from sys/arch/beagle/dev/sitara_cmreg.h) | 2 | ||||
| -rw-r--r-- | sys/arch/beagle/beagle/genassym.cf | 1 | ||||
| -rw-r--r-- | sys/arch/beagle/include/_float.h | 3 | ||||
| -rw-r--r-- | sys/arch/beagle/include/apmvar.h | 2 | ||||
| -rw-r--r-- | sys/arch/beagle/include/beagle_intr.h | 119 | ||||
| -rw-r--r-- | sys/arch/beagle/include/cdefs.h | 3 | ||||
| -rw-r--r-- | sys/arch/beagle/include/disklabel.h | 3 | ||||
| -rw-r--r-- | sys/arch/beagle/include/elf_abi.h | 3 | ||||
| -rw-r--r-- | sys/arch/beagle/include/exec.h | 3 | ||||
| -rw-r--r-- | sys/arch/beagle/include/fenv.h | 3 | ||||
| -rw-r--r-- | sys/arch/beagle/include/mutex.h | 3 | ||||
| -rw-r--r-- | sys/arch/beagle/include/reloc.h | 2 | ||||
| -rw-r--r-- | sys/arch/beagle/include/tcb.h | 3 |
102 files changed, 179 insertions, 298 deletions
diff --git a/sys/arch/beagle/Makefile b/sys/arch/armv7/Makefile index 94fd7900f49..dec7bf5711a 100644 --- a/sys/arch/beagle/Makefile +++ b/sys/arch/armv7/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2013/03/26 19:43:01 jasper Exp $ +# $OpenBSD: Makefile,v 1.1 2013/09/04 14:38:24 patrick Exp $ S= ${.CURDIR}/../.. KFILE= GENERIC diff --git a/sys/arch/beagle/beagle/beagle_start.S b/sys/arch/armv7/armv7/armv7_start.S index dfd3668b3da..cdea7be2464 100644 --- a/sys/arch/beagle/beagle/beagle_start.S +++ b/sys/arch/armv7/armv7/armv7_start.S @@ -1,4 +1,4 @@ -/* $OpenBSD: beagle_start.S,v 1.5 2013/05/01 13:49:18 patrick Exp $ */ +/* $OpenBSD: armv7_start.S,v 1.1 2013/09/04 14:38:25 patrick Exp $ */ /* $NetBSD: lubbock_start.S,v 1.1 2003/06/18 10:51:15 bsh Exp $ */ /* diff --git a/sys/arch/beagle/beagle/autoconf.c b/sys/arch/armv7/armv7/autoconf.c index 3ab3a815231..5f89e5ddf5c 100644 --- a/sys/arch/beagle/beagle/autoconf.c +++ b/sys/arch/armv7/armv7/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.3 2011/09/20 22:02:13 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.1 2013/09/04 14:38:25 patrick Exp $ */ /* $NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $ */ /* diff --git a/sys/arch/armv7/armv7/genassym.cf b/sys/arch/armv7/armv7/genassym.cf new file mode 100644 index 00000000000..15907109403 --- /dev/null +++ b/sys/arch/armv7/armv7/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.1 2013/09/04 14:38:25 patrick Exp $ diff --git a/sys/arch/beagle/beagle/intr.c b/sys/arch/armv7/armv7/intr.c index 2e97762694e..cdd74cb11e5 100644 --- a/sys/arch/beagle/beagle/intr.c +++ b/sys/arch/armv7/armv7/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.6 2013/05/10 00:18:42 patrick Exp $ */ +/* $OpenBSD: intr.c,v 1.1 2013/09/04 14:38:25 patrick Exp $ */ /* * Copyright (c) 2011 Dale Rahn <drahn@openbsd.org> * diff --git a/sys/arch/beagle/beagle/uboot_tags.c b/sys/arch/armv7/armv7/uboot_tags.c index 30198580986..b89cdafa87f 100644 --- a/sys/arch/beagle/beagle/uboot_tags.c +++ b/sys/arch/armv7/armv7/uboot_tags.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uboot_tags.c,v 1.3 2011/11/08 22:41:41 krw Exp $ */ +/* $OpenBSD: uboot_tags.c,v 1.1 2013/09/04 14:38:25 patrick Exp $ */ /* * Copyright (c) 2011 Dale Rahn <drahn@openbsd.org> * diff --git a/sys/arch/beagle/compile/.cvsignore b/sys/arch/armv7/compile/.cvsignore index b72af3039e6..b72af3039e6 100644 --- a/sys/arch/beagle/compile/.cvsignore +++ b/sys/arch/armv7/compile/.cvsignore diff --git a/sys/arch/beagle/conf/GENERIC b/sys/arch/armv7/conf/GENERIC-OMAP index e762b1c4619..4608c171198 100644 --- a/sys/arch/beagle/conf/GENERIC +++ b/sys/arch/armv7/conf/GENERIC-OMAP @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.22 2013/08/20 14:27:26 ajacoutot Exp $ +# $OpenBSD: GENERIC-OMAP,v 1.1 2013/09/04 14:38:25 patrick Exp $ # # GENERIC machine description file # @@ -18,7 +18,7 @@ # of each device driver in this file see the section 4 man page for the # device. -machine beagle arm +machine armv7 arm include "../../../conf/GENERIC" options TIMEZONE=0 # time zone to adjust RTC time by options DST=0 # daylight saving time used by RTC diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/armv7/conf/Makefile.armv7 index a8f4734a17b..684267cd716 100644 --- a/sys/arch/beagle/conf/Makefile.beagle +++ b/sys/arch/armv7/conf/Makefile.armv7 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.beagle,v 1.45 2013/08/02 09:09:17 rapha Exp $ +# $OpenBSD: Makefile.armv7,v 1.1 2013/09/04 14:38:25 patrick Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK-OMAP index b4954fbaaa8..eada81b6159 100644 --- a/sys/arch/beagle/conf/RAMDISK +++ b/sys/arch/armv7/conf/RAMDISK-OMAP @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.24 2013/08/20 14:27:26 ajacoutot Exp $ +# $OpenBSD: RAMDISK-OMAP,v 1.1 2013/09/04 14:38:25 patrick Exp $ # # GENERIC machine description file # @@ -18,7 +18,7 @@ # of each device driver in this file see the section 4 man page for the # device. -machine beagle arm +machine armv7 arm options TIMEZONE=0 # time zone to adjust RTC time by options DST=0 # daylight saving time used by RTC diff --git a/sys/arch/beagle/conf/files.beagle b/sys/arch/armv7/conf/files.armv7 index 37f26d7c41a..da7931d8204 100644 --- a/sys/arch/beagle/conf/files.beagle +++ b/sys/arch/armv7/conf/files.armv7 @@ -1,4 +1,4 @@ -# $OpenBSD: files.beagle,v 1.19 2013/06/11 19:19:43 rapha Exp $ +# $OpenBSD: files.armv7,v 1.1 2013/09/04 14:38:25 patrick Exp $ # # First try for arm-specific configuration info # @@ -13,13 +13,13 @@ major {rd = 18} file arch/arm/arm/conf.c -file arch/beagle/beagle/beagle_machdep.c +file arch/armv7/omap/beagle_machdep.c #interrupt API layer -file arch/beagle/beagle/intr.c +file arch/armv7/armv7/intr.c # u-boot argument support -file arch/beagle/beagle/uboot_tags.c +file arch/armv7/armv7/uboot_tags.c # note that the order of the devices in _this_ file # affects the order that the devices will configure. @@ -28,79 +28,79 @@ file arch/beagle/beagle/uboot_tags.c define soc {} device omap: soc attach omap at mainbus -file arch/beagle/dev/omap.c omap -file arch/beagle/dev/omap3.c omap -file arch/beagle/dev/omap4.c omap -file arch/beagle/dev/am335x.c omap +file arch/armv7/omap/omap.c omap +file arch/armv7/omap/omap3.c omap +file arch/armv7/omap/omap4.c omap +file arch/armv7/omap/am335x.c omap include "dev/sdmmc/files.sdmmc" device ommmc: sdmmcbus attach ommmc at soc -file arch/beagle/dev/ommmc.c ommmc +file arch/armv7/omap/ommmc.c ommmc # Media Independent Interface (mii) include "dev/mii/files.mii" device cpsw: ether, ifnet, mii, ifmedia attach cpsw at soc -file arch/beagle/dev/if_cpsw.c cpsw +file arch/armv7/omap/if_cpsw.c cpsw device prcm attach prcm at soc -file arch/beagle/dev/prcm.c prcm +file arch/armv7/omap/prcm.c prcm device sitaracm attach sitaracm at soc -file arch/beagle/dev/am335x_cm_padconf.c sitaracm -file arch/beagle/dev/sitara_cm.c sitaracm +file arch/armv7/omap/am335x_cm_padconf.c sitaracm +file arch/armv7/omap/sitara_cm.c sitaracm device omgpio attach omgpio at soc -file arch/beagle/dev/omgpio.c omgpio +file arch/armv7/omap/omgpio.c omgpio device intc attach intc at soc -file arch/beagle/dev/intc.c intc +file arch/armv7/omap/intc.c intc device gptimer attach gptimer at soc -file arch/beagle/dev/gptimer.c gptimer +file arch/armv7/omap/gptimer.c gptimer device dmtimer attach dmtimer at soc -file arch/beagle/dev/dmtimer.c dmtimer +file arch/armv7/omap/dmtimer.c dmtimer device omapid attach omapid at soc -file arch/beagle/dev/omapid.c omapid +file arch/armv7/omap/omapid.c omapid device omdog attach omdog at soc -file arch/beagle/dev/omdog.c omdog +file arch/armv7/omap/omdog.c omdog attach ohci at soc with omohci -file arch/beagle/dev/omohci.c omohci +file arch/armv7/omap/omohci.c omohci attach ehci at soc with omehci -file arch/beagle/dev/omehci.c omehci +file arch/armv7/omap/omehci.c omehci # NS16550 compatible serial ports attach com at soc with com_omap -file arch/beagle/dev/omap_com.c com_omap +file arch/armv7/omap/omap_com.c com_omap device omusbtll attach omusbtll at soc -file arch/beagle/dev/omusbtll.c omusbtll +file arch/armv7/omap/omusbtll.c omusbtll device omkbd: wskbddev attach omkbd at soc -file arch/beagle/dev/omkbd.c omkbd +file arch/armv7/omap/omkbd.c omkbd # LCD frame buffer device omdisplay: wsemuldisplaydev, rasops16 attach omdisplay at soc -file arch/beagle/dev/omdisplay.c omdisplay +file arch/armv7/omap/omdisplay.c omdisplay # # Machine-independent SCSI drivers @@ -110,17 +110,17 @@ include "dev/atapiscsi/files.atapiscsi" # CPU support and integrated peripherals file arch/arm/arm/irq_dispatch.S -file arch/arm/arm/softintr.c +file arch/arm/arm/softintr.c # MCSPI - spi device mcspi attach mcspi at soc -file arch/beagle/dev/mcspi.c mcspi +file arch/armv7/omap/mcspi.c mcspi # pseudo-Audio Device Driver device oaudio: audio attach oaudio at soc # configure after Atlas Driver -file arch/beagle/dev/beagle_audio.c oaudio +file arch/armv7/omap/beagle_audio.c oaudio # # Machine-independent ATA drivers @@ -128,7 +128,7 @@ file arch/beagle/dev/beagle_audio.c oaudio include "dev/ata/files.ata" # Generic MD files -file arch/beagle/beagle/autoconf.c +file arch/armv7/armv7/autoconf.c file arch/arm/arm/disksubr.c disk diff --git a/sys/arch/armv7/include/_float.h b/sys/arch/armv7/include/_float.h new file mode 100644 index 00000000000..c4221bb54ef --- /dev/null +++ b/sys/arch/armv7/include/_float.h @@ -0,0 +1,3 @@ +/* $OpenBSD: _float.h,v 1.1 2013/09/04 14:38:26 patrick Exp $ */ + +#include <arm/_float.h> diff --git a/sys/arch/beagle/include/_types.h b/sys/arch/armv7/include/_types.h index 10dca61f0f7..0386d33665f 100644 --- a/sys/arch/beagle/include/_types.h +++ b/sys/arch/armv7/include/_types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: _types.h,v 1.4 2012/11/05 19:39:34 miod Exp $ */ +/* $OpenBSD: _types.h,v 1.1 2013/09/04 14:38:26 patrick Exp $ */ /* $NetBSD: types.h,v 1.4 2002/02/28 03:17:26 simonb Exp $ */ #ifndef _MACHINE__TYPES_H_ diff --git a/sys/arch/armv7/include/apmvar.h b/sys/arch/armv7/include/apmvar.h new file mode 100644 index 00000000000..fba87cca21c --- /dev/null +++ b/sys/arch/armv7/include/apmvar.h @@ -0,0 +1,2 @@ +/* $OpenBSD: apmvar.h,v 1.1 2013/09/04 14:38:26 patrick Exp $ */ +#include <arm/apmvar.h> diff --git a/sys/arch/beagle/include/asm.h b/sys/arch/armv7/include/asm.h index 0b7b4d32bea..be539ee9aa6 100644 --- a/sys/arch/beagle/include/asm.h +++ b/sys/arch/armv7/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: asm.h,v 1.1 2013/09/04 14:38:26 patrick Exp $ */ /* $NetBSD: asm.h,v 1.3 2001/11/25 15:55:54 thorpej Exp $ */ #include <arm/asm.h> diff --git a/sys/arch/beagle/include/atomic.h b/sys/arch/armv7/include/atomic.h index c50298299da..c065443dd6c 100644 --- a/sys/arch/beagle/include/atomic.h +++ b/sys/arch/armv7/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $ */ +/* $OpenBSD: atomic.h,v 1.1 2013/09/04 14:38:26 patrick Exp $ */ /* Public Domain */ diff --git a/sys/arch/beagle/include/bootconfig.h b/sys/arch/armv7/include/bootconfig.h index cec496f2ac7..af5bea555b5 100644 --- a/sys/arch/beagle/include/bootconfig.h +++ b/sys/arch/armv7/include/bootconfig.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bootconfig.h,v 1.4 2011/11/08 22:41:41 krw Exp $ */ +/* $OpenBSD: bootconfig.h,v 1.1 2013/09/04 14:38:26 patrick Exp $ */ /* $NetBSD: bootconfig.h,v 1.2 2001/06/21 22:08:28 chris Exp $ */ /* diff --git a/sys/arch/beagle/include/bus.h b/sys/arch/armv7/include/bus.h index 6b55d2f27bb..ed737761885 100644 --- a/sys/arch/beagle/include/bus.h +++ b/sys/arch/armv7/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: bus.h,v 1.1 2013/09/04 14:38:26 patrick Exp $ */ /* $NetBSD: bus.h,v 1.3 2001/11/25 15:55:55 thorpej Exp $ */ #include <arm/bus.h> diff --git a/sys/arch/armv7/include/cdefs.h b/sys/arch/armv7/include/cdefs.h new file mode 100644 index 00000000000..38568967257 --- /dev/null +++ b/sys/arch/armv7/include/cdefs.h @@ -0,0 +1,3 @@ +/* $OpenBSD: cdefs.h,v 1.1 2013/09/04 14:38:26 patrick Exp $ */ + +#include <arm/cdefs.h> diff --git a/sys/arch/beagle/include/conf.h b/sys/arch/armv7/include/conf.h index e5b6957e60b..45b48a90bd1 100644 --- a/sys/arch/beagle/include/conf.h +++ b/sys/arch/armv7/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ +/* $OpenBSD: conf.h,v 1.1 2013/09/04 14:38:26 patrick Exp $ */ /* $NetBSD: conf.h,v 1.8 2002/02/10 12:26:03 chris Exp $ */ #ifndef _MACHINE_CONF_H_ diff --git a/sys/arch/beagle/include/cpu.h b/sys/arch/armv7/include/cpu.h index 69f0002995b..47355cfe7d5 100644 --- a/sys/arch/beagle/include/cpu.h +++ b/sys/arch/armv7/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: cpu.h,v 1.1 2013/09/04 14:38:26 patrick Exp $ */ /* $NetBSD: cpu.h,v 1.3 2001/11/25 15:55:55 thorpej Exp $ */ #include <arm/cpu.h> diff --git a/sys/arch/beagle/include/db_machdep.h b/sys/arch/armv7/include/db_machdep.h index fb95a7557b9..d745bf8b3ad 100644 --- a/sys/arch/beagle/include/db_machdep.h +++ b/sys/arch/armv7/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.1 2013/09/04 14:38:26 patrick Exp $ */ /* $NetBSD: db_machdep.h,v 1.3 2001/11/25 15:55:55 thorpej Exp $ */ #include <arm/db_machdep.h> diff --git a/sys/arch/armv7/include/disklabel.h b/sys/arch/armv7/include/disklabel.h new file mode 100644 index 00000000000..3e247714db8 --- /dev/null +++ b/sys/arch/armv7/include/disklabel.h @@ -0,0 +1,3 @@ +/* $OpenBSD: disklabel.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ + +#include <arm/disklabel.h> diff --git a/sys/arch/armv7/include/elf_abi.h b/sys/arch/armv7/include/elf_abi.h new file mode 100644 index 00000000000..1c357929f37 --- /dev/null +++ b/sys/arch/armv7/include/elf_abi.h @@ -0,0 +1,3 @@ +/* $OpenBSD: elf_abi.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ + +#include <arm/elf_abi.h> diff --git a/sys/arch/beagle/include/endian.h b/sys/arch/armv7/include/endian.h index f64d927dcad..a42218e287c 100644 --- a/sys/arch/beagle/include/endian.h +++ b/sys/arch/armv7/include/endian.h @@ -1,4 +1,4 @@ -/* $OpenBSD: endian.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: endian.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ /* $NetBSD: endian.h,v 1.3 2001/11/25 15:55:56 thorpej Exp $ */ #include <arm/endian.h> diff --git a/sys/arch/armv7/include/exec.h b/sys/arch/armv7/include/exec.h new file mode 100644 index 00000000000..cb2f13ed47a --- /dev/null +++ b/sys/arch/armv7/include/exec.h @@ -0,0 +1,3 @@ +/* $OpenBSD: exec.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ +/* public domain */ +#include <arm/exec.h> diff --git a/sys/arch/armv7/include/fenv.h b/sys/arch/armv7/include/fenv.h new file mode 100644 index 00000000000..4c9789036b1 --- /dev/null +++ b/sys/arch/armv7/include/fenv.h @@ -0,0 +1,3 @@ +/* $OpenBSD: fenv.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ +/* public domain */ +#include <arm/fenv.h> diff --git a/sys/arch/beagle/include/fp.h b/sys/arch/armv7/include/fp.h index 4889497285b..4dd646a0c47 100644 --- a/sys/arch/beagle/include/fp.h +++ b/sys/arch/armv7/include/fp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fp.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: fp.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ /* $NetBSD: fp.h,v 1.3 2001/11/25 15:55:56 thorpej Exp $ */ #include <arm/fp.h> diff --git a/sys/arch/beagle/include/frame.h b/sys/arch/armv7/include/frame.h index 11efab620eb..bff2cd0537b 100644 --- a/sys/arch/beagle/include/frame.h +++ b/sys/arch/armv7/include/frame.h @@ -1,4 +1,4 @@ -/* $OpenBSD: frame.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: frame.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ /* $NetBSD: frame.h,v 1.1 2001/06/08 22:23:00 chris Exp $ */ #include <arm/frame.h> diff --git a/sys/arch/beagle/include/ieee.h b/sys/arch/armv7/include/ieee.h index f2607f2c3de..ebff5a088e5 100644 --- a/sys/arch/beagle/include/ieee.h +++ b/sys/arch/armv7/include/ieee.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: ieee.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ /* $NetBSD: ieee.h,v 1.3 2001/11/25 15:55:56 thorpej Exp $ */ #include <arm/ieee.h> diff --git a/sys/arch/beagle/include/ieeefp.h b/sys/arch/armv7/include/ieeefp.h index 7349d3c60e8..ad4c6a7a086 100644 --- a/sys/arch/beagle/include/ieeefp.h +++ b/sys/arch/armv7/include/ieeefp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieeefp.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ /* $NetBSD: ieeefp.h,v 1.3 2001/11/25 15:55:56 thorpej Exp $ */ #include <arm/ieeefp.h> diff --git a/sys/arch/beagle/include/intr.h b/sys/arch/armv7/include/intr.h index bedeccd60c5..d5206fa1d8c 100644 --- a/sys/arch/beagle/include/intr.h +++ b/sys/arch/armv7/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.8 2013/05/17 19:38:51 kettenis Exp $ */ +/* $OpenBSD: intr.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ /* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */ /* diff --git a/sys/arch/beagle/include/irqhandler.h b/sys/arch/armv7/include/irqhandler.h index 58a2e53b2a2..a4b8b14727e 100644 --- a/sys/arch/beagle/include/irqhandler.h +++ b/sys/arch/armv7/include/irqhandler.h @@ -1,4 +1,4 @@ -/* $OpenBSD: irqhandler.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: irqhandler.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ /* $NetBSD: irqhandler.h,v 1.4 2002/04/12 18:50:32 thorpej Exp $ */ #include <arm/footbridge/footbridge_irqhandler.h> diff --git a/sys/arch/beagle/include/isa_machdep.h b/sys/arch/armv7/include/isa_machdep.h index 38b9b56e7ad..1a10064863a 100644 --- a/sys/arch/beagle/include/isa_machdep.h +++ b/sys/arch/armv7/include/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ /* $NetBSD: isa_machdep.h,v 1.4 2002/01/07 22:58:08 chris Exp $ */ #ifndef _MACHINE_ISA_MACHDEP_H_ diff --git a/sys/arch/beagle/include/limits.h b/sys/arch/armv7/include/limits.h index fa906684169..a9f31ed71e8 100644 --- a/sys/arch/beagle/include/limits.h +++ b/sys/arch/armv7/include/limits.h @@ -1,4 +1,4 @@ -/* $OpenBSD: limits.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: limits.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */ /* $NetBSD: limits.h,v 1.3 2001/11/25 15:55:57 thorpej Exp $ */ #include <arm/limits.h> diff --git a/sys/arch/beagle/include/loadfile_machdep.h b/sys/arch/armv7/include/loadfile_machdep.h index 4adb2d36a35..c552f9c024b 100644 --- a/sys/arch/beagle/include/loadfile_machdep.h +++ b/sys/arch/armv7/include/loadfile_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: loadfile_machdep.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: loadfile_machdep.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* $NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $ */ /*- diff --git a/sys/arch/beagle/include/lock.h b/sys/arch/armv7/include/lock.h index 71ba02fede2..9efccf650f0 100644 --- a/sys/arch/beagle/include/lock.h +++ b/sys/arch/armv7/include/lock.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lock.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: lock.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* $NetBSD: lock.h,v 1.3 2001/11/25 15:55:57 thorpej Exp $ */ #include <arm/lock.h> diff --git a/sys/arch/beagle/include/machine_reg.h b/sys/arch/armv7/include/machine_reg.h index 7d9c6c87cab..5b0fd83d8b9 100644 --- a/sys/arch/beagle/include/machine_reg.h +++ b/sys/arch/armv7/include/machine_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: machine_reg.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: machine_reg.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* * Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved. diff --git a/sys/arch/beagle/include/math.h b/sys/arch/armv7/include/math.h index e83f96ad786..320751fb0f1 100644 --- a/sys/arch/beagle/include/math.h +++ b/sys/arch/armv7/include/math.h @@ -1,4 +1,4 @@ -/* $OpenBSD: math.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: math.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* $NetBSD: math.h,v 1.3 2001/11/25 15:55:57 thorpej Exp $ */ #include <arm/math.h> diff --git a/sys/arch/armv7/include/mutex.h b/sys/arch/armv7/include/mutex.h new file mode 100644 index 00000000000..b5327262054 --- /dev/null +++ b/sys/arch/armv7/include/mutex.h @@ -0,0 +1,3 @@ +/* $OpenBSD: mutex.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ +/* public domain */ +#include <arm/mutex.h> diff --git a/sys/arch/beagle/include/param.h b/sys/arch/armv7/include/param.h index c75f2c6cf40..be5c69c5cd2 100644 --- a/sys/arch/beagle/include/param.h +++ b/sys/arch/armv7/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.4 2013/03/23 16:12:21 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -37,8 +37,8 @@ #include <arm/param.h> -#define _MACHINE beagle -#define MACHINE "beagle" +#define _MACHINE armv7 +#define MACHINE "armv7" #ifndef MSGBUFSIZE #define MSGBUFSIZE PAGE_SIZE diff --git a/sys/arch/beagle/include/pcb.h b/sys/arch/armv7/include/pcb.h index 6c64664a214..4504e32e354 100644 --- a/sys/arch/beagle/include/pcb.h +++ b/sys/arch/armv7/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: pcb.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* $NetBSD: pcb.h,v 1.3 2001/11/25 15:55:57 thorpej Exp $ */ #include <arm/pcb.h> diff --git a/sys/arch/beagle/include/pio.h b/sys/arch/armv7/include/pio.h index b391a5e1180..049f9d556cb 100644 --- a/sys/arch/beagle/include/pio.h +++ b/sys/arch/armv7/include/pio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pio.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: pio.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* $NetBSD: pio.h,v 1.3 2001/12/07 23:09:33 chris Exp $ */ #include <arm/pio.h> diff --git a/sys/arch/beagle/include/pmap.h b/sys/arch/armv7/include/pmap.h index a8595e496bf..0a56b0b7d1b 100644 --- a/sys/arch/beagle/include/pmap.h +++ b/sys/arch/armv7/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.3 2013/05/18 18:07:11 patrick Exp $ */ +/* $OpenBSD: pmap.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* $NetBSD: pmap.h,v 1.2 2001/11/23 17:29:01 thorpej Exp $ */ #include <arm/pmap.h> diff --git a/sys/arch/beagle/include/proc.h b/sys/arch/armv7/include/proc.h index a681b50f559..e18ccb48a2d 100644 --- a/sys/arch/beagle/include/proc.h +++ b/sys/arch/armv7/include/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: proc.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* $NetBSD: proc.h,v 1.3 2001/11/25 15:55:57 thorpej Exp $ */ #include <arm/proc.h> diff --git a/sys/arch/beagle/include/profile.h b/sys/arch/armv7/include/profile.h index def15897ddd..6c330755ce5 100644 --- a/sys/arch/beagle/include/profile.h +++ b/sys/arch/armv7/include/profile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: profile.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: profile.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* $NetBSD: profile.h,v 1.3 2001/11/25 15:55:57 thorpej Exp $ */ #include <arm/profile.h> diff --git a/sys/arch/beagle/include/ptrace.h b/sys/arch/armv7/include/ptrace.h index 1b725a71c17..0756d1778e4 100644 --- a/sys/arch/beagle/include/ptrace.h +++ b/sys/arch/armv7/include/ptrace.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ptrace.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: ptrace.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* $NetBSD: ptrace.h,v 1.3 2001/11/25 15:55:58 thorpej Exp $ */ #include <arm/ptrace.h> diff --git a/sys/arch/beagle/include/reg.h b/sys/arch/armv7/include/reg.h index baafc964fe0..51f5c4bae72 100644 --- a/sys/arch/beagle/include/reg.h +++ b/sys/arch/armv7/include/reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: reg.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: reg.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */ /* $NetBSD: reg.h,v 1.3 2001/11/25 15:55:58 thorpej Exp $ */ #include <arm/reg.h> diff --git a/sys/arch/armv7/include/reloc.h b/sys/arch/armv7/include/reloc.h new file mode 100644 index 00000000000..a89cedb5244 --- /dev/null +++ b/sys/arch/armv7/include/reloc.h @@ -0,0 +1,2 @@ +/* $OpenBSD: reloc.h,v 1.1 2013/09/04 14:38:29 patrick Exp $ */ +#include <arm/reloc.h> diff --git a/sys/arch/beagle/include/rtc.h b/sys/arch/armv7/include/rtc.h index 864b0d84d69..22bc2fb168f 100644 --- a/sys/arch/beagle/include/rtc.h +++ b/sys/arch/armv7/include/rtc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtc.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: rtc.h,v 1.1 2013/09/04 14:38:29 patrick Exp $ */ /* $NetBSD: rtc.h,v 1.2 2001/11/25 15:55:58 thorpej Exp $ */ #include <arm/rtc.h> diff --git a/sys/arch/beagle/include/setjmp.h b/sys/arch/armv7/include/setjmp.h index 9c1920111ba..a272589a426 100644 --- a/sys/arch/beagle/include/setjmp.h +++ b/sys/arch/armv7/include/setjmp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: setjmp.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: setjmp.h,v 1.1 2013/09/04 14:38:29 patrick Exp $ */ /* $NetBSD: setjmp.h,v 1.3 2001/11/25 15:55:58 thorpej Exp $ */ #include <arm/setjmp.h> diff --git a/sys/arch/beagle/include/signal.h b/sys/arch/armv7/include/signal.h index e1f6a5d4304..c47647906a3 100644 --- a/sys/arch/beagle/include/signal.h +++ b/sys/arch/armv7/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: signal.h,v 1.1 2013/09/04 14:38:29 patrick Exp $ */ /* $NetBSD: signal.h,v 1.3 2001/11/25 15:55:58 thorpej Exp $ */ #include <arm/signal.h> diff --git a/sys/arch/beagle/include/spinlock.h b/sys/arch/armv7/include/spinlock.h index a2a2e05abf2..658a10c1506 100644 --- a/sys/arch/beagle/include/spinlock.h +++ b/sys/arch/armv7/include/spinlock.h @@ -1,5 +1,5 @@ -/* $OpenBSD: spinlock.h,v 1.3 2013/01/23 20:49:55 patrick Exp $ */ +/* $OpenBSD: spinlock.h,v 1.1 2013/09/04 14:38:29 patrick Exp $ */ #ifndef _MACHINE_SPINLOCK_H_ #define _MACHINE_SPINLOCK_H_ #define ARM_V7PLUS_LOCKS diff --git a/sys/arch/beagle/include/stdarg.h b/sys/arch/armv7/include/stdarg.h index 98b6c33c95a..efa9b53b589 100644 --- a/sys/arch/beagle/include/stdarg.h +++ b/sys/arch/armv7/include/stdarg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdarg.h,v 1.1 2009/05/08 03:13:27 drahn Exp $ */ +/* $OpenBSD: stdarg.h,v 1.1 2013/09/04 14:38:29 patrick Exp $ */ /* $NetBSD: stdarg.h,v 1.3 2001/11/25 15:55:58 thorpej Exp $ */ #include <arm/stdarg.h> diff --git a/sys/arch/beagle/include/sysarch.h b/sys/arch/armv7/include/sysarch.h index d8849aa6928..ea34b05ad6f 100644 --- a/sys/arch/beagle/include/sysarch.h +++ b/sys/arch/armv7/include/sysarch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysarch.h,v 1.1 2009/05/08 03:13:27 drahn Exp $ */ +/* $OpenBSD: sysarch.h,v 1.1 2013/09/04 14:38:29 patrick Exp $ */ /* $NetBSD: sysarch.h,v 1.3 2001/11/25 15:55:58 thorpej Exp $ */ #include <arm/sysarch.h> diff --git a/sys/arch/armv7/include/tcb.h b/sys/arch/armv7/include/tcb.h new file mode 100644 index 00000000000..2c10de4e197 --- /dev/null +++ b/sys/arch/armv7/include/tcb.h @@ -0,0 +1,3 @@ +/* $OpenBSD: tcb.h,v 1.1 2013/09/04 14:38:29 patrick Exp $ */ +/* public domain */ +#include <arm/tcb.h> diff --git a/sys/arch/beagle/include/trap.h b/sys/arch/armv7/include/trap.h index aafdc1a5c08..24985eabbdb 100644 --- a/sys/arch/beagle/include/trap.h +++ b/sys/arch/armv7/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.1 2009/05/08 03:13:27 drahn Exp $ */ +/* $OpenBSD: trap.h,v 1.1 2013/09/04 14:38:29 patrick Exp $ */ /* $NetBSD: trap.h,v 1.3 2001/11/25 15:55:58 thorpej Exp $ */ #include <arm/trap.h> diff --git a/sys/arch/beagle/include/vmparam.h b/sys/arch/armv7/include/vmparam.h index 8018167955d..8f47d2c4124 100644 --- a/sys/arch/beagle/include/vmparam.h +++ b/sys/arch/armv7/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.5 2013/04/25 23:16:02 patrick Exp $ */ +/* $OpenBSD: vmparam.h,v 1.1 2013/09/04 14:38:29 patrick Exp $ */ /* $NetBSD: vmparam.h,v 1.23 2003/05/22 05:47:07 thorpej Exp $ */ /* @@ -35,7 +35,7 @@ #define ARM_KERNEL_BASE 0xc0000000 -/* Allow beagle to have bigger DSIZ than generic arm, allow user to override */ +/* Allow armv7 to have bigger DSIZ than generic arm, allow user to override */ #ifndef MAXDSIZ #define MAXDSIZ (1024*1024*1024) /* max data size */ #endif diff --git a/sys/arch/beagle/dev/am335x.c b/sys/arch/armv7/omap/am335x.c index 6214749c9f9..4ab39623c1d 100644 --- a/sys/arch/beagle/dev/am335x.c +++ b/sys/arch/armv7/omap/am335x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: am335x.c,v 1.4 2013/06/11 19:19:43 rapha Exp $ */ +/* $OpenBSD: am335x.c,v 1.1 2013/09/04 14:38:29 patrick Exp $ */ /* * Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org> @@ -21,7 +21,7 @@ #include <sys/param.h> #include <machine/bus.h> -#include <beagle/dev/omapvar.h> +#include <armv7/omap/omapvar.h> #define PRCM_SIZE 0x2000 #define PRCM_ADDR 0x44E00000 diff --git a/sys/arch/beagle/dev/am335x_cm_padconf.c b/sys/arch/armv7/omap/am335x_cm_padconf.c index b524277fae8..3723b99165c 100644 --- a/sys/arch/beagle/dev/am335x_cm_padconf.c +++ b/sys/arch/armv7/omap/am335x_cm_padconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: am335x_cm_padconf.c,v 1.2 2013/06/11 21:51:07 rapha Exp $ */ +/* $OpenBSD: am335x_cm_padconf.c,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* $NetBSD: am335x_cm_padconf.c,v 1.2 2013/05/06 18:53:40 rkujawa Exp $ */ /*- * Copyright (c) 2012 Damjan Marion <dmarion@FreeBSD.org> @@ -32,7 +32,7 @@ #include <sys/systm.h> #include <sys/device.h> #include <sys/gpio.h> -#include <beagle/dev/sitara_cm.h> +#include <armv7/omap/sitara_cm.h> #define _PIN(r, b, gp, gm, m0, m1, m2, m3, m4, m5, m6, m7) \ { .reg_off = r, \ diff --git a/sys/arch/beagle/dev/am335x_prcmreg.h b/sys/arch/armv7/omap/am335x_prcmreg.h index e5713315b88..f7077423c15 100644 --- a/sys/arch/beagle/dev/am335x_prcmreg.h +++ b/sys/arch/armv7/omap/am335x_prcmreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: am335x_prcmreg.h,v 1.1 2013/05/14 12:01:17 rapha Exp $ */ +/* $OpenBSD: am335x_prcmreg.h,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* * Copyright (c) 2013 Raphael Graf <r@undefined.ch> * diff --git a/sys/arch/beagle/beagle/beagle_machdep.c b/sys/arch/armv7/omap/beagle_machdep.c index dea0080dd6f..a48d1a62c90 100644 --- a/sys/arch/beagle/beagle/beagle_machdep.c +++ b/sys/arch/armv7/omap/beagle_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: beagle_machdep.c,v 1.20 2013/08/19 09:12:01 patrick Exp $ */ +/* $OpenBSD: beagle_machdep.c,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -146,7 +146,7 @@ #include <arm/cortex/smc.h> #include <machine/machine_reg.h> -#include <beagle/dev/omapvar.h> +#include <armv7/omap/omapvar.h> #include "wsdisplay.h" diff --git a/sys/arch/beagle/dev/dmtimer.c b/sys/arch/armv7/omap/dmtimer.c index 0abcf9bd18c..36c82c9dbd4 100644 --- a/sys/arch/beagle/dev/dmtimer.c +++ b/sys/arch/armv7/omap/dmtimer.c @@ -31,8 +31,8 @@ #include <sys/timetc.h> #include <dev/clock_subr.h> #include <machine/bus.h> -#include <beagle/dev/omapvar.h> -#include <beagle/dev/prcmvar.h> +#include <armv7/omap/omapvar.h> +#include <armv7/omap/prcmvar.h> #include <machine/intr.h> #include <arm/cpufunc.h> diff --git a/sys/arch/beagle/dev/gptimer.c b/sys/arch/armv7/omap/gptimer.c index 714bfb00ba1..6741766e4f8 100644 --- a/sys/arch/beagle/dev/gptimer.c +++ b/sys/arch/armv7/omap/gptimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gptimer.c,v 1.13 2013/05/09 13:40:38 patrick Exp $ */ +/* $OpenBSD: gptimer.c,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -31,8 +31,8 @@ #include <sys/timetc.h> #include <dev/clock_subr.h> #include <machine/bus.h> -#include <beagle/dev/omapvar.h> -#include <beagle/dev/prcmvar.h> +#include <armv7/omap/omapvar.h> +#include <armv7/omap/prcmvar.h> #include <machine/intr.h> #include <arm/cpufunc.h> diff --git a/sys/arch/beagle/dev/if_cpsw.c b/sys/arch/armv7/omap/if_cpsw.c index cdd2319bb35..67fc5a97467 100644 --- a/sys/arch/beagle/dev/if_cpsw.c +++ b/sys/arch/armv7/omap/if_cpsw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cpsw.c,v 1.5 2013/07/15 17:30:22 rapha Exp $ */ +/* $OpenBSD: if_cpsw.c,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* $NetBSD: if_cpsw.c,v 1.3 2013/04/17 14:36:34 bouyer Exp $ */ /* @@ -80,9 +80,9 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <arch/beagle/dev/omapvar.h> -#include <arch/beagle/dev/sitara_cm.h> -#include <arch/beagle/dev/if_cpswreg.h> +#include <arch/armv7/omap/omapvar.h> +#include <arch/armv7/omap/sitara_cm.h> +#include <arch/armv7/omap/if_cpswreg.h> #define CPSW_TXFRAGS 16 diff --git a/sys/arch/beagle/dev/if_cpswreg.h b/sys/arch/armv7/omap/if_cpswreg.h index 145e239d334..4df6e42c356 100644 --- a/sys/arch/beagle/dev/if_cpswreg.h +++ b/sys/arch/armv7/omap/if_cpswreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cpswreg.h,v 1.1 2013/06/05 15:03:23 bmercer Exp $ */ +/* $OpenBSD: if_cpswreg.h,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /*- * Copyright (c) 2012 Damjan Marion <dmarion@Freebsd.org> diff --git a/sys/arch/beagle/dev/intc.c b/sys/arch/armv7/omap/intc.c index 0fad16b23a1..2e515a54b16 100644 --- a/sys/arch/beagle/dev/intc.c +++ b/sys/arch/armv7/omap/intc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intc.c,v 1.12 2013/05/21 15:43:40 rapha Exp $ */ +/* $OpenBSD: intc.c,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -22,7 +22,7 @@ #include <sys/device.h> #include <sys/evcount.h> #include <machine/bus.h> -#include <beagle/dev/omapvar.h> +#include <armv7/omap/omapvar.h> #include "intc.h" #define INTC_NUM_IRQ intc_nirq diff --git a/sys/arch/beagle/dev/intc.h b/sys/arch/armv7/omap/intc.h index a0a8c9f4bf4..afb54dd41a3 100644 --- a/sys/arch/beagle/dev/intc.h +++ b/sys/arch/armv7/omap/intc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intc.h,v 1.3 2013/05/21 15:43:40 rapha Exp $ */ +/* $OpenBSD: intc.h,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * diff --git a/sys/arch/beagle/dev/omap.c b/sys/arch/armv7/omap/omap.c index 71db5ce0d3d..259176ac212 100644 --- a/sys/arch/beagle/dev/omap.c +++ b/sys/arch/armv7/omap/omap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omap.c,v 1.10 2013/06/14 23:13:54 patrick Exp $ */ +/* $OpenBSD: omap.c,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* * Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com> * @@ -23,7 +23,7 @@ #define _ARM32_BUS_DMA_PRIVATE #include <machine/bus.h> #include <arch/arm/armv7/armv7var.h> -#include <beagle/dev/omapvar.h> +#include <armv7/omap/omapvar.h> struct arm32_bus_dma_tag omap_bus_dma_tag = { 0, diff --git a/sys/arch/beagle/dev/omap3.c b/sys/arch/armv7/omap/omap3.c index a1e47ff22dd..913770fff24 100644 --- a/sys/arch/beagle/dev/omap3.c +++ b/sys/arch/armv7/omap/omap3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omap3.c,v 1.5 2013/04/25 23:07:17 patrick Exp $ */ +/* $OpenBSD: omap3.c,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* * Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org> @@ -21,7 +21,7 @@ #include <machine/bus.h> -#include <beagle/dev/omapvar.h> +#include <armv7/omap/omapvar.h> #define PRCM_ADDR 0x48004000 #define PRCM_SIZE 0x2000 diff --git a/sys/arch/beagle/dev/omap3_prcmreg.h b/sys/arch/armv7/omap/omap3_prcmreg.h index 217b26a265b..3d41d170655 100644 --- a/sys/arch/beagle/dev/omap3_prcmreg.h +++ b/sys/arch/armv7/omap/omap3_prcmreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: omap3_prcmreg.h,v 1.1 2013/05/14 12:01:17 rapha Exp $ */ +/* $OpenBSD: omap3_prcmreg.h,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* * Copyright (c) 2007, 2009, 2012 Dale Rahn <drahn@dalerahn.com> * diff --git a/sys/arch/beagle/dev/omap4.c b/sys/arch/armv7/omap/omap4.c index f601682b694..3ba281127e3 100644 --- a/sys/arch/beagle/dev/omap4.c +++ b/sys/arch/armv7/omap/omap4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omap4.c,v 1.10 2013/06/14 23:13:54 patrick Exp $ */ +/* $OpenBSD: omap4.c,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* * Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org> @@ -22,7 +22,7 @@ #include <machine/bus.h> #include <arch/arm/armv7/armv7var.h> -#include <beagle/dev/omapvar.h> +#include <armv7/omap/omapvar.h> #define OMAPID_ADDR 0x4a002000 #define OMAPID_SIZE 0x1000 diff --git a/sys/arch/beagle/dev/omap4_prcmreg.h b/sys/arch/armv7/omap/omap4_prcmreg.h index 0b902a66645..9cff537f1ab 100644 --- a/sys/arch/beagle/dev/omap4_prcmreg.h +++ b/sys/arch/armv7/omap/omap4_prcmreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: omap4_prcmreg.h,v 1.1 2013/06/14 23:13:54 patrick Exp $ */ +/* $OpenBSD: omap4_prcmreg.h,v 1.1 2013/09/04 14:38:30 patrick Exp $ */ /* * Copyright (c) 2007, 2009, 2012 Dale Rahn <drahn@dalerahn.com> * diff --git a/sys/arch/beagle/dev/omap_com.c b/sys/arch/armv7/omap/omap_com.c index b7524b9ea80..8700000d6a5 100644 --- a/sys/arch/beagle/dev/omap_com.c +++ b/sys/arch/armv7/omap/omap_com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omap_com.c,v 1.10 2012/12/05 23:20:11 deraadt Exp $ */ +/* $OpenBSD: omap_com.c,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. * All rights reserved. @@ -48,7 +48,7 @@ /* pick up armv7_a4x_bs_tag */ #include <arch/arm/armv7/armv7var.h> -#include <beagle/dev/omapvar.h> +#include <armv7/omap/omapvar.h> #define com_isr 8 #define ISR_RECV (ISR_RXPL | ISR_XMODE | ISR_RCVEIR) diff --git a/sys/arch/beagle/dev/omapid.c b/sys/arch/armv7/omap/omapid.c index dc715f1239b..23c5245d5b9 100644 --- a/sys/arch/beagle/dev/omapid.c +++ b/sys/arch/armv7/omap/omapid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omapid.c,v 1.1 2013/05/09 15:16:53 patrick Exp $ */ +/* $OpenBSD: omapid.c,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright (c) 2013 Dale Rahn <drahn@dalerahn.com> * @@ -25,7 +25,7 @@ #include <sys/timeout.h> #include <machine/intr.h> #include <machine/bus.h> -#include <beagle/dev/omapvar.h> +#include <armv7/omap/omapvar.h> /* registers */ #define O4_ID_SIZE 0x1000 diff --git a/sys/arch/beagle/dev/omapvar.h b/sys/arch/armv7/omap/omapvar.h index bfebf786b0b..b2a2e565f5e 100644 --- a/sys/arch/beagle/dev/omapvar.h +++ b/sys/arch/armv7/omap/omapvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: omapvar.h,v 1.3 2013/05/22 17:44:47 rapha Exp $ */ +/* $OpenBSD: omapvar.h,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright (c) 2005,2008 Dale Rahn <drahn@drahn.com> * diff --git a/sys/arch/beagle/dev/omdisplay.c b/sys/arch/armv7/omap/omdisplay.c index 0426dfeec3c..4e5cea513c5 100644 --- a/sys/arch/beagle/dev/omdisplay.c +++ b/sys/arch/armv7/omap/omdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omdisplay.c,v 1.7 2011/11/10 19:37:01 uwe Exp $ */ +/* $OpenBSD: omdisplay.c,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org> * @@ -24,8 +24,8 @@ #include <sys/conf.h> #include <sys/uio.h> #include <machine/bus.h> -#include <beagle/dev/omapvar.h> -#include <beagle/dev/omgpiovar.h> +#include <armv7/omap/omapvar.h> +#include <armv7/omap/omgpiovar.h> #include <dev/cons.h> #include <dev/wscons/wsconsio.h> diff --git a/sys/arch/beagle/dev/omdog.c b/sys/arch/armv7/omap/omdog.c index 4a3e2ef8c03..73bbc73391a 100644 --- a/sys/arch/beagle/dev/omdog.c +++ b/sys/arch/armv7/omap/omdog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omdog.c,v 1.5 2011/11/15 23:01:11 drahn Exp $ */ +/* $OpenBSD: omdog.c,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -25,8 +25,8 @@ #include <sys/timeout.h> #include <machine/intr.h> #include <machine/bus.h> -#include <beagle/dev/omapvar.h> -#include <beagle/dev/omgpiovar.h> +#include <armv7/omap/omapvar.h> +#include <armv7/omap/omgpiovar.h> /* registers */ #define WIDR 0x00 diff --git a/sys/arch/beagle/dev/omehci.c b/sys/arch/armv7/omap/omehci.c index 566b81e621e..1fc17f84abc 100644 --- a/sys/arch/beagle/dev/omehci.c +++ b/sys/arch/armv7/omap/omehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omehci.c,v 1.15 2013/06/14 23:13:54 patrick Exp $ */ +/* $OpenBSD: omehci.c,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -58,10 +58,10 @@ #include <dev/usb/usbdivar.h> #include <dev/usb/usb_mem.h> -#include <beagle/dev/omapvar.h> -#include <beagle/dev/prcmvar.h> -#include <beagle/dev/omgpiovar.h> -#include <beagle/dev/omehcivar.h> +#include <armv7/omap/omapvar.h> +#include <armv7/omap/prcmvar.h> +#include <armv7/omap/omgpiovar.h> +#include <armv7/omap/omehcivar.h> #include <dev/usb/ehcireg.h> #include <dev/usb/ehcivar.h> diff --git a/sys/arch/beagle/dev/omehcivar.h b/sys/arch/armv7/omap/omehcivar.h index 29e252818ac..8eed72d4a5a 100644 --- a/sys/arch/beagle/dev/omehcivar.h +++ b/sys/arch/armv7/omap/omehcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: omehcivar.h,v 1.2 2013/06/14 23:15:59 patrick Exp $ */ +/* $OpenBSD: omehcivar.h,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Misc diff --git a/sys/arch/beagle/dev/omgpio.c b/sys/arch/armv7/omap/omgpio.c index f8949093a50..1f7ca3232ee 100644 --- a/sys/arch/beagle/dev/omgpio.c +++ b/sys/arch/armv7/omap/omgpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omgpio.c,v 1.11 2013/05/10 00:18:42 patrick Exp $ */ +/* $OpenBSD: omgpio.c,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -27,8 +27,8 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <beagle/dev/omapvar.h> -#include <beagle/dev/omgpiovar.h> +#include <armv7/omap/omapvar.h> +#include <armv7/omap/omgpiovar.h> /* OMAP3 registers */ #define GPIO3_REVISION 0x00 diff --git a/sys/arch/beagle/dev/omgpiovar.h b/sys/arch/armv7/omap/omgpiovar.h index 9fa277b994f..1a47dd948a9 100644 --- a/sys/arch/beagle/dev/omgpiovar.h +++ b/sys/arch/armv7/omap/omgpiovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: omgpiovar.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ +/* $OpenBSD: omgpiovar.h,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * diff --git a/sys/arch/beagle/dev/ommmc.c b/sys/arch/armv7/omap/ommmc.c index ea2e136575d..ccb12ff9206 100644 --- a/sys/arch/beagle/dev/ommmc.c +++ b/sys/arch/armv7/omap/ommmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ommmc.c,v 1.17 2013/08/25 18:22:59 stsp Exp $ */ +/* $OpenBSD: ommmc.c,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org> @@ -31,8 +31,8 @@ #include <dev/sdmmc/sdmmcchip.h> #include <dev/sdmmc/sdmmcvar.h> -#include <beagle/dev/omapvar.h> -#include <beagle/dev/prcmvar.h> +#include <armv7/omap/omapvar.h> +#include <armv7/omap/prcmvar.h> /* * NOTE: on OMAP4430/AM335x these registers skew by 0x100 diff --git a/sys/arch/beagle/dev/omohci.c b/sys/arch/armv7/omap/omohci.c index bde69971558..976a35bbef1 100644 --- a/sys/arch/beagle/dev/omohci.c +++ b/sys/arch/armv7/omap/omohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omohci.c,v 1.8 2013/05/14 12:01:17 rapha Exp $ */ +/* $OpenBSD: omohci.c,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -32,8 +32,8 @@ #include <dev/usb/ohcireg.h> #include <dev/usb/ohcivar.h> -#include <beagle/dev/omapvar.h> -#include <beagle/dev/prcmvar.h> +#include <armv7/omap/omapvar.h> +#include <armv7/omap/prcmvar.h> #define HOSTUEADDR 0x0E0 #define HOSTUESTATUS 0x0E4 diff --git a/sys/arch/beagle/dev/omusbtll.c b/sys/arch/armv7/omap/omusbtll.c index 9a20eac5e20..ba2daa7a75c 100644 --- a/sys/arch/beagle/dev/omusbtll.c +++ b/sys/arch/armv7/omap/omusbtll.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omusbtll.c,v 1.5 2013/05/14 12:01:17 rapha Exp $ */ +/* $OpenBSD: omusbtll.c,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright (c) 2010 Dale Rahn <drahn@openbsd.org> * @@ -23,8 +23,8 @@ #include <sys/evcount.h> #include <machine/bus.h> #include <machine/intr.h> -#include <beagle/dev/omapvar.h> -#include <beagle/dev/prcmvar.h> +#include <armv7/omap/omapvar.h> +#include <armv7/omap/prcmvar.h> /* registers */ #define USBTLL_REVISION 0x0000 diff --git a/sys/arch/beagle/dev/prcm.c b/sys/arch/armv7/omap/prcm.c index 98e649b0cbd..c255c861962 100644 --- a/sys/arch/beagle/dev/prcm.c +++ b/sys/arch/armv7/omap/prcm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prcm.c,v 1.13 2013/06/14 23:13:54 patrick Exp $ */ +/* $OpenBSD: prcm.c,v 1.1 2013/09/04 14:38:31 patrick Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -58,12 +58,12 @@ #include <machine/bus.h> #include <machine/intr.h> #include <arm/cpufunc.h> -#include <beagle/dev/omapvar.h> -#include <beagle/dev/prcmvar.h> +#include <armv7/omap/omapvar.h> +#include <armv7/omap/prcmvar.h> -#include <beagle/dev/am335x_prcmreg.h> -#include <beagle/dev/omap3_prcmreg.h> -#include <beagle/dev/omap4_prcmreg.h> +#include <armv7/omap/am335x_prcmreg.h> +#include <armv7/omap/omap3_prcmreg.h> +#include <armv7/omap/omap4_prcmreg.h> #define PRCM_REVISION 0x0800 #define PRCM_SYSCONFIG 0x0810 diff --git a/sys/arch/beagle/dev/prcmvar.h b/sys/arch/armv7/omap/prcmvar.h index f0e01494a0a..c3070b4ac8e 100644 --- a/sys/arch/beagle/dev/prcmvar.h +++ b/sys/arch/armv7/omap/prcmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: prcmvar.h,v 1.6 2013/06/14 23:13:54 patrick Exp $ */ +/* $OpenBSD: prcmvar.h,v 1.1 2013/09/04 14:38:32 patrick Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * diff --git a/sys/arch/beagle/dev/sitara_cm.c b/sys/arch/armv7/omap/sitara_cm.c index 227a454e25e..4b493fb78d7 100644 --- a/sys/arch/beagle/dev/sitara_cm.c +++ b/sys/arch/armv7/omap/sitara_cm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sitara_cm.c,v 1.2 2013/06/11 21:51:07 rapha Exp $ */ +/* $OpenBSD: sitara_cm.c,v 1.1 2013/09/04 14:38:32 patrick Exp $ */ /* $NetBSD: sitara_cm.c,v 1.1 2013/04/17 14:31:02 bouyer Exp $ */ /* * Copyright (c) 2010 @@ -57,9 +57,9 @@ #include <sys/proc.h> #include <machine/bus.h> -#include <beagle/dev/omapvar.h> -#include <beagle/dev/sitara_cm.h> -#include <beagle/dev/sitara_cmreg.h> +#include <armv7/omap/omapvar.h> +#include <armv7/omap/sitara_cm.h> +#include <armv7/omap/sitara_cmreg.h> void sitara_cm_attach(struct device *parent, struct device *self, void *aux); diff --git a/sys/arch/beagle/dev/sitara_cm.h b/sys/arch/armv7/omap/sitara_cm.h index 9ebb6c7317b..96be9673d0b 100644 --- a/sys/arch/beagle/dev/sitara_cm.h +++ b/sys/arch/armv7/omap/sitara_cm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sitara_cm.h,v 1.2 2013/06/11 21:51:07 rapha Exp $ */ +/* $OpenBSD: sitara_cm.h,v 1.1 2013/09/04 14:38:32 patrick Exp $ */ /* $NetBSD: sitara_cm.h,v 1.1 2013/04/17 14:31:02 bouyer Exp $ */ /* * Copyright (c) 2010 diff --git a/sys/arch/beagle/dev/sitara_cmreg.h b/sys/arch/armv7/omap/sitara_cmreg.h index ce793444121..65aeeeb53da 100644 --- a/sys/arch/beagle/dev/sitara_cmreg.h +++ b/sys/arch/armv7/omap/sitara_cmreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sitara_cmreg.h,v 1.2 2013/06/11 21:51:07 rapha Exp $ */ +/* $OpenBSD: sitara_cmreg.h,v 1.1 2013/09/04 14:38:32 patrick Exp $ */ /* $NetBSD: sitara_cmreg.h,v 1.1 2013/04/17 15:04:39 bouyer Exp $ */ /* diff --git a/sys/arch/beagle/beagle/genassym.cf b/sys/arch/beagle/beagle/genassym.cf deleted file mode 100644 index 679dcad021f..00000000000 --- a/sys/arch/beagle/beagle/genassym.cf +++ /dev/null @@ -1 +0,0 @@ -# $OpenBSD: genassym.cf,v 1.1 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/beagle/include/_float.h b/sys/arch/beagle/include/_float.h deleted file mode 100644 index cb8e5c8109f..00000000000 --- a/sys/arch/beagle/include/_float.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:43 deraadt Exp $ */ - -#include <arm/_float.h> diff --git a/sys/arch/beagle/include/apmvar.h b/sys/arch/beagle/include/apmvar.h deleted file mode 100644 index e6d66f0d168..00000000000 --- a/sys/arch/beagle/include/apmvar.h +++ /dev/null @@ -1,2 +0,0 @@ -/* $OpenBSD: apmvar.h,v 1.2 2010/02/02 06:19:28 kevlo Exp $ */ -#include <arm/apmvar.h> diff --git a/sys/arch/beagle/include/beagle_intr.h b/sys/arch/beagle/include/beagle_intr.h deleted file mode 100644 index 4c49659992b..00000000000 --- a/sys/arch/beagle/include/beagle_intr.h +++ /dev/null @@ -1,119 +0,0 @@ -/* $OpenBSD: beagle_intr.h,v 1.2 2010/06/01 03:11:43 drahn Exp $ */ -/* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */ - -/* - * Copyright (c) 2001, 2003 Wasabi Systems, Inc. - * All rights reserved. - * - * Written by Jason R. Thorpe for Wasabi Systems, Inc. - * - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed for the NetBSD Project by - * Wasabi Systems, Inc. - * 4. The name of Wasabi Systems, Inc. may not be used to endorse - * or promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC - * 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 BEAGLEBOARD_INTR_H -#define BEAGLEBOARD_INTR_H - -#ifndef _LKM - -#include <beagle/dev/intc.h> - -#endif - -#ifndef _LOCORE - - -#if defined(_LKM) - -int _splraise(int); -int _spllower(int); -void splx(int); -void _setsoftintr(int); - -#else /* _LKM */ - -/* - * Each board needs to define the following functions: - * - * int _splraise(int); - * int _spllower(int); - * void splx(int); - * void _setsoftintr(int); - * - * These may be defined as functions, static __inline functions, or macros, - * but there must be a _spllower() and splx() defined as functions callable - * from assembly language (for cpu_switch()). However, since it's quite - * useful to be able to inline splx(), you could do something like the - * following: - * - * in <boardtype>_intr.h: - * static __inline int - * boardtype_splx(int spl) - * {...} - * - * #define splx(nspl) boardtype_splx(nspl) - * ... - * and in boardtype's machdep code: - * - * ... - * #undef splx - * int - * splx(int spl) - * { - * return boardtype_splx(spl); - * } - */ - - -#endif /* _LKM */ - - -#ifdef DIAGNOSTIC -/* - * Although this function is implemented in MI code, it must be in this MD - * header because we don't want this header to include MI includes. - */ -void splassert_fail(int, int, const char *); -extern int splassert_ctl; -void intc_splassert_check(int, const char *); -#define splassert(__wantipl) do { \ - if (splassert_ctl > 0) { \ - intc_splassert_check(__wantipl, __func__); \ - } \ -} while (0) -#define splsoftassert(wantipl) splassert(wantipl) -#else -#define splassert(wantipl) do { /* nothing */ } while (0) -#define splsoftassert(wantipl) do { /* nothing */ } while (0) -#endif - - - -#endif /* ! _LOCORE */ - -#endif /* BEAGLEBOARD_INTR_H */ diff --git a/sys/arch/beagle/include/cdefs.h b/sys/arch/beagle/include/cdefs.h deleted file mode 100644 index e167fce187e..00000000000 --- a/sys/arch/beagle/include/cdefs.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: cdefs.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ - -#include <arm/cdefs.h> diff --git a/sys/arch/beagle/include/disklabel.h b/sys/arch/beagle/include/disklabel.h deleted file mode 100644 index fe5ccb6f38c..00000000000 --- a/sys/arch/beagle/include/disklabel.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: disklabel.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ - -#include <arm/disklabel.h> diff --git a/sys/arch/beagle/include/elf_abi.h b/sys/arch/beagle/include/elf_abi.h deleted file mode 100644 index 69c105f6884..00000000000 --- a/sys/arch/beagle/include/elf_abi.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: elf_abi.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ - -#include <arm/elf_abi.h> diff --git a/sys/arch/beagle/include/exec.h b/sys/arch/beagle/include/exec.h deleted file mode 100644 index f6a7045e011..00000000000 --- a/sys/arch/beagle/include/exec.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: exec.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ -/* public domain */ -#include <arm/exec.h> diff --git a/sys/arch/beagle/include/fenv.h b/sys/arch/beagle/include/fenv.h deleted file mode 100644 index 00c039216d2..00000000000 --- a/sys/arch/beagle/include/fenv.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: fenv.h,v 1.2 2013/06/01 21:20:54 jasper Exp $ */ -/* public domain */ -#include <arm/fenv.h> diff --git a/sys/arch/beagle/include/mutex.h b/sys/arch/beagle/include/mutex.h deleted file mode 100644 index f2956c0b2e3..00000000000 --- a/sys/arch/beagle/include/mutex.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: mutex.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ -/* public domain */ -#include <arm/mutex.h> diff --git a/sys/arch/beagle/include/reloc.h b/sys/arch/beagle/include/reloc.h deleted file mode 100644 index a0214f1521d..00000000000 --- a/sys/arch/beagle/include/reloc.h +++ /dev/null @@ -1,2 +0,0 @@ -/* $OpenBSD: reloc.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */ -#include <arm/reloc.h> diff --git a/sys/arch/beagle/include/tcb.h b/sys/arch/beagle/include/tcb.h deleted file mode 100644 index 2f01dd6f598..00000000000 --- a/sys/arch/beagle/include/tcb.h +++ /dev/null @@ -1,3 +0,0 @@ -/* $OpenBSD: tcb.h,v 1.2 2013/06/01 21:20:54 jasper Exp $ */ -/* public domain */ -#include <arm/tcb.h> |