From nobody Sun Dec 10 08:39:47 2023 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 4Snyx00RC6z53Q3m; Sun, 10 Dec 2023 08:39:48 +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 4Snywz6kZQz3fSG; Sun, 10 Dec 2023 08:39:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702197587; 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=NMp47Rx349uvCK4CTpLt5jxfdChWu0JqAk2qOZDy6Ss=; b=qR5VdvPFKLBBtdkDg63JmMTMOldJ8Ct3A40S8OC5fmf+w4XaSSeM+o4EZZsa+wpStknGme VDk1Mga/iCFwp+rijZt5h6ajKAFscLnCUKdXsgkEX6oLYNDiFy67tLrlFq95b6tAn7hTFW GfkwfzkbBfegtkDPdmNoqCmnklJxKFm2xi+/fDIzS7YoxqEtZz5/372kYOKJDVA1BbD6XU FjZyzx99KtZLo53v6D6wq7NXWm45oWcUQpDDUt05k3RgzZknooJtPhDiPjv3GJ4U2a7/d/ yTKU5Rvio/dNfULnFPf71jHRJI74FRS4lITVayTCp14GFcDKX1K9GsDjdTiScw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702197587; a=rsa-sha256; cv=none; b=JUkdLP1dEZesPQ05YkMc9FqP23o7b0iTnm/Ywf5i3y5GFeAbcPCVgORYCt0nPdvKGM4W3z qruR7crDtY+lGkrR4YWJwl6sLGtDnmN2lsP3sato9lmYavacQGyOTT+1ZScD+8f7UolKJk MyN4EASTFCeHMgPDDqDuDBT2XYI7gH4ZeJ7AFcEhOSkZpVKnJPP4zDvueW8MwZe6AwJXEA BzOJNKVBNDLtbEgsUYXoBkJhipHrOcIm58gmSoEOI4y5STxq7wT4O6YQ1S7imWhgUefD/9 QiQwzANieDwieM7h1msWMMXkWLUuSrNDPtdcSXK7sjKmdlOLc5BrOgV9IRBWbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702197587; 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=NMp47Rx349uvCK4CTpLt5jxfdChWu0JqAk2qOZDy6Ss=; b=AMWtNjA9YT9AjAF5Z8WW8E7lpvwRVxMetim9tO9K/ylysEXtzCLYdeMg3EwxrcW/8ZEKjD ozVSHm8Ew9BIQL3Gc1MrCtCuHYoiD7lpncYPZ3oCCvPGPP6ynk9Pd25gN9taEJVkZv+Ngp bA/rO4aNMKmHXtrxCRpxd6RBy8nxQT0NzrnlC3d4HIliIgLng78Ku6K46ADn6FWn64lOuG 47lfuHoVhUCZo5CPvWZ6nliXXjGZHY2pW/QiUvgIr8GdDkdN2hFOO4SnwTHqVZXexKAwvz J3cW6GqxRhgnnlW2oXb1JeUy9UuFT3Jamh+xGDFhxzHTDlDfFEEicYWimufdaQ== 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 4Snywz5n16zgqY; Sun, 10 Dec 2023 08:39:47 +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 3BA8dlvx087658; Sun, 10 Dec 2023 08:39:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BA8dlVb087655; Sun, 10 Dec 2023 08:39:47 GMT (envelope-from git) Date: Sun, 10 Dec 2023 08:39:47 GMT Message-Id: <202312100839.3BA8dlVb087655@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: 8b9b8aae81be - main - sysutils/u-boot-rpi*: Fix sd boot after v2023.10 update 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: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b9b8aae81be653e37160b9f23ca4a18b99f4b51 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b9b8aae81be653e37160b9f23ca4a18b99f4b51 commit 8b9b8aae81be653e37160b9f23ca4a18b99f4b51 Author: Emmanuel Vadot AuthorDate: 2023-12-10 08:38:31 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-10 08:38:31 +0000 sysutils/u-boot-rpi*: Fix sd boot after v2023.10 update U-Boot update broke sd boot for rpi* models, use upstream patch that fixes it. PR: 275655 Sponsored by: Beckhoff Automation GmbH & Co.KG --- sysutils/u-boot-master/distinfo | 4 +++- sysutils/u-boot-rpi-0-w/Makefile | 4 ++++ sysutils/u-boot-rpi-arm64/Makefile | 3 +++ sysutils/u-boot-rpi/Makefile | 4 ++++ sysutils/u-boot-rpi2/Makefile | 4 ++++ sysutils/u-boot-rpi3/Makefile | 3 +++ sysutils/u-boot-rpi4/Makefile | 3 +++ 7 files changed, 24 insertions(+), 1 deletion(-) diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo index 29e8ed6636fd..f0978abb36ae 100644 --- a/sysutils/u-boot-master/distinfo +++ b/sysutils/u-boot-master/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1702140241 +TIMESTAMP = 1702197339 SHA256 (u-boot/u-boot-2023.10.tar.bz2) = e00e6c6f014e046101739d08d06f328811cebcf5ae101348f409cbbd55ce6900 SIZE (u-boot/u-boot-2023.10.tar.bz2) = 19645392 SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7 @@ -21,3 +21,5 @@ SHA256 (u-boot/1810053/raw) = b67fc8833e226a1a6279a098554f43465170805ce8db5a4074 SIZE (u-boot/1810053/raw) = 1062 SHA256 (u-boot/1810054/raw) = 21418aecaa879caaceaa6acdc07869f5407253bb4fa82044a9771a5222eb5958 SIZE (u-boot/1810054/raw) = 468 +SHA256 (u-boot/1838641/raw) = 953924a8e1df590f64931a3a4b9b55422f2a2f97cd51a42d5caef2c5bb565c4f +SIZE (u-boot/1838641/raw) = 2523 diff --git a/sysutils/u-boot-rpi-0-w/Makefile b/sysutils/u-boot-rpi-0-w/Makefile index 125c9584ace2..a00d2ca8330d 100644 --- a/sysutils/u-boot-rpi-0-w/Makefile +++ b/sysutils/u-boot-rpi-0-w/Makefile @@ -1,5 +1,9 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2023.10= 1 + +PATCHFILES+= 1838641/raw + MODEL= rpi-0-w BOARD_CONFIG= rpi_0_w_defconfig FAMILY= rpi diff --git a/sysutils/u-boot-rpi-arm64/Makefile b/sysutils/u-boot-rpi-arm64/Makefile index 26be706afbae..25c442df55bf 100644 --- a/sysutils/u-boot-rpi-arm64/Makefile +++ b/sysutils/u-boot-rpi-arm64/Makefile @@ -1,6 +1,9 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2023.10= 1 + EXTRA_PATCHES= ${.CURDIR}/files/ +PATCHFILES+= 1838641/raw MODEL= rpi-arm64 BOARD_CONFIG= rpi_arm64_defconfig diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile index c92c9c17963a..7958e0d84c99 100644 --- a/sysutils/u-boot-rpi/Makefile +++ b/sysutils/u-boot-rpi/Makefile @@ -1,7 +1,11 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2023.10= 1 + WWW= https://wiki.freebsd.org/FreeBSD/arm/Raspberry%20Pi +PATCHFILES+= 1838641/raw + MODEL= rpi BOARD_CONFIG= rpi_defconfig FAMILY= rpi diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile index 054ab962dd6e..46309bd46fc8 100644 --- a/sysutils/u-boot-rpi2/Makefile +++ b/sysutils/u-boot-rpi2/Makefile @@ -1,7 +1,11 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2023.10= 1 + WWW= https://wiki.freebsd.org/FreeBSD/arm/Raspberry%20Pi +PATCHFILES+= 1838641/raw + MODEL= rpi2 BOARD_CONFIG= rpi_2_defconfig FAMILY= rpi diff --git a/sysutils/u-boot-rpi3/Makefile b/sysutils/u-boot-rpi3/Makefile index 0ba914341934..58afe44225e8 100644 --- a/sysutils/u-boot-rpi3/Makefile +++ b/sysutils/u-boot-rpi3/Makefile @@ -1,6 +1,9 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2023.10= 1 + EXTRA_PATCHES?= ${.CURDIR}/files/ +PATCHFILES+= 1838641/raw MODEL?= rpi3 BOARD_CONFIG?= rpi_3_defconfig diff --git a/sysutils/u-boot-rpi4/Makefile b/sysutils/u-boot-rpi4/Makefile index cf50d7a125dd..6a65891a041f 100644 --- a/sysutils/u-boot-rpi4/Makefile +++ b/sysutils/u-boot-rpi4/Makefile @@ -1,6 +1,9 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2023.10= 1 + EXTRA_PATCHES= ${.CURDIR}/files/ +PATCHFILES+= 1838641/raw MODEL= rpi4 BOARD_CONFIG= rpi_4_defconfig