diff options
| author | Tom Cosgrove <tom@cvs.openbsd.org> | 2007-05-30 01:25:44 +0000 |
|---|---|---|
| committer | Tom Cosgrove <tom@cvs.openbsd.org> | 2007-05-30 01:25:44 +0000 |
| commit | 5733e3038b656fdd42285e950ba6520ce83284fc (patch) | |
| tree | 9e6ad85f0cacfb6e26742c59a81b6ebf9ffc18b8 /sys/arch/amd64/stand/boot | |
| parent | e89308fca5f883deb95669dc7abfdc1ebadc00e4 (diff) | |
Pull out the ELF loadfile pieces from the standalone libraries, so that
both 32- and 64-bit versions can be created (previously only one or the
other could be built for a given boot loader).
Use this to allow the i386 and amd64 boot blocks to boot both ELF32 and
ELF64 kernels (i.e. amd64 boot blocks can now load i386 kernels, and
vice versa). Obviously the system must support LONG mode in order to
successfully run the amd64 kernel once it is loaded.
Advice and discussions from/with dale@ (going back three years). Much
testing nick@ and todd@; thanks.
Diffstat (limited to 'sys/arch/amd64/stand/boot')
| -rw-r--r-- | sys/arch/amd64/stand/boot/Makefile | 5 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/boot/conf.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile index 43519da62fb..5bbae80bbe7 100644 --- a/sys/arch/amd64/stand/boot/Makefile +++ b/sys/arch/amd64/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2006/10/30 18:28:57 jmc Exp $ +# $OpenBSD: Makefile,v 1.7 2007/05/30 01:25:43 tom Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -33,7 +33,8 @@ SRCS+= alloc.c exit.c getfile.c gets.c globals.c strcmp.c strlen.c \ strerror.c strncpy.c strtol.c strtoll.c ctime.c strlcpy.c strlcat.c # io routines SRCS+= close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \ - open.c read.c stat.c write.c cread.c readdir.c cons.c loadfile.c + open.c read.c stat.c write.c cread.c readdir.c cons.c loadfile.c \ + elf32.c elf64.c # boot filesystems SRCS+= ufs.c # gcc support diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c index c7af2054447..145f7b4d705 100644 --- a/sys/arch/amd64/stand/boot/conf.c +++ b/sys/arch/amd64/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.11 2007/04/28 19:23:10 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.12 2007/05/30 01:25:43 tom Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -24,7 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include <sys/types.h> @@ -42,7 +41,7 @@ #include <biosdev.h> #include <dev/cons.h> -const char version[] = "2.15"; +const char version[] = "3.00"; int debug = 1; |