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

boot_file is not used by generic NetBSD/arm code, and its type varies by

Browse Source 
MACHINE.  Thus, move it out of <arm/bootconfig.h> and put it into
<machine/bootconfig.h> on those MACHINEs (cats, hpcarm, and shark) where
it's used outside the file in which it's defined.
This commit is contained in:
bjh21 2006-10-26 23:31:47 +00:00
parent be9c217769
commit ed5db5831e
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arch/arm/include/bootconfig.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootconfig.h,v 1.3 2005/12/11 12:16:46 christos Exp $ */
/* $NetBSD: bootconfig.h,v 1.4 2006/10/26 23:31:47 bjh21 Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@ -47,5 +47,4 @@
int get_bootconf_option __P((char *, const char *, int, void *));
extern char *boot_args;
extern char *boot_file;
#endif /* _KERNEL */

3
sys/arch/cats/include/bootconfig.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootconfig.h,v 1.5 2006/10/24 20:39:13 bjh21 Exp $ */
/* $NetBSD: bootconfig.h,v 1.6 2006/10/26 23:31:47 bjh21 Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@ -61,6 +61,7 @@ typedef struct _BootConfig {
extern BootConfig bootconfig;
#define MAX_BOOT_STRING 255
extern char *boot_file;
#endif /* _KERNEL */
/* End of bootconfig.h */

3
sys/arch/hpcarm/include/bootconfig.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootconfig.h,v 1.7 2006/10/24 20:39:13 bjh21 Exp $ */
/* $NetBSD: bootconfig.h,v 1.8 2006/10/26 23:31:47 bjh21 Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@ -61,6 +61,7 @@ typedef struct _BootConfig {
extern BootConfig bootconfig;
extern char boot_file[];
#endif /* _KERNEL */
/* End of bootconfig.h */

6
sys/arch/shark/include/bootconfig.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootconfig.h,v 1.3 2005/12/11 12:19:02 christos Exp $ */
/* $NetBSD: bootconfig.h,v 1.4 2006/10/26 23:31:47 bjh21 Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@ -76,4 +76,8 @@ typedef struct _BootConfig {
extern BootConfig bootconfig;
#endif /* _KERNEL && OFW */
#ifdef _KERNEL
extern char *boot_file;
#endif /* _KERNEL */
#include <arm/bootconfig.h>