From nobody Tue Jan 24 13:27:10 2023 X-Original-To: dev-commits-ports-main@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 4P1SSG5Ptcz3bSx3; Tue, 24 Jan 2023 13:27:10 +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 4P1SSG500Mz4FWq; Tue, 24 Jan 2023 13:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674566830; 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=zMhK5O8AtMRk8Hwj8DSFYnPvKuuPaFq6e+MrABLsw+s=; b=WJVNICrbpOjTngq4lbp0RMkMVnwnNa47rGN3wwyWTpvnd9nsEublFNzZVz+opoOKqwJCY0 Oub7AylYDDLZb/0iG2CbGvZ8qaZaxZE/R85PqTlS6msjxXdaQX9fm9H9oibHnKFCsAXyXj DE7aESdMZYhqIzeQvzR7bxft64OYNzKELcVawjRp3sIJUlD5ojC/vrWP6hfX5tdkCNujUf a4oxB0dt1X0zG8OCFw6Ccg/lXt+uzG66nF/SICy0MYFH3663QI+tkYzUxjv3A7FaRWPTNu 5YMemjbNfDKn6vq+JKTgXPSDbuqISm69QzKzPKO+6A1AThbwtxG2rJhwLQ/68g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674566830; 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=zMhK5O8AtMRk8Hwj8DSFYnPvKuuPaFq6e+MrABLsw+s=; b=gN3pWfciMr3+r9blK8s/PypHx5psqsl9a4yHaVQf+OnjYKNJ7oGP3720y3f493cQbij4iM O4uAnpLDEL7fhFIKzlbc4c53KnY3lqoGQUAG9uzwsz5x4UQOMfjYOwT8QxxDe9cO3Mjljh dQcyz301src4K2ilWLM40nLPnsyux1KCHWtikbIiJxvUFsmUvTbQZuO4FBWn9kcA8rlDea OWb8Xnl20qL5NGkHxJZHNtG/nnN9cGKc6DUeG/xbQHibeE0o4n9QEBlZvBxe7qJQ88Zd45 v7sNCp1sQo2n0zruZiwBSIvAM2JQFBCx2I03l0MKQbasRLlTaNHngyjDGdf/ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674566830; a=rsa-sha256; cv=none; b=eBNrv/lhJK4WSz4kwsg474xcI8+QocmGtTbLKzwi23frMI6+I5UpcfU0f9Mssqwrcw5Ew0 BkeDem+hDGS49fTlrlTGSB8OOe4GqcioWbT/nH2xmOElI+xFvArUPW3N6a9UA6A5akcLgd gktsrXci2DQN5kwZqQ4JYKnwxNF1Sqt7ojfkJSi0XaFre1cVjlW8ptF4/FxQ4FxYq5OraC 0Xxd+FRGFZU6W/K9sQIH4a4r3q+58OVoQ2DJn4EOgQVtDHYKYwG+xs1Ufy3jkyHukptwNs HSxY/I9ZVw6SLOAGxnDE6EqzeJKooQQIxLsiKRtzlr/a2pEJfIWFQMwntuOeTA== 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 4P1SSG3x9cz19LG; Tue, 24 Jan 2023 13:27:10 +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 30ODRAa0023273; Tue, 24 Jan 2023 13:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30ODRA2B023272; Tue, 24 Jan 2023 13:27:10 GMT (envelope-from git) Date: Tue, 24 Jan 2023 13:27:10 GMT Message-Id: <202301241327.30ODRA2B023272@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 9222ec292a4e - main - sysutils/u-boot-*: Update to 2023.01 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9222ec292a4ec8de09ca4b8eda7b2e52ca9231fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=9222ec292a4ec8de09ca4b8eda7b2e52ca9231fb commit 9222ec292a4ec8de09ca4b8eda7b2e52ca9231fb Author: Emmanuel Vadot AuthorDate: 2023-01-10 08:13:35 +0000 Commit: Emmanuel Vadot CommitDate: 2023-01-24 13:26:43 +0000 sysutils/u-boot-*: Update to 2023.01 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sysutils/u-boot-clearfog/pkg-descr | 2 +- sysutils/u-boot-master/Makefile | 13 ++++++++++--- sysutils/u-boot-master/distinfo | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/sysutils/u-boot-clearfog/pkg-descr b/sysutils/u-boot-clearfog/pkg-descr index a81127ccc299..627b6ed7327d 100644 --- a/sysutils/u-boot-clearfog/pkg-descr +++ b/sysutils/u-boot-clearfog/pkg-descr @@ -2,6 +2,6 @@ U-Boot loader for the SolidRun ClearFog Pro. Install the u-boot-spl.kwb file onto the boot disk using: - dd if=u-boot-spl.kwb of=/dev/whatever bs=512 seek=1 + dd if=u-boot-with-spl.kwb of=/dev/whatever bs=512 seek=1 The BootROM searches for U-Boot after the first 512 bytes. diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile index 7d82ac12d36f..0c0802530c0e 100644 --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -23,7 +23,11 @@ BUILD_DEPENDS+= gsed:textproc/gsed \ ${PYTHON_PKGNAMEPREFIX}setuptools-pkg>=0:devel/py-setuptools-pkg@${PY_FLAVOR} BUILD_DEPENDS+= ${COMPILER}:devel/${COMPILER} -USES= bison gmake python:3.7+,build shebangfix tar:bz2 +# For mkeficapsule +BUILD_DEPENDS+= e2fsprogs-libuuid>=0:misc/e2fsprogs-libuuid \ + gnutls>=0:security/gnutls + +USES= bison gmake python:3.7+,build pkgconfig shebangfix tar:bz2 BINARY_ALIAS= bison=${LOCALBASE}/bin/bison dtc=${LOCALBASE}/bin/dtc sed=gsed python3=${PYTHON_CMD} SHEBANG_FILES= tools/binman/binman arch/arm/mach-rockchip/make_fit_atf.py @@ -101,7 +105,7 @@ UBOOT_PLIST_RK3399= idbloader.img u-boot.itb UBOOT_ARCH_RK3399= aarch64 # Override for ARMADA38X family -UBOOT_PLIST_ARMADA38X= u-boot-spl.kwb +UBOOT_PLIST_ARMADA38X= u-boot-with-spl.kwb UBOOT_METADATA_ARMADA38X_FILES= ${UBOOT_PLIST_ARMADA38X} UBOOT_METADATA_ARMADA38X_METHOD= raw UBOOT_METADATA_ARMADA38X_RAW_OFFSET= 1 @@ -114,7 +118,7 @@ UBOOT_PLIST_QEMU= u-boot.bin .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu}) UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}} .endif -UBOOT_VERSION?= 2022.10 +UBOOT_VERSION?= 2023.01 # If a slave port defines a PORTREVISION use it .if defined(U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION}) @@ -137,6 +141,9 @@ ARCHFLAGS=ARCH=${UBOOT_ARCH} .elif ${UBOOT_ARCH} == aarch64 CROSS_COMPILE=aarch64-none-elf- ARCHFLAGS=ARCH=arm +.if ${FAMILY} == allwinner64 +MAKE_ENV+= SCP=/dev/null +.endif .elif ${UBOOT_ARCH} == riscv64 CROSS_COMPILE=riscv64-none-elf- ARCHFLAGS=ARCH=riscv diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo index 7d5377815549..7154b3159d1d 100644 --- a/sysutils/u-boot-master/distinfo +++ b/sysutils/u-boot-master/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1665743502 -SHA256 (u-boot/u-boot-2022.10.tar.bz2) = 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 -SIZE (u-boot/u-boot-2022.10.tar.bz2) = 18365430 +TIMESTAMP = 1673338204 +SHA256 (u-boot/u-boot-2023.01.tar.bz2) = 69423bad380f89a0916636e89e6dcbd2e4512d584308d922d1039d1e4331950f +SIZE (u-boot/u-boot-2023.01.tar.bz2) = 18560442 SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97 SIZE (u-boot/939129/raw) = 310 SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7