Rename bootparams to boot_params for consistency.
This commit is contained in:
parent
bdf36e0430
commit
3d45791c36
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: biosboot.S,v 1.3 2003/10/09 10:29:39 dsl Exp $ */
|
||||
/* $NetBSD: biosboot.S,v 1.4 2004/08/19 10:34:36 junyoung Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2003 The NetBSD Foundation, Inc.
|
||||
|
@ -84,7 +84,7 @@ boot_start_1:
|
|||
mov %cs, %ax
|
||||
mov %ax, %es
|
||||
|
||||
/* Grab bootparams patched into bootxx by installboot */
|
||||
/* Grab boot_params patched into bootxx by installboot */
|
||||
cmpl $X86_BOOT_MAGIC_1,-4(%si) /* sanity check ptr */
|
||||
jne 2f
|
||||
mov $boot_params, %di
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: bootxx.S,v 1.5 2004/06/27 15:37:11 dsl Exp $ */
|
||||
/* $NetBSD: bootxx.S,v 1.6 2004/08/19 10:34:36 junyoung Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2003 The NetBSD Foundation, Inc.
|
||||
|
@ -57,8 +57,8 @@ ENTRY(bootxx)
|
|||
.balign 4
|
||||
ENTRY(bootxx_magic)
|
||||
.long X86_BOOT_MAGIC_1 /* checked by installboot & pbr code */
|
||||
bootparams: /* space for patchable variables */
|
||||
.long 1f - bootparams /* length of this data area */
|
||||
boot_params: /* space for patchable variables */
|
||||
.long 1f - boot_params /* length of this data area */
|
||||
#include <boot_params.S>
|
||||
.space 4 * 4 /* some spare */
|
||||
|
||||
|
@ -91,7 +91,7 @@ bootparams: /* space for patchable variables */
|
|||
|
||||
pop %edx /* bios disk number */
|
||||
pop %ebx /* expected partition start sector */
|
||||
movl $bootparams, %esi
|
||||
movl $boot_params, %esi
|
||||
lcall $SECONDARY_LOAD_ADDRESS/16, $0
|
||||
|
||||
boot_fail:
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: start_pxe.S,v 1.2 2003/10/09 10:36:26 dsl Exp $ */
|
||||
/* $NetBSD: start_pxe.S,v 1.3 2004/08/19 10:34:36 junyoung Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2001 Wasabi Systems, Inc.
|
||||
|
@ -52,8 +52,8 @@ ENTRY(start)
|
|||
jmp 1f
|
||||
.balign 4
|
||||
.long X86_BOOT_MAGIC_PXE
|
||||
bootparams:
|
||||
.long 1f - bootparams
|
||||
boot_params:
|
||||
.long 1f - boot_params
|
||||
#include <boot_params.S>
|
||||
.space 4 * 4 /* some spare */
|
||||
1:
|
||||
|
|
Loading…
Reference in New Issue