From nobody Thu May 11 20:06:49 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 4QHNG15sbFz49xCG; Thu, 11 May 2023 20:06:49 +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 4QHNG14pjZz3nbw; Thu, 11 May 2023 20:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835609; 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=NuSSlHMuiZnxjQ33RuqUJpnyyyVWZyf5YlGIj6olGPQ=; b=XNxnFJ25TuDgju7LoN+fiyzSTUSnkw6KP5csB+a4NR34L1k604CyAnLyQjtBdqxkhTCdeh 6JNMPdmta7AQpaWBRXZlnG2PJXFmLgzQ10nDybnM8mzE4pBgBvo/IT8e2wMCvr6ROzNg+5 QRE7Cahr//LLGrhBA+l09aT4oXK/5iNuKBWVMC1agV1J/Za8+VkafsqRN2n7i2Sus8ylQw kR4QL9vraQdn7b4Ha/TpiSteNj2ZUGevjBuxEwa75IhA107GMWcfDVkn9y2pB+MWZmlw91 gRDFaje5Kc4oZzvDtbef7n0MOKWX8qPPMnDW0HhwzWCNY7LYbGyCX+lKsw1UpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835609; 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=NuSSlHMuiZnxjQ33RuqUJpnyyyVWZyf5YlGIj6olGPQ=; b=MXSTQiadu48cE772Udgv6bqesEo5lliXgXJQbT/tmvv7OY1BCbRWeIj2uh3Ke9LRnMwh+T quMl6d1Kne92Ia1jRZAzDEgytlIUEcCtWoe9FIvSzaSwzfSCohlihDhvBxyFNiZiUjd4NO 80oCviM4fb9OpQESksLKm/KJ7FfDkpmDnuV0Fcu/0WbBCcQ8V9BcaEyFvoB0UOkMzr/hRp PfslDn/9Xa1+aDGD5L/dL+z4nwbj2VnwZstQKiL/3zKWZRefUDEFREyP12lXEPUmlSoLvN MTzboK+tGNTP8oJrGOgcxoZIb4kqY1Inv60CHVUlRyulBT297/+jMRV8bULupQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835609; a=rsa-sha256; cv=none; b=ggDWQsSlWqW0URbWWGYdqKyAVWvfox7GXwCjp21KtGs7qj2RWfzvFtq3jGxk9dnFIIUr3L lwR9k6Ia8UM6Dpo4UkwB2uFLgl+xnAEGNljNUebC4m9Ubu8elXMMLjwZtzzaf6qGCRLgH3 Ydd8C7wAG+YVcXri7Uy9B+V0BQjJT1LVyJcpZuPUGwpX3MmBLuohtuY9RaQKkgPMW1sTKk aAYBQW9hzvyYhBUBDje7TY6FgZXRpS80xlZiwa39wtStyLKiJrtVceKXAboTEVWDwq0d1n c70GelKkD2rNkbmySW0/iT/HN3HdJFGKixz94HVmq97oDJrCnwTB6Ok5DhuJWw== 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 4QHNG13h9lz16Gn; Thu, 11 May 2023 20:06:49 +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 34BK6ntW019559; Thu, 11 May 2023 20:06:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6nrv019558; Thu, 11 May 2023 20:06:49 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:49 GMT Message-Id: <202305112006.34BK6nrv019558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bab80c12a852 - main - stand: Move eficom to libefi 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/main X-Git-Reftype: branch X-Git-Commit: bab80c12a852928b572293f34210c5a19aeba17a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bab80c12a852928b572293f34210c5a19aeba17a commit bab80c12a852928b572293f34210c5a19aeba17a Author: Warner Losh AuthorDate: 2023-05-11 20:03:42 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand: Move eficom to libefi Rename efiserialc to eficom.c and move it to libefi. Remove loader.efi.h, since it's not needed. It's architecture independent (though how we use it might vary). Drivers also belong in libfoo in the boot loader: all the BIOS drivers are in i386/libi386 and the console driver is in efi/libefi. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D40007 --- stand/efi/libefi/Makefile | 1 + stand/efi/{loader/efiserialio.c => libefi/eficom.c} | 2 -- stand/efi/loader/arch/amd64/Makefile.inc | 1 - stand/efi/loader/arch/arm/Makefile.inc | 1 - stand/efi/loader/arch/arm64/Makefile.inc | 1 - stand/efi/loader/arch/riscv/Makefile.inc | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile index 8f1a30d86900..51970397fd86 100644 --- a/stand/efi/libefi/Makefile +++ b/stand/efi/libefi/Makefile @@ -11,6 +11,7 @@ SRCS= delay.c \ efi_console.c \ efi_driver_utils.c \ efichar.c \ + eficom.c \ efienv.c \ efihttp.c \ efinet.c \ diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/libefi/eficom.c similarity index 99% rename from stand/efi/loader/efiserialio.c rename to stand/efi/libefi/eficom.c index 16f28080f80e..67f29ad99ea8 100644 --- a/stand/efi/loader/efiserialio.c +++ b/stand/efi/libefi/eficom.c @@ -34,8 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "loader_efi.h" - static EFI_GUID serial = SERIAL_IO_PROTOCOL; #define COMC_TXWAIT 0x40000 /* transmit timeout */ diff --git a/stand/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loader/arch/amd64/Makefile.inc index bd89044bd6c7..0d9e2648cb59 100644 --- a/stand/efi/loader/arch/amd64/Makefile.inc +++ b/stand/efi/loader/arch/amd64/Makefile.inc @@ -5,7 +5,6 @@ SRCS+= amd64_tramp.S \ elf64_freebsd.c \ trap.c \ multiboot2.c \ - efiserialio.c \ exc.S .PATH: ${BOOTSRC}/i386/libi386 diff --git a/stand/efi/loader/arch/arm/Makefile.inc b/stand/efi/loader/arch/arm/Makefile.inc index 284e517bfbb8..74e6616e991b 100644 --- a/stand/efi/loader/arch/arm/Makefile.inc +++ b/stand/efi/loader/arch/arm/Makefile.inc @@ -1,7 +1,6 @@ # $FreeBSD$ SRCS+= exec.c \ - efiserialio.c \ start.S HAVE_FDT=yes diff --git a/stand/efi/loader/arch/arm64/Makefile.inc b/stand/efi/loader/arch/arm64/Makefile.inc index 9978d9c4ea9c..a71bcc2e1a1f 100644 --- a/stand/efi/loader/arch/arm64/Makefile.inc +++ b/stand/efi/loader/arch/arm64/Makefile.inc @@ -3,7 +3,6 @@ HAVE_FDT=yes SRCS+= exec.c \ - efiserialio.c \ start.S .PATH: ${BOOTSRC}/arm64/libarm64 diff --git a/stand/efi/loader/arch/riscv/Makefile.inc b/stand/efi/loader/arch/riscv/Makefile.inc index 333b789e935d..032c8a43bd51 100644 --- a/stand/efi/loader/arch/riscv/Makefile.inc +++ b/stand/efi/loader/arch/riscv/Makefile.inc @@ -3,5 +3,4 @@ HAVE_FDT=yes SRCS+= exec.c \ - efiserialio.c \ start.S