summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2003-05-19 08:19:46 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2003-05-19 08:19:46 +0000
commit0d7e276c309e81b8d7d940dc89c712605492904e (patch)
tree16545ff4b9e3f4710e2fe7c88d155c6e1dd4f4ce /sys/arch
parent0377ee23457b8c721a3f315cab7db14ea358efdd (diff)
say to skip the interactive part should the pdc say so
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/hppa/stand/boot/srt0.S5
-rw-r--r--sys/arch/hppa/stand/cdboot/cdboot.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/hppa/stand/boot/srt0.S b/sys/arch/hppa/stand/boot/srt0.S
index 435ecf9a0a5..cbc5def95df 100644
--- a/sys/arch/hppa/stand/boot/srt0.S
+++ b/sys/arch/hppa/stand/boot/srt0.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: srt0.S,v 1.7 2001/05/16 23:57:35 mickey Exp $ */
+/* $OpenBSD: srt0.S,v 1.8 2003/05/19 08:19:45 mickey Exp $ */
/*
* Copyright (c) 1998 Michael Shalayeff
@@ -138,6 +138,9 @@ start
ldil L%HEAP_LIMIT, %sp
ldo R%HEAP_LIMIT(%sp), %sp
+ .import bootprompt, data
+ ldil L%bootprompt, t1
+ stw r26, R%bootprompt(t1)
b boot ; Call boot(),
copy %r0, arg0 ; use default boot device
nop
diff --git a/sys/arch/hppa/stand/cdboot/cdboot.c b/sys/arch/hppa/stand/cdboot/cdboot.c
index a84c179f415..14158b8d1f6 100644
--- a/sys/arch/hppa/stand/cdboot/cdboot.c
+++ b/sys/arch/hppa/stand/cdboot/cdboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cdboot.c,v 1.3 2003/04/17 12:15:51 mickey Exp $ */
+/* $OpenBSD: cdboot.c,v 1.4 2003/05/19 08:19:45 mickey Exp $ */
/*
* Copyright (c) 2003 Michael Shalayeff
@@ -45,6 +45,7 @@
dev_t bootdev;
int debug = 1;
+int bootprompt = 1;
struct fs_ops file_system[] = {
{ cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek,