From owner-svn-src-all@freebsd.org Thu Jun 14 06:41:37 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 326461006E83; Thu, 14 Jun 2018 06:41:36 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1D89277B56; Thu, 14 Jun 2018 06:41:36 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2C5724E35; Thu, 14 Jun 2018 06:41:35 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5E6fZ6D064203; Thu, 14 Jun 2018 06:41:35 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5E6fYLr064193; Thu, 14 Jun 2018 06:41:34 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201806140641.w5E6fYLr064193@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 14 Jun 2018 06:41:34 +0000 (UTC) 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 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/stand: common efi/loader i386/loader mips/beri/loader powerpc/kboot powerpc/ofw sparc64/loader uboot/common userboot/userboot X-SVN-Commit-Revision: 335117 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2018 06:41:38 -0000 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 */