[src/trunk]: src/sys/arch/i386/stand/cdboot Relocate buffers to not coincide ...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8ddafa79d207
branches:  trunk
changeset: 760423:8ddafa79d207
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Tue Jan 04 16:53:05 2011 +0000

description:
Relocate buffers to not coincide with new location of executable text.

diffstat:

 sys/arch/i386/stand/cdboot/cdboot.S |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 88f14976be74 -r 8ddafa79d207 sys/arch/i386/stand/cdboot/cdboot.S
--- a/sys/arch/i386/stand/cdboot/cdboot.S       Tue Jan 04 16:25:20 2011 +0000
+++ b/sys/arch/i386/stand/cdboot/cdboot.S       Tue Jan 04 16:53:05 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cdboot.S,v 1.11 2009/10/24 12:57:17 dsl Exp $  */
+/*     $NetBSD: cdboot.S,v 1.12 2011/01/04 16:53:05 jakllsch Exp $     */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -41,8 +41,8 @@
 #define BOOT_ADDR      0x7c00
 #define BLOCK_SIZE     2048            /* Default for ISO 9660 */
 #define VD_LBA         16              /* LBA of Volume Descriptor (VD) */
-#define PVD_ADDR       0x1000          /* Where Primary VD is loaded */
-#define ROOTDIR_ADDR   0x1800          /* Where Root Directory is loaded */
+#define PVD_ADDR       end             /* Where Primary VD is loaded */
+#define ROOTDIR_ADDR   end+BLOCK_SIZE  /* Where Root Directory is loaded */
 #define LOADER_ADDR    SECONDARY_LOAD_ADDRESS
 
 #ifdef BOOT_FROM_FAT