4 files changed, 27 insertions, 6 deletions
diff --git a/sys/arch/aviion/include/autoconf.h b/sys/arch/aviion/include/autoconf.h
index 8e5f8c86086..87c4fac0de6 100644
--- a/sys/arch/aviion/include/autoconf.h
+++ b/sys/arch/aviion/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.3 2013/10/10 21:24:59 miod Exp $ */
 /*
  * Copyright (c) 1999, Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -49,7 +49,6 @@ struct confargs {
 void	cmdline_parse(void);
 void	myetheraddr(u_char *);
 
-extern u_int bootdev, bootunit, bootpart;
 extern char bootargs[256];
 
 #endif
diff --git a/sys/arch/aviion/include/av400.h b/sys/arch/aviion/include/av400.h
index e95c8a7fe4e..f680189fa6e 100644
--- a/sys/arch/aviion/include/av400.h
+++ b/sys/arch/aviion/include/av400.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: av400.h,v 1.9 2013/09/24 20:14:35 miod Exp $	*/
+/*	$OpenBSD: av400.h,v 1.10 2013/10/10 21:24:59 miod Exp $	*/
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -130,6 +130,7 @@
  * Onboard device addresses
  */
 
+#define	AV400_SCSI	0xfff8a000
 #define	AV400_LAN	0xfff8c000
 
 /*
diff --git a/sys/arch/aviion/include/board.h b/sys/arch/aviion/include/board.h
index b7647a0ae26..6946b1ad329 100644
--- a/sys/arch/aviion/include/board.h
+++ b/sys/arch/aviion/include/board.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: board.h,v 1.12 2013/10/09 21:28:33 miod Exp $	*/
+/*	$OpenBSD: board.h,v 1.13 2013/10/10 21:24:59 miod Exp $	*/
 /*
  * Copyright (c) 2006, 2007, Miodrag Vallat
  *
@@ -78,6 +78,7 @@ struct board {
 	u_int		(*bootstrap)(void);
 	vaddr_t		(*memsize)(void);
 	void		(*startup)(void);
+	paddr_t		(*get_boot_device)(uint32_t *, u_int);
 
 	void		(*intr)(struct trapframe *);
 	void		(*init_clocks)(void);
@@ -94,7 +95,6 @@ struct board {
 	const struct vme_range *(*get_vme_ranges)(void);
 
 	const struct pmap_table *ptable;
-	const char	*default_boot;
 };
 
 #define	md_interrupt_func(f)	platform->intr(f)
@@ -104,6 +104,7 @@ extern const struct board board_av##b; \
 u_int	av##b##_bootstrap(void); \
 vaddr_t	av##b##_memsize(void); \
 void	av##b##_startup(void); \
+paddr_t	av##b##_get_boot_device(uint32_t *, u_int); \
 void	av##b##_intr(struct trapframe *); \
 void	av##b##_init_clocks(void); \
 u_int	av##b##_getipl(void); \
diff --git a/sys/arch/aviion/include/prom.h b/sys/arch/aviion/include/prom.h
index d6a0f254933..ce577504523 100644
--- a/sys/arch/aviion/include/prom.h
+++ b/sys/arch/aviion/include/prom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prom.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $	*/
+/*	$OpenBSD: prom.h,v 1.6 2013/10/10 21:24:59 miod Exp $	*/
 /*
  * Copyright (c) 2006, Miodrag Vallat.
  *
@@ -82,4 +82,24 @@ void	scm_putcrlf(void);
 __dead void scm_reboot(const char *);
 u_int	scm_sysid(void);
 
+/*
+ * SCM boot device names
+ */
+
+/* cied */
+#define	SCM_CIEN	0x6369656e
+/* cimd */
+/* cird */
+/* cisc */
+#define	SCM_DGEN	0x6467656e
+#define	SCM_DGSC	0x64677363
+/* hada */
+#define	SCM_HKEN	0x686b656e
+#define	SCM_INEN	0x696e656e
+#define	SCM_INSC	0x696e7363
+#define	SCM_NCSC	0x6e637363
+/* nvrd */
+/* pefn */
+/* vitr */
+
 #endif /* _MACHINE_PROM_H_ */