From nobody Wed Feb 07 17:39:43 2024 X-Original-To: dev-commits-ports-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 4TVS6l4FF9z59m9d; Wed, 7 Feb 2024 17:39:43 +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 4TVS6l3VY3z4dvw; Wed, 7 Feb 2024 17:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707327583; 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=cbmNhYQ3buoYVOh5e5suQs/QJxsFJH6Y4OMy2Xqi+2g=; b=vqkif05ilGkhzArBGvCcnkUffri2OcJfV96Ej9qwU7dGhqBVnxhAHDmf0d4DKOnHNG1JR0 8KnMnGF7MAhAKuOojydbOY9QOnDfYhAp3beJR3ynsMqrBtv85TBogb2/Lgg++9I0x8On5f 6Fyg+rQP7TfNdsGWK38oSdzSKKD2yjrK7jheiFZP5txXnhZ0EhJ0YrwL2R92agPrZZptEn kykFPWDn6KiP2tCh+r/N72IBlYq6lJptGi9TRfzFqSjMx6rYQUKVNF1NROaAsgn/iCqEOk bI3MaARpxiUcf2dKr5MnbIo74pZNUKF5taFPlL2SVV5oDXi30nuOl1Y9DLRPjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707327583; 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=cbmNhYQ3buoYVOh5e5suQs/QJxsFJH6Y4OMy2Xqi+2g=; b=Pc7qb0YsTUNdOCGxDDjfpkLA3Zrpn2PkGCeG8y9ARilTDCaqEASwrhxsBbJInmaywxqnxx l62Ca34LDi+QjdhVFobSwqamNqlFXD+fjBXvdYboq2gveVIMwrG3w8FY4fwCTic5XAlEjO QQXCAGZv4ZafSQYWbkDr2TXy2HFLejI6lwnJrh2DnGGDWTK/5W0DUZbCqMFZuIiVQ3KGqI NuL3diPdlHX+UXNyIer2nDRRPjMGx2s0IEc/cMaLHP7WixQWkNiNOmFfgxR31cMfmb6xfZ kkwYr4OmrLRob6otxUXXJvEUOIM9u5NzaAXJ1Gd7R7BaaNT27EJGnmjdEQ2l8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707327583; a=rsa-sha256; cv=none; b=MR0tZkhPVgTmzCZ2nc+u329/+iH/ly7sM7Jjyt43KETvr4lOtqdhwHDD1QrkjB6uMAP0Z/ wbaBHfi9i+Ew5d/N5n+uXxrOLhsIbnWdUaajrozfw9khPIAwVdRdb5Ga21pLF2jIbQ2guv 3YjpgG6E+OHX08Q647DZeINJtAECTtTenr32PSH7Y/E77KMtoATeg9kAX3pIN9W69NcjYl b5IwmwM/hj3ohPTLemXq4/sINFlIgTnKwISetglTuyG7/2/YdcoqMWmVAk5Dn7uMwFreha Qr924f+rinxSXwxt3cMYa89QWqoBpb/OUcG8hgxoZJquFggZig9S6UrPCR0+hw== 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 4TVS6l2RgVzFxH; Wed, 7 Feb 2024 17:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 417Hdhkw004956; Wed, 7 Feb 2024 17:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 417Hdhrb004953; Wed, 7 Feb 2024 17:39:43 GMT (envelope-from git) Date: Wed, 7 Feb 2024 17:39:43 GMT Message-Id: <202402071739.417Hdhrb004953@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mark Johnston Subject: git: ba5777140ec4 - main - sysutils/u-boot-bhyve-arm64: Fix after the 2024.01 import List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba5777140ec41aae909456f6da77e1b336f52fcb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba5777140ec41aae909456f6da77e1b336f52fcb commit ba5777140ec41aae909456f6da77e1b336f52fcb Author: Mark Johnston AuthorDate: 2024-02-07 16:24:07 +0000 Commit: Mark Johnston CommitDate: 2024-02-07 17:27:10 +0000 sysutils/u-boot-bhyve-arm64: Fix after the 2024.01 import Because this config is not yet upstreamed (pending arm64/bhyve/vmm actually landing in main), we have to maintain our own for the time being. Tweak the config to work around two problems which arose after the latest update: - EFI support implies SMBIOS support, which requires that we implement a finalizer, which we don't have. Since SMBIOS support isn't required, just remove it. - Don't configure EVENT, as we don't use it, and its configuration implies that we implement a hook that runs immediately before command processing. While here, incorporate a patch from jrtc27 which permits booting from images formatted using an MBR. Reviewed by: manu, jrtc27 Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D43784 Differential Revision: https://reviews.freebsd.org/D43785 --- sysutils/u-boot-bhyve-arm64/Makefile | 2 ++ .../files/patch-configs_bhyve__arm64__defconfig | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sysutils/u-boot-bhyve-arm64/Makefile b/sysutils/u-boot-bhyve-arm64/Makefile index 380254843ab6..9b99853b5f54 100644 --- a/sysutils/u-boot-bhyve-arm64/Makefile +++ b/sysutils/u-boot-bhyve-arm64/Makefile @@ -1,5 +1,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2024.01= 1 + MODEL= bhyve-arm64 BOARD_CONFIG= bhyve_arm64_defconfig FAMILY= bhyve diff --git a/sysutils/u-boot-bhyve-arm64/files/patch-configs_bhyve__arm64__defconfig b/sysutils/u-boot-bhyve-arm64/files/patch-configs_bhyve__arm64__defconfig index 8a2bfad53b89..2ccbc4478473 100644 --- a/sysutils/u-boot-bhyve-arm64/files/patch-configs_bhyve__arm64__defconfig +++ b/sysutils/u-boot-bhyve-arm64/files/patch-configs_bhyve__arm64__defconfig @@ -1,6 +1,6 @@ --- configs/bhyve_arm64_defconfig.orig 2023-11-01 18:14:48 UTC +++ configs/bhyve_arm64_defconfig -@@ -0,0 +1,1495 @@ +@@ -0,0 +1,1496 @@ +# +# Automatically generated file; DO NOT EDIT. +# U-Boot 2023.07.02 Configuration @@ -384,8 +384,8 @@ +# Start-up hooks +# +# CONFIG_CYCLIC is not set -+CONFIG_EVENT=y -+CONFIG_EVENT_DYNAMIC=y ++# CONFIG_EVENT is not set ++# CONFIG_EVENT_DYNAMIC is not set +# CONFIG_EVENT_DEBUG is not set +# CONFIG_ARCH_MISC_INIT is not set +# CONFIG_BOARD_EARLY_INIT_F is not set @@ -700,8 +700,8 @@ +# +CONFIG_PARTITIONS=y +# CONFIG_MAC_PARTITION is not set -+# CONFIG_DOS_PARTITION is not set -+# CONFIG_ISO_PARTITION is not set ++CONFIG_DOS_PARTITION=y ++CONFIG_ISO_PARTITION=y +# CONFIG_AMIGA_PARTITION is not set +CONFIG_EFI_PARTITION=y +CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=128 @@ -798,7 +798,7 @@ +# CONFIG_DM_DEBUG is not set +# CONFIG_DM_STATS is not set +CONFIG_DM_DEVICE_REMOVE=y -+CONFIG_DM_EVENT=y ++# CONFIG_DM_EVENT is not set +CONFIG_DM_STDIO=y +CONFIG_DM_SEQ_ALIAS=y +# CONFIG_DM_DMA is not set @@ -1430,7 +1430,8 @@ +# +# System tables +# -+CONFIG_GENERATE_SMBIOS_TABLE=y ++CONFIG_SMBIOS=n ++# CONFIG_GENERATE_SMBIOS_TABLE is not set +# CONFIG_LIB_RATIONAL is not set +# CONFIG_SMBIOS_PARSER is not set +CONFIG_EFI_LOADER=y