From nobody Tue May 03 08:10:56 2022 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 A81011AB7A71; Tue, 3 May 2022 08:10:56 +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 4Kst283lC0z3qxD; Tue, 3 May 2022 08:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651565456; 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=gkGJi9+doJ2kaUU/udboF719oBfg6OxX9IYpgMkMYeE=; b=bZHQSfcWPSGDrtqN3/9kaeVGycALLYQf7UY3N1Of9KRHbSoN07XYm/EzoLVn+miUBHogah 0BzjWlnKsmGrSSuJmSln3sKdllUnfFmZLUtrALv+nhlQn/piUX4RT0ygSnBfcijLUKUFM/ Frjy/3/h/j40EpQqiqcxE6eygSqy3I+xwbtNk5N5vLUurB3pEJU10jbtr9Fqhn6s9/4b1m YfszS3FRbOBk+sg+TE8X++TcUR+qryCOdUnylJG9Qp93yWiBS/P8AiB+am9K/lIAo44WPM YEOAgmB0BgD0+vbSJCaqwRoCRu0QX3+PgWAunczIXJlU0Uxk/xjn000O71lSGA== 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 421BC1A944; Tue, 3 May 2022 08:10:56 +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 2438Au21000353; Tue, 3 May 2022 08:10:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2438AuMU000352; Tue, 3 May 2022 08:10:56 GMT (envelope-from git) Date: Tue, 3 May 2022 08:10:56 GMT Message-Id: <202205030810.2438AuMU000352@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: ecad553edaec - main - sysutils/u-boot: Update to 2022.04 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: ecad553edaec865109f79d42e711e1c93b44e3a1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651565456; 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=gkGJi9+doJ2kaUU/udboF719oBfg6OxX9IYpgMkMYeE=; b=ocM+dqvDnMS98jCCW01bPLb+aBwS8w2ff/0/3AAgNL6L1mMy9KS9ciY8Fx/LDYsasfv7MF KjFNvmCseiLxRIL0+nH4jQ6ThXBiulkkKgxC88qBCSWXjRvo1GwdYdyzFaLnCrPDaqzeRY ivLmNTKUCJKnMI0RJ3wBLmLihEbHmpzgGcc56w9T6wNfFOF+c4orqJOvNvG0c7h3RUQxZP zc56GEmpiVb95FCEyGaZ2wYnHnxNTPqRD+qz+Hq5G9RTruL3hMX/opjbsfyfDoA8mlBzcW pZeKgFILDpOpVSv9joSd5VGV1Jxg/xlz15iZLJqJLjppONnjzZiCKfMt+raU6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651565456; a=rsa-sha256; cv=none; b=fEPBpZd9/k2DChTTXY2/NVfnngayu793eO7oHDb+3dTFbm/7lMfrqIM3bXwa0bEsWnunPF JCRoaoWeE/Oyi1Ro/OiJzsgfo3z4vO+jGYKNYy4SYq57AsBRIAoxzD8YhozACIgI1IPm/6 Du7VEKU3t745oJzefwNLdlXDitP75cccT+J8LBsxWFJxaSKZBDbjr/yBIgaO8CYPJgbyiy AdqfXjzagMG+SKurooFgszoZzXvQRKuX6JP6Hx1H04HXZdaPX8ViLlS3hw+OaAAiKP+Rit +ljpoTELrWUxt5GnVrDbTPKiSUrCD7zCeaxOWp/IDoR5He4GNz7tPEd+Q5CQUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=ecad553edaec865109f79d42e711e1c93b44e3a1 commit ecad553edaec865109f79d42e711e1c93b44e3a1 Author: Emmanuel Vadot AuthorDate: 2022-05-02 15:15:40 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-03 08:10:43 +0000 sysutils/u-boot: Update to 2022.04 --- sysutils/u-boot-master/Makefile | 9 ++++--- sysutils/u-boot-master/distinfo | 8 +++--- sysutils/u-boot-master/files/patch-common__bootm.c | 31 ---------------------- sysutils/u-boot-rpi-0-w/Makefile | 5 +--- sysutils/u-boot-rpi-arm64/Makefile | 5 +--- sysutils/u-boot-rpi/Makefile | 5 +--- sysutils/u-boot-rpi2/Makefile | 5 +--- sysutils/u-boot-rpi3/Makefile | 5 +--- sysutils/u-boot-rpi4/Makefile | 5 +--- sysutils/u-boot-sifive-fu540/Makefile | 2 -- sysutils/u-boot-sopine-spi/Makefile | 2 ++ .../files/patch-board_sunxi_board.c | 11 ++++++++ sysutils/u-boot-sopine-spi/files/spi_fragment | 1 + 13 files changed, 28 insertions(+), 66 deletions(-) diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile index 48442f118c54..88464f01295c 100644 --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -31,7 +31,8 @@ UBOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} INST= ${PREFIX}/${UBOOT_DIR} DESCR?= ${.CURDIR}/pkg-descr -MAKE_ARGS+= V=1 CROSS_COMPILE=${CROSS_COMPILE} PYTHON=${PYTHON_CMD} ${ARCHFLAGS} +MAKE_ENV+= V=1 CROSS_COMPILE=${CROSS_COMPILE} PYTHON=${PYTHON_CMD} CC=clang +MAKE_ARGS+= ${ARCHFLAGS} NO_ARCH= yes @@ -112,7 +113,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?= 2021.07 +UBOOT_VERSION?= 2022.04 # If a slave port defines a PORTREVISION use it .if defined(U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION}) @@ -222,10 +223,10 @@ CONFIG_FRAGMENT= ${FILESDIR}/${FRAGMENT_NAME} .if defined(CONFIG_FRAGMENT) do-configure: ${CP} ${CONFIG_FRAGMENT} ${WRKSRC}/configs/ - (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME}) + (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} scripts/kconfig/merge_config.sh configs/${BOARD_CONFIG} configs/${FRAGMENT_NAME}) .else do-configure: - (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG}) + (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${BOARD_CONFIG}) .endif post-build: diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo index 77609bffddd3..89c967a085a6 100644 --- a/sysutils/u-boot-master/distinfo +++ b/sysutils/u-boot-master/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1636485856 -SHA256 (u-boot/u-boot-2021.07.tar.bz2) = 312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e -SIZE (u-boot/u-boot-2021.07.tar.bz2) = 17275746 +TIMESTAMP = 1651502800 +SHA256 (u-boot/u-boot-2022.04.tar.bz2) = 68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 +SIZE (u-boot/u-boot-2022.04.tar.bz2) = 17772787 SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97 SIZE (u-boot/939129/raw) = 310 SHA256 (u-boot/1036621/raw) = 28dbd66d14fab9dc782ce091d3c132a226b8425f6503c329ee8a7031b79b52f7 @@ -11,5 +11,3 @@ SHA256 (u-boot/1172554/raw) = d1a39d7d6487cfb481392e7ea4f0bf0d209c08e0c3426c29d7 SIZE (u-boot/1172554/raw) = 640 SHA256 (u-boot/1172555/raw) = 09d17a62fb6bc7c7ab73bfc7061fc5da2b5a32e7deb098c9f76aed8ff8991751 SIZE (u-boot/1172555/raw) = 568 -SHA256 (u-boot/1547145/raw) = 50c6280a5db419597de451be3e89a8660c9f913767af205a4add79a8db6b89ce -SIZE (u-boot/1547145/raw) = 372 diff --git a/sysutils/u-boot-master/files/patch-common__bootm.c b/sysutils/u-boot-master/files/patch-common__bootm.c deleted file mode 100644 index 78c13d80fc70..000000000000 --- a/sysutils/u-boot-master/files/patch-common__bootm.c +++ /dev/null @@ -1,31 +0,0 @@ -From 7d25c0b01248fbfbbcdf668cc1c080fe0b54978f Mon Sep 17 00:00:00 2001 -From: Emmanuel Vadot -Date: Sat, 7 Nov 2020 19:42:31 +0100 -Subject: [PATCH 2/2] Add FreeBSD hack that does not disable usb when - efi_exit_boot_service is called -Content-Type: text/plain; charset=UTF-8 - ---- - common/bootm.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/common/bootm.c b/common/bootm.c -index b3377490b3..22476fc7c9 100644 ---- common/bootm.c -+++ common/bootm.c -@@ -458,7 +458,12 @@ ulong bootm_disable_interrupts(void) - * updated every 1 ms within the HCCA structure in SDRAM! For more - * details see the OpenHCI specification. - */ -+ /* -+ * FreeBSD Hack, on some board this cause efi_exit_bootservice to hang -+ * for some yet unknown reason. -+ * This only does this when doing netboot ??? - usb_stop(); -+ */ - #endif - return iflag; - } --- -2.28.0 - diff --git a/sysutils/u-boot-rpi-0-w/Makefile b/sysutils/u-boot-rpi-0-w/Makefile index 267647371cd5..37cd2a34ad81 100644 --- a/sysutils/u-boot-rpi-0-w/Makefile +++ b/sysutils/u-boot-rpi-0-w/Makefile @@ -1,9 +1,6 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -U_BOOT_SLAVE_PORTREVISION_2021.07= 1 - -PATCHFILES+= 939129/raw \ - 1547145/raw +PATCHFILES+= 939129/raw MODEL= rpi-0-w BOARD_CONFIG= rpi_0_w_defconfig diff --git a/sysutils/u-boot-rpi-arm64/Makefile b/sysutils/u-boot-rpi-arm64/Makefile index a314b98bc4f0..9e25dd915601 100644 --- a/sysutils/u-boot-rpi-arm64/Makefile +++ b/sysutils/u-boot-rpi-arm64/Makefile @@ -1,10 +1,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -U_BOOT_SLAVE_PORTREVISION_2021.07= 1 - EXTRA_PATCHES= ${.CURDIR}/files/ -PATCHFILES+= 939129/raw \ - 1547145/raw +PATCHFILES+= 939129/raw MODEL= rpi-arm64 BOARD_CONFIG= rpi_arm64_defconfig diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile index da431f73c537..52de21af33e1 100644 --- a/sysutils/u-boot-rpi/Makefile +++ b/sysutils/u-boot-rpi/Makefile @@ -1,9 +1,6 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -U_BOOT_SLAVE_PORTREVISION_2021.07= 1 - -PATCHFILES+= 939129/raw \ - 1547145/raw +PATCHFILES+= 939129/raw MODEL= rpi BOARD_CONFIG= rpi_defconfig diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile index f89bfe0dd914..f875b8840cab 100644 --- a/sysutils/u-boot-rpi2/Makefile +++ b/sysutils/u-boot-rpi2/Makefile @@ -1,9 +1,6 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -U_BOOT_SLAVE_PORTREVISION_2021.07= 1 - -PATCHFILES+= 939129/raw \ - 1547145/raw +PATCHFILES+= 939129/raw MODEL= rpi2 BOARD_CONFIG= rpi_2_defconfig diff --git a/sysutils/u-boot-rpi3/Makefile b/sysutils/u-boot-rpi3/Makefile index 80839124f365..b708f98830b3 100644 --- a/sysutils/u-boot-rpi3/Makefile +++ b/sysutils/u-boot-rpi3/Makefile @@ -1,10 +1,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -U_BOOT_SLAVE_PORTREVISION_2021.07= 1 - EXTRA_PATCHES?= ${.CURDIR}/files/ -PATCHFILES+= 939129/raw \ - 1547145/raw +PATCHFILES+= 939129/raw MODEL?= rpi3 BOARD_CONFIG?= rpi_3_defconfig diff --git a/sysutils/u-boot-rpi4/Makefile b/sysutils/u-boot-rpi4/Makefile index 11b2636a6cdf..676ca4a77ffd 100644 --- a/sysutils/u-boot-rpi4/Makefile +++ b/sysutils/u-boot-rpi4/Makefile @@ -1,10 +1,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -U_BOOT_SLAVE_PORTREVISION_2021.07= 1 - EXTRA_PATCHES= ${.CURDIR}/files/ -PATCHFILES+= 939129/raw \ - 1547145/raw +PATCHFILES+= 939129/raw MODEL= rpi4 BOARD_CONFIG= rpi_4_defconfig diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile index 3fba52d998dc..5f79e53b93d8 100644 --- a/sysutils/u-boot-sifive-fu540/Makefile +++ b/sysutils/u-boot-sifive-fu540/Makefile @@ -1,7 +1,5 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -U_BOOT_SLAVE_PORTREVISION_2021.07=1 - MODEL= sifive-fu540 BOARD_CONFIG= sifive_unleashed_defconfig FAMILY= sifive diff --git a/sysutils/u-boot-sopine-spi/Makefile b/sysutils/u-boot-sopine-spi/Makefile index be0ea6e4436d..16a7105b54c6 100644 --- a/sysutils/u-boot-sopine-spi/Makefile +++ b/sysutils/u-boot-sopine-spi/Makefile @@ -4,6 +4,8 @@ MODEL= sopine-spi BOARD_CONFIG= sopine_baseboard_defconfig FAMILY= allwinner64 +EXTRA_PATCHES?= ${.CURDIR}/files/ + CONFIG_FRAGMENT= ${.CURDIR}/../u-boot-sopine-spi/files/spi_fragment FRAGMENT_NAME= spi_fragment NO_METADATA= yes diff --git a/sysutils/u-boot-sopine-spi/files/patch-board_sunxi_board.c b/sysutils/u-boot-sopine-spi/files/patch-board_sunxi_board.c new file mode 100644 index 000000000000..e8bde74a0597 --- /dev/null +++ b/sysutils/u-boot-sopine-spi/files/patch-board_sunxi_board.c @@ -0,0 +1,11 @@ +--- board/sunxi/board.c.orig 2022-05-03 09:13:36.019124000 +0200 ++++ board/sunxi/board.c 2022-05-03 09:13:47.210925000 +0200 +@@ -601,7 +601,7 @@ + case BOOT_DEVICE_MMC2: + return 1; + default: +- return CONFIG_SYS_MMC_ENV_DEV; ++ return 0; + } + } + #endif diff --git a/sysutils/u-boot-sopine-spi/files/spi_fragment b/sysutils/u-boot-sopine-spi/files/spi_fragment index ac8e94c95b69..eb5121d4341e 100644 --- a/sysutils/u-boot-sopine-spi/files/spi_fragment +++ b/sysutils/u-boot-sopine-spi/files/spi_fragment @@ -3,3 +3,4 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_ENV_IS_IN_FAT=n CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_MMC_ENV_DEV=0