enable vexpress

5 files changed, 50 insertions, 7 deletions

diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile
index 80daa10471a..b87f3655f3a 100644
--- a/distrib/armv7/ramdisk/Makefile
+++ b/distrib/armv7/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2015/05/20 01:44:20 jsg Exp $
+#	$OpenBSD: Makefile,v 1.10 2015/06/29 04:52:34 jsg Exp $
 
 REV=	${OSrev}
 
@@ -24,6 +24,8 @@ PID!=		echo $$$$
 KERNADDR_OMAP=0x80300000
 KERNADDR_IMX=0x10300000
 KERNADDR_SUNXI=0x40300000
+KERNADDR_VEXPRESSA15=0x80300000
+KERNADDR_VEXPRESSA9=0x60300000
 
 DISKTYPE=       rdroot
 NBLKS=		10240
@@ -36,7 +38,7 @@ all ${IMAGE}:
 	@false
 .else
 
-ALLSOC=		IMX OMAP SUNXI
+ALLSOC=		IMX OMAP SUNXI VEXPRESSA9 VEXPRESSA15
 ALLBSD=		bsd
 ALLBSDRD=	${BSD_RD}
 .for SOC in ${ALLSOC}
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index 2ae7c70e5e4..e13664f632b 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.15 2015/06/08 18:31:17 jsg Exp $
+#	$OpenBSD: install.md,v 1.16 2015/06/29 04:52:34 jsg Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,6 +50,17 @@ if [[ $? == 0 ]]; then
 	MDPLAT=SUNXI
 	LOADADDR=0x40200000
 fi
+dmesg | grep "^vexpress0 at mainbus0:" >/dev/null
+if [[ $? == 0 ]]; then
+	dmesg | grep "^cpu0 at mainbus0: ARM Cortex A9 " >/dev/null
+	if [[ $? == 0 ]]; then
+		MDPLAT=VEXPRESSA9
+		LOADADDR=0x60300000
+	else
+		MDPLAT=VEXPRESSA15
+		LOADADDR=0x80300000
+	fi
+fi
 
 MDSETS="bsd.${MDPLAT}.umg bsd.rd.${MDPLAT}.umg"
 SANESETS="bsd"
diff --git a/etc/etc.armv7/Makefile.inc b/etc/etc.armv7/Makefile.inc
index c9321bdb1b3..71554fbb7c5 100644
--- a/etc/etc.armv7/Makefile.inc
+++ b/etc/etc.armv7/Makefile.inc
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2015/06/02 01:48:25 jsg Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 2015/06/29 04:52:34 jsg Exp $
 
-ALLSOC=IMX OMAP SUNXI
+ALLSOC=IMX OMAP SUNXI VEXPRESSA9 VEXPRESSA15
 MDEXT=		bsd.rd
 
 .for SOC in ${ALLSOC}
@@ -11,6 +11,8 @@ MDEXT+=		bsd.rd.${SOC}.umg
 KERNADDR_OMAP=0x80300000
 KERNADDR_IMX=0x10300000
 KERNADDR_SUNXI=0x40300000
+KERNADDR_VEXPRESSA15=0x80300000
+KERNADDR_VEXPRESSA9=0x60300000
 
 bootblocks:
 
diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC
index ffe1b6241a4..74466f33971 100644
--- a/sys/arch/armv7/conf/GENERIC
+++ b/sys/arch/armv7/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.4 2015/05/29 02:44:14 jsg Exp $
+#	$OpenBSD: GENERIC,v 1.5 2015/06/29 04:52:34 jsg Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -99,6 +99,20 @@ usb*		at ehci?	#flags 0x1
 #ohci*		at sunxi?
 #usb*		at ohci?
 
+# ARM Versatile Express
+vexpress0	at mainbus?
+sysreg*		at vexpress?
+pluart*		at vexpress?
+plrtc*		at vexpress?
+virtio*		at vexpress?
+
+# virtio devices
+vioblk*		at virtio?
+vio*		at virtio?
+viomb*		at virtio?
+viornd*		at virtio?
+vioscsi*	at virtio?
+
 # USB bus support
 usb*		at ehci?	flags 0x1
 
diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK
index 9b2df974fe2..41c7ab7fd00 100644
--- a/sys/arch/armv7/conf/RAMDISK
+++ b/sys/arch/armv7/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.3 2015/06/08 14:59:34 jsg Exp $
+#	$OpenBSD: RAMDISK,v 1.4 2015/06/29 04:52:34 jsg Exp $
 
 machine		armv7 arm
 
@@ -98,6 +98,20 @@ usb*		at ehci?	#flags 0x1
 #ohci*		at sunxi?
 #usb*		at ohci?
 
+# ARM Versatile Express
+vexpress0	at mainbus?
+sysreg*		at vexpress?
+pluart*		at vexpress?
+plrtc*		at vexpress?
+virtio*		at vexpress?
+
+# virtio devices
+vioblk*		at virtio?
+vio*		at virtio?
+viomb*		at virtio?
+viornd*		at virtio?
+vioscsi*	at virtio?
+
 # USB bus support
 usb*		at ehci?	flags 0x1