summaryrefslogtreecommitdiff
path: root/distrib/armv7
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2015-06-29 04:52:35 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2015-06-29 04:52:35 +0000
commit96e0cbdc890e14f7f1b80ad0440702f2edd002f3 (patch)
tree409f6682cbc9d1d812da0286d6ceaca24addc0c5 /distrib/armv7
parent918ad8934d2b0dff6db00ed5e04dba9f7a98ce00 (diff)
enable vexpress
Diffstat (limited to 'distrib/armv7')
-rw-r--r--distrib/armv7/ramdisk/Makefile6
-rw-r--r--distrib/armv7/ramdisk/install.md13
2 files changed, 16 insertions, 3 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"