Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move an 'int debug;' into boot.c (it was the only diff between boot.c and 

netboot.c), and nuke netboot.c (using boot.c instead for network boot blocks).
This commit is contained in:
cgd 1997-01-18 00:59:46 +00:00
parent d3f4f54676
commit d5260695b3
3 changed files with 5 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/alpha/stand/boot/boot.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: boot.c,v 1.8 1996/09/17 22:00:26 cgd Exp $ */
/* $NetBSD: boot.c,v 1.9 1997/01/18 00:59:46 cgd Exp $ */
/*
* Copyright (c) 1992, 1993
@ -59,6 +59,8 @@ extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[];
vm_offset_t ffp_save, ptbr_save;
int debug;
void
main()
{

4
sys/arch/alpha/stand/netboot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 1997/01/17 21:14:32 cgd Exp $
# $NetBSD: Makefile,v 1.6 1997/01/18 00:59:47 cgd Exp $
S= ${.CURDIR}/../../../..
@ -7,7 +7,7 @@ S= ${.CURDIR}/../../../..
BOOT_PROG = netboot
BOOT_RELOC = ${PRIMARY_LOAD_ADDRESS}
BOOT_SRCS = start.S netboot.c prom.c prom_disp.S OSFpal.c prom_swpal.S
BOOT_SRCS = start.S boot.c prom.c prom_disp.S OSFpal.c prom_swpal.S
BOOT_SRCS+= rpcc.S
BOOT_SRCS+= dev_net.c conf.c devopen.c

98
sys/arch/alpha/stand/netboot/netboot.c
View File

@ -1,98 +0,0 @@
/* $NetBSD: netboot.c,v 1.1 1996/09/18 20:03:12 cgd Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Ralph Campbell.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* 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.
*
* @(#)boot.c 8.1 (Berkeley) 6/10/93
*/
#include <lib/libsa/stand.h>
#include <lib/libkern/libkern.h>
#include <sys/param.h>
#include <sys/exec.h>
#include <sys/exec_ecoff.h>
#include <machine/prom.h>
#define _KERNEL
#include "include/pte.h"
int loadfile __P((char *, u_int64_t *));
char boot_file[128];
char boot_flags[128];
extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[];
vm_offset_t ffp_save, ptbr_save;
int debug;
void
main()
{
u_int64_t entry;
/* Init prom callback vector. */
init_prom_calls();
/* print a banner */
printf("\n");
printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
printf("(%s, %s)\n", bootprog_maker, bootprog_date);
printf("\n");
/* switch to OSF pal code. */
OSFpal();
printf("\n");
prom_getenv(PROM_E_BOOTED_FILE, boot_file, sizeof(boot_file));
prom_getenv(PROM_E_BOOTED_OSFLAGS, boot_flags, sizeof(boot_flags));
if (boot_file[0] == '\0')
bcopy("netbsd", boot_file, sizeof "netbsd");
(void)printf("Boot: %s %s\n", boot_file, boot_flags);
if (!loadfile(boot_file, &entry)) {
(void)printf("Entering kernel at 0x%lx...\n", entry);
(*(void (*)())entry)(ffp_save, ptbr_save, 0);
}
(void)printf("Boot failed! Halting...\n");
halt();
}