summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorTobias Weingartner <weingart@cvs.openbsd.org>2008-04-19 23:20:23 +0000
committerTobias Weingartner <weingart@cvs.openbsd.org>2008-04-19 23:20:23 +0000
commit14c68379e11eb1bc132d027fb5efd42c0075d150 (patch)
treedf1271c14a2be51e1fa823ca942ffebc2310cf39 /sys/arch/amd64
parent0a3be210c0d324c4b3b9e764f2410bb202b19768 (diff)
Change ELF loader to use the LMA as the load address for the
various segments. Hopefully this will help remove various hacks in the boot loader in the future. This should have no effect on most architectures (as we tend to have LMA == VMA). ok drahn@, soft ok's various others.
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/stand/boot/conf.c4
-rw-r--r--sys/arch/amd64/stand/cdboot/conf.c4
-rw-r--r--sys/arch/amd64/stand/pxeboot/conf.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c
index 145f7b4d705..f79deb6a09c 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.12 2007/05/30 01:25:43 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.13 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -41,7 +41,7 @@
#include <biosdev.h>
#include <dev/cons.h>
-const char version[] = "3.00";
+const char version[] = "3.01";
int debug = 1;
diff --git a/sys/arch/amd64/stand/cdboot/conf.c b/sys/arch/amd64/stand/cdboot/conf.c
index 7172579a38d..cd26ad30624 100644
--- a/sys/arch/amd64/stand/cdboot/conf.c
+++ b/sys/arch/amd64/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.12 2007/05/30 01:25:43 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.13 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -42,7 +42,7 @@
#include <biosdev.h>
#include <dev/cons.h>
-const char version[] = "2.00";
+const char version[] = "2.01";
int debug = 1;
diff --git a/sys/arch/amd64/stand/pxeboot/conf.c b/sys/arch/amd64/stand/pxeboot/conf.c
index 8c90c92c7d1..3a15193e1a2 100644
--- a/sys/arch/amd64/stand/pxeboot/conf.c
+++ b/sys/arch/amd64/stand/pxeboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.16 2007/07/27 17:48:01 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.17 2008/04/19 23:20:22 weingart Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -44,7 +44,7 @@
#include "pxeboot.h"
#include "pxe_net.h"
-const char version[] = "2.01";
+const char version[] = "2.02";
int debug = 0;
#undef _TEST