From nobody Tue Jan 24 22:11:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1h5N15BFz3bfb2; Tue, 24 Jan 2023 22:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h5M720Zz4Npw; Tue, 24 Jan 2023 22:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=biiUlVQiKkYkFuZPL/ftR6utOu5ZNXiRl/J73tA4Si0=; b=FB0l9rD0nT1YTPFITYEh77NRVIf9m7hetrjmPScmUGE99v4X/iYn9hDln2R0UGy1aml07P B3+w2CxASthCaNqkRAAKTKMFKVx5vHgDuEKiOepDevwT79JbfJ12OHViIAPYWil8ZQYGT1 xXDChaXzrvo1cEDakSXTwkiX11AKw/p2uukV1XVLT0vzyQXa8Cyvyl+ylRDmgDqx2NDU2n V6K1Kzsyz9fVF+1lMcAn2+RoJFpaP12VeZKmt9fIvm495XN0fY7Cjk5dRzz3eceBOSpjnU XEWBp0MwHnmlY11RdUTcwceZ+AuY5QpCsg2ZENmiuc7jA+q+723id+OAE/uMjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=biiUlVQiKkYkFuZPL/ftR6utOu5ZNXiRl/J73tA4Si0=; b=IY+/gkyCaGcmIykfPg6eVWsdNrc2WYFv1Jh48IbRjTV5HpC9GUl33MDA9pCfqDIhtoSx7p hZh88vJOthnTLQkM8N9Ov4Tos9Ec8/V0MbUah9fWsvtHSa7FgCRu2FaLz7nhZLyQLV7OZs /YuI1P7v8121enjAoZv1DAOryOXCniSMPonuMDcxG1JeDOQ+MiEd5oB+yHEAE12gMGPK/c xyBH1ID0pZ+jn+nQsbJl0qv0Nrzfw+UNTvH7meSlEjc/P/z+Hy5yVWo0TxqbId9s0GGFre U3hchGIzwpcizWTRitSLwrBqkouP71XSuoA3II8F58P+xTM/z+awnCQDvje8cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598296; a=rsa-sha256; cv=none; b=oMzi5xC894IAdFPAZPZXZkV5tgyS1NvCpLm1bmgw8u80t2ezWvnFwhwdFKCHzz1TCbSbEG tuZ6FMicwHi5/bdccyHrzkpNbacKZeQt3sQfLrvYQP66CUBX6OpGUQhItx3JNRu0JnUy18 1aIMkbwnP61YiDyD0DPdW2a46rTaYR4gqVz5XQp78sa2JAQo36b0aB9CnSeY0yT/gsSX7C EbNXUmX/8a8PUDqNJwhiXpf9kk4krbK/b+H/3/hF0B3Ikn8zwZqxrJXEq/YvLO1cSNlgVP moy9Wh9SYkKuD0xfJLy+j6kHMW769LCXSky804LajmPjmHT837gLgbu6415bjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h5M5SgYzQRf; Tue, 24 Jan 2023 22:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMBZKv084941; Tue, 24 Jan 2023 22:11:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMBZhZ084940; Tue, 24 Jan 2023 22:11:35 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:35 GMT Message-Id: <202301242211.30OMBZhZ084940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: dd02168938a4 - stable/13 - kboot: Move conf.c up to top level List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd02168938a47ddd6fd18c25cba2ee5727bd1df6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dd02168938a47ddd6fd18c25cba2ee5727bd1df6 commit dd02168938a47ddd6fd18c25cba2ee5727bd1df6 Author: Warner Losh AuthorDate: 2022-07-28 20:53:25 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:28 +0000 kboot: Move conf.c up to top level conf.c is the same now between powerpc64 and amd64, so move it up to kboot. Move powerpc file formats defines to ppc64_elf_freebsd.c Sponsored by: Netflix (cherry picked from commit a0c075229f19ce1a10836042907e2bd89907aa0b) --- stand/kboot/Makefile | 2 +- stand/kboot/arch/amd64/Makefile.inc | 2 +- stand/kboot/arch/powerpc64/Makefile.inc | 2 +- stand/kboot/arch/powerpc64/conf.c | 118 ------------------------- stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c | 10 +++ stand/kboot/{arch/amd64 => }/conf.c | 0 6 files changed, 13 insertions(+), 121 deletions(-) diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile index ce0868264acf..3a38b8d3d0cf 100644 --- a/stand/kboot/Makefile +++ b/stand/kboot/Makefile @@ -18,7 +18,7 @@ NEWVERSWHAT= "kboot loader" ${MACHINE_ARCH} INSTALLFLAGS= -b # Architecture-specific loader code -SRCS= crt1.c vers.c main.c host_syscalls.c hostcons.c hostdisk.c kbootfdt.c gfx_fb_stub.c +SRCS= crt1.c conf.c vers.c main.c host_syscalls.c hostcons.c hostdisk.c kbootfdt.c gfx_fb_stub.c CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken diff --git a/stand/kboot/arch/amd64/Makefile.inc b/stand/kboot/arch/amd64/Makefile.inc index a3920d636c9c..79ddbd67f5b6 100644 --- a/stand/kboot/arch/amd64/Makefile.inc +++ b/stand/kboot/arch/amd64/Makefile.inc @@ -1,4 +1,4 @@ -SRCS+= conf.c host_syscall.S amd64_tramp.S elf64_freebsd.c +SRCS+= host_syscall.S amd64_tramp.S elf64_freebsd.c CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include diff --git a/stand/kboot/arch/powerpc64/Makefile.inc b/stand/kboot/arch/powerpc64/Makefile.inc index e6730edf8e3d..b62a12506969 100644 --- a/stand/kboot/arch/powerpc64/Makefile.inc +++ b/stand/kboot/arch/powerpc64/Makefile.inc @@ -1,6 +1,6 @@ CFLAGS+= -mcpu=powerpc64 -SRCS+= conf.c ppc64_elf_freebsd.c host_syscall.S kerneltramp.S +SRCS+= ppc64_elf_freebsd.c host_syscall.S kerneltramp.S SRCS+= ucmpdi2.c LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.powerpc diff --git a/stand/kboot/arch/powerpc64/conf.c b/stand/kboot/arch/powerpc64/conf.c deleted file mode 100644 index 9862611c68d8..000000000000 --- a/stand/kboot/arch/powerpc64/conf.c +++ /dev/null @@ -1,118 +0,0 @@ -/*- - * Copyright (C) 1999 Michael Smith - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include "bootstrap.h" - -#if defined(LOADER_NET_SUPPORT) -#include "dev_net.h" -#endif - -extern struct devsw hostdisk; - -/* - * We could use linker sets for some or all of these, but - * then we would have to control what ended up linked into - * the bootstrap. So it's easier to conditionalise things - * here. - * - * XXX rename these arrays to be consistent and less namespace-hostile - */ - -/* Exported for libsa */ -struct devsw *devsw[] = { -#if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CD9660_SUPPORT) - &hostdisk, -#endif -#if defined(LOADER_NET_SUPPORT) - &netdev, -#endif - NULL -}; - -struct fs_ops *file_system[] = { -#if defined(LOADER_UFS_SUPPORT) - &ufs_fsops, -#endif -#if defined(LOADER_CD9660_SUPPORT) - &cd9660_fsops, -#endif -#if defined(LOADER_EXT2FS_SUPPORT) - &ext2fs_fsops, -#endif -#if defined(LOADER_NFS_SUPPORT) - &nfs_fsops, -#endif -#if defined(LOADER_TFTP_SUPPORT) - &tftp_fsops, -#endif -#if defined(LOADER_GZIP_SUPPORT) - &gzipfs_fsops, -#endif -#if defined(LOADER_BZIP2_SUPPORT) - &bzipfs_fsops, -#endif - &dosfs_fsops, - NULL -}; - -extern struct netif_driver kbootnet; - -struct netif_driver *netif_drivers[] = { -#if 0 /* XXX */ -#if defined(LOADER_NET_SUPPORT) - &kbootnet, -#endif -#endif - NULL, -}; - -/* Exported for PowerPC only */ -/* - * Sort formats so that those that can detect based on arguments - * rather than reading the file go first. - */ - -extern struct file_format ppc_elf64; - -struct file_format *file_formats[] = { - &ppc_elf64, - NULL -}; - -/* - * Consoles - */ -extern struct console hostconsole; - -struct console *consoles[] = { - &hostconsole, - NULL -}; - diff --git a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c b/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c index 93dcb2ea9c3b..5851d71fdc13 100644 --- a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c +++ b/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c @@ -170,3 +170,13 @@ struct file_format ppc_elf64 = ppc64_elf_loadfile, ppc64_elf_exec }; + +/* + * Sort formats so that those that can detect based on arguments rather than + * reading the file first. + */ + +struct file_format *file_formats[] = { + &ppc_elf64, + NULL +}; diff --git a/stand/kboot/arch/amd64/conf.c b/stand/kboot/conf.c similarity index 100% rename from stand/kboot/arch/amd64/conf.c rename to stand/kboot/conf.c