Date: Thu, 14 Jun 2018 06:41:34 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335117 - in head/stand: common efi/loader i386/loader mips/beri/loader powerpc/kboot powerpc/ofw sparc64/loader uboot/common userboot/userboot Message-ID: <201806140641.w5E6fYLr064193@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Thu Jun 14 06:41:33 2018 New Revision: 335117 URL: https://svnweb.freebsd.org/changeset/base/335117 Log: bootprog_info is generated in vers.c. Move it's definition to bootstrap.h and remove all the redundant copies. Sponsored by: Netflix Modified: head/stand/common/bootstrap.h head/stand/efi/loader/main.c head/stand/i386/loader/main.c head/stand/mips/beri/loader/loader.h head/stand/powerpc/kboot/main.c head/stand/powerpc/ofw/main.c head/stand/sparc64/loader/main.c head/stand/uboot/common/main.c head/stand/userboot/userboot/main.c Modified: head/stand/common/bootstrap.h ============================================================================== --- head/stand/common/bootstrap.h Thu Jun 14 06:41:22 2018 (r335116) +++ head/stand/common/bootstrap.h Thu Jun 14 06:41:33 2018 (r335117) @@ -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: head/stand/efi/loader/main.c ============================================================================== --- head/stand/efi/loader/main.c Thu Jun 14 06:41:22 2018 (r335116) +++ head/stand/efi/loader/main.c Thu Jun 14 06:41:33 2018 (r335117) @@ -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: head/stand/i386/loader/main.c ============================================================================== --- head/stand/i386/loader/main.c Thu Jun 14 06:41:22 2018 (r335116) +++ head/stand/i386/loader/main.c Thu Jun 14 06:41:33 2018 (r335117) @@ -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: head/stand/mips/beri/loader/loader.h ============================================================================== --- head/stand/mips/beri/loader/loader.h Thu Jun 14 06:41:22 2018 (r335116) +++ head/stand/mips/beri/loader/loader.h Thu Jun 14 06:41:33 2018 (r335117) @@ -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: head/stand/powerpc/kboot/main.c ============================================================================== --- head/stand/powerpc/kboot/main.c Thu Jun 14 06:41:22 2018 (r335116) +++ head/stand/powerpc/kboot/main.c Thu Jun 14 06:41:33 2018 (r335117) @@ -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: head/stand/powerpc/ofw/main.c ============================================================================== --- head/stand/powerpc/ofw/main.c Thu Jun 14 06:41:22 2018 (r335116) +++ head/stand/powerpc/ofw/main.c Thu Jun 14 06:41:33 2018 (r335117) @@ -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: head/stand/sparc64/loader/main.c ============================================================================== --- head/stand/sparc64/loader/main.c Thu Jun 14 06:41:22 2018 (r335116) +++ head/stand/sparc64/loader/main.c Thu Jun 14 06:41:33 2018 (r335117) @@ -75,8 +75,6 @@ __FBSDID("$FreeBSD$"); #include "libofw.h" #include "dev_net.h" -extern char bootprog_info[]; - enum { HEAPVA = 0x800000, HEAPSZ = 0x1000000, Modified: head/stand/uboot/common/main.c ============================================================================== --- head/stand/uboot/common/main.c Thu Jun 14 06:41:22 2018 (r335116) +++ head/stand/uboot/common/main.c Thu Jun 14 06:41:33 2018 (r335117) @@ -66,7 +66,6 @@ struct device_type { }; extern char end[]; -extern char bootprog_info[]; extern unsigned char _etext[]; extern unsigned char _edata[]; Modified: head/stand/userboot/userboot/main.c ============================================================================== --- head/stand/userboot/userboot/main.c Thu Jun 14 06:41:22 2018 (r335116) +++ head/stand/userboot/userboot/main.c Thu Jun 14 06:41:33 2018 (r335117) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806140641.w5E6fYLr064193>