summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2010-02-27 22:23:17 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2010-02-27 22:23:17 +0000
commit79999529fca020d754c68793ff897c9230212875 (patch)
treeef5ec7b821192ec529e5e569a408948e4e63f03d /sys/arch
parent1ee20283f3d708d083c1d99623955640c592f851 (diff)
Remove ELF check. It is broken and since the PROM checks the loaded executable
anyway, it's not worth fixing. Bump version number. ok deraadt@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc64/stand/bootblk/bootblk.fth11
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/arch/sparc64/stand/bootblk/bootblk.fth b/sys/arch/sparc64/stand/bootblk/bootblk.fth
index c3d4eef416f..0d3c7895ee3 100644
--- a/sys/arch/sparc64/stand/bootblk/bootblk.fth
+++ b/sys/arch/sparc64/stand/bootblk/bootblk.fth
@@ -1,4 +1,4 @@
-\ $OpenBSD: bootblk.fth,v 1.6 2010/02/26 23:03:50 deraadt Exp $
+\ $OpenBSD: bootblk.fth,v 1.7 2010/02/27 22:23:16 kettenis Exp $
\ $NetBSD: bootblk.fth,v 1.3 2001/08/15 20:10:24 eeh Exp $
\
\ IEEE 1275 Open Firmware Boot Block
@@ -569,12 +569,6 @@ h# 2000 buffer: indir-block
h# 6000 constant loader-base
\
-\ Elf support -- find the load addr
-\
-
-: is-elf? ( hdr -- res? ) h# 7f454c46 = ;
-
-\
\ Finally we finish it all off
\
@@ -603,7 +597,6 @@ h# 6000 constant loader-base
loader-base ( buf-len addr )
2dup read-file ( buf-len addr )
ufs-close ( buf-len addr )
- dup is-elf? if ." load-file: not an elf executable" cr abort then
\ Luckily the prom should be able to handle ELF executables by itself
@@ -611,7 +604,7 @@ h# 6000 constant loader-base
;
: do-boot ( bootfile -- )
- ." OpenBSD IEEE 1275 Bootblock 1.2" cr
+ ." OpenBSD IEEE 1275 Bootblock 1.3" cr
boot-path load-file ( -- load-base )
dup 0<> if " to load-base init-program" evaluate then
;