d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootprog_info is generated in vers.c. Move it's definition to

Browse Source 
bootstrap.h and remove all the redundant copies.

Sponsored by: Netflix
This commit is contained in:
Warner Losh 2018-06-14 06:41:33 +00:00
parent f80aa8cf2d
commit 5f88ee4479
9 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stand/common/bootstrap.h
View File

@ -160,6 +160,11 @@ char *pnp_eisaformat(uint8_t *data);
*/
extern int isapnp_readport;
/*
* Version information
*/
extern char bootprog_info[];
/*
* Preloaded file metadata header.
*

2
stand/efi/loader/main.c
View File

@ -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;

3
stand/i386/loader/main.c
View File

@ -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[];

3
stand/mips/beri/loader/loader.h
View File

@ -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_ */

2
stand/powerpc/kboot/main.c
View File

@ -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);

1
stand/powerpc/ofw/main.c
View File

@ -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;

2
stand/sparc64/loader/main.c
View File

@ -75,8 +75,6 @@ __FBSDID("$FreeBSD$");
#include "libofw.h"
#include "dev_net.h"
extern char bootprog_info[];
enum {
HEAPVA = 0x800000,
HEAPSZ = 0x1000000,

1
stand/uboot/common/main.c
View File

@ -66,7 +66,6 @@ struct device_type {
};
extern char end[];
extern char bootprog_info[];
extern unsigned char _etext[];
extern unsigned char _edata[];

1
stand/userboot/userboot/main.c
View File

@ -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 */