From ed5db5831edc30855bc660195c6cfb5fec806bae Mon Sep 17 00:00:00 2001
From: bjh21 <bjh21@NetBSD.org>
Date: Thu, 26 Oct 2006 23:31:47 +0000
Subject: [PATCH] boot_file is not used by generic NetBSD/arm code, and its
 type varies by 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.

---
 sys/arch/arm/include/bootconfig.h    | 3 +--
 sys/arch/cats/include/bootconfig.h   | 3 ++-
 sys/arch/hpcarm/include/bootconfig.h | 3 ++-
 sys/arch/shark/include/bootconfig.h  | 6 +++++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sys/arch/arm/include/bootconfig.h b/sys/arch/arm/include/bootconfig.h
index 3a22d9384215..80d162323f08 100644
--- a/sys/arch/arm/include/bootconfig.h
+++ b/sys/arch/arm/include/bootconfig.h
@@ -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 */
diff --git a/sys/arch/cats/include/bootconfig.h b/sys/arch/cats/include/bootconfig.h
index 552d9990e347..e7e053d4a0f0 100644
--- a/sys/arch/cats/include/bootconfig.h
+++ b/sys/arch/cats/include/bootconfig.h
@@ -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 */
diff --git a/sys/arch/hpcarm/include/bootconfig.h b/sys/arch/hpcarm/include/bootconfig.h
index 145503879877..26968e6c76de 100644
--- a/sys/arch/hpcarm/include/bootconfig.h
+++ b/sys/arch/hpcarm/include/bootconfig.h
@@ -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 */
diff --git a/sys/arch/shark/include/bootconfig.h b/sys/arch/shark/include/bootconfig.h
index 56bc479fc6f7..a2fc4e38929a 100644
--- a/sys/arch/shark/include/bootconfig.h
+++ b/sys/arch/shark/include/bootconfig.h
@@ -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>