svn commit: r344290 - in stable/11/stand: common efi/loader i386/loader mips/beri/loader pc98/loader powerpc/kboot powerpc/ofw sparc64/loader uboot/common userboot/userboot

[Kyle Evans]

Author: kevans
Date: Tue Feb 19 18:48:17 2019
New Revision: 344290
URL: https://svnweb.freebsd.org/changeset/base/344290

Log:
  MFC r335117: stand bootprog_info consolidation
  
  bootprog_info is generated in vers.c. Move it's definition to
  bootstrap.h and remove all the redundant copies.

Modified:
  stable/11/stand/common/bootstrap.h
  stable/11/stand/efi/loader/main.c
  stable/11/stand/i386/loader/main.c
  stable/11/stand/mips/beri/loader/loader.h
  stable/11/stand/pc98/loader/main.c
  stable/11/stand/powerpc/kboot/main.c
  stable/11/stand/powerpc/ofw/main.c
  stable/11/stand/sparc64/loader/main.c
  stable/11/stand/uboot/common/main.c
  stable/11/stand/userboot/userboot/main.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/common/bootstrap.h
==============================================================================
--- stable/11/stand/common/bootstrap.h	Tue Feb 19 18:45:40 2019	(r344289)
+++ stable/11/stand/common/bootstrap.h	Tue Feb 19 18:48:17 2019	(r344290)
@@ -161,6 +161,11 @@ char			*pnp_eisaformat(uint8_t *data);
 extern int			isapnp_readport;
 
 /*
+ * Version information
+ */
+extern char bootprog_info[];
+
+/*
  * Preloaded file metadata header.
  *
  * Metadata are allocated on our heap, and copied into kernel space

Modified: stable/11/stand/efi/loader/main.c
==============================================================================
--- stable/11/stand/efi/loader/main.c	Tue Feb 19 18:45:40 2019	(r344289)
+++ stable/11/stand/efi/loader/main.c	Tue Feb 19 18:48:17 2019	(r344290)
@@ -53,8 +53,6 @@ __FBSDID("$FreeBSD$");
 
 #include "loader_efi.h"
 
-extern char bootprog_info[];
-
 struct arch_switch archsw;	/* MI/MD interface boundary */
 
 EFI_GUID acpi = ACPI_TABLE_GUID;

Modified: stable/11/stand/i386/loader/main.c
==============================================================================
--- stable/11/stand/i386/loader/main.c	Tue Feb 19 18:45:40 2019	(r344289)
+++ stable/11/stand/i386/loader/main.c	Tue Feb 19 18:48:17 2019	(r344290)
@@ -79,9 +79,6 @@ struct zfs_boot_args	*zargs;
 static void		i386_zfs_probe(void);
 #endif
 
-/* from vers.c */
-extern	char bootprog_info[];
-
 /* XXX debugging */
 extern char end[];
 

Modified: stable/11/stand/mips/beri/loader/loader.h
==============================================================================
--- stable/11/stand/mips/beri/loader/loader.h	Tue Feb 19 18:45:40 2019	(r344289)
+++ stable/11/stand/mips/beri/loader/loader.h	Tue Feb 19 18:48:17 2019	(r344290)
@@ -58,7 +58,4 @@ extern struct bootinfo	 boot2_bootinfo;
 /* metadata.c */
 int	md_load64(char *args, vm_offset_t *modulep, vm_offset_t *dtbp);
 
-/* vers.c */
-extern char		bootprog_info[];
-
 #endif /* !_BOOT_LOADER_H_ */

Modified: stable/11/stand/pc98/loader/main.c
==============================================================================
--- stable/11/stand/pc98/loader/main.c	Tue Feb 19 18:45:40 2019	(r344289)
+++ stable/11/stand/pc98/loader/main.c	Tue Feb 19 18:48:17 2019	(r344290)
@@ -65,9 +65,6 @@ static int		isa_inb(int port);
 static void		isa_outb(int port, int value);
 void			exit(int code);
 
-/* from vers.c */
-extern	char bootprog_info[];
-
 /* XXX debugging */
 extern char end[];
 

Modified: stable/11/stand/powerpc/kboot/main.c
==============================================================================
--- stable/11/stand/powerpc/kboot/main.c	Tue Feb 19 18:45:40 2019	(r344289)
+++ stable/11/stand/powerpc/kboot/main.c	Tue Feb 19 18:48:17 2019	(r344290)
@@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$");
 struct arch_switch	archsw;
 extern void *_end;
 
-extern char bootprog_info[];
-
 int kboot_getdev(void **vdev, const char *devspec, const char **path);
 ssize_t kboot_copyin(const void *src, vm_offset_t dest, const size_t len);
 ssize_t kboot_copyout(vm_offset_t src, void *dest, const size_t len);

Modified: stable/11/stand/powerpc/ofw/main.c
==============================================================================
--- stable/11/stand/powerpc/ofw/main.c	Tue Feb 19 18:45:40 2019	(r344289)
+++ stable/11/stand/powerpc/ofw/main.c	Tue Feb 19 18:48:17 2019	(r344290)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 struct arch_switch	archsw;		/* MI/MD interface boundary */
 
 extern char end[];
-extern char bootprog_info[];
 
 uint32_t	acells, scells;
 

Modified: stable/11/stand/sparc64/loader/main.c
==============================================================================
--- stable/11/stand/sparc64/loader/main.c	Tue Feb 19 18:45:40 2019	(r344289)
+++ stable/11/stand/sparc64/loader/main.c	Tue Feb 19 18:48:17 2019	(r344290)
@@ -75,8 +75,6 @@ __FBSDID("$FreeBSD$");
 #include "libofw.h"
 #include "dev_net.h"
 
-extern char bootprog_info[];
-
 enum {
 	HEAPVA		= 0x800000,
 	HEAPSZ		= 0x3000000,

Modified: stable/11/stand/uboot/common/main.c
==============================================================================
--- stable/11/stand/uboot/common/main.c	Tue Feb 19 18:45:40 2019	(r344289)
+++ stable/11/stand/uboot/common/main.c	Tue Feb 19 18:48:17 2019	(r344290)
@@ -66,7 +66,6 @@ struct device_type { 
 };
 
 extern char end[];
-extern char bootprog_info[];
 
 extern unsigned char _etext[];
 extern unsigned char _edata[];

Modified: stable/11/stand/userboot/userboot/main.c
==============================================================================
--- stable/11/stand/userboot/userboot/main.c	Tue Feb 19 18:45:40 2019	(r344289)
+++ stable/11/stand/userboot/userboot/main.c	Tue Feb 19 18:48:17 2019	(r344290)
@@ -52,7 +52,6 @@ static int userboot_zfs_found;
 struct loader_callbacks *callbacks;
 void *callbacks_arg;
 
-extern char bootprog_info[];
 static jmp_buf jb;
 
 struct arch_switch archsw;	/* MI/MD interface boundary */