From nobody Tue May 03 16:14:32 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 E279E1AB3B74; Tue, 3 May 2022 16:14:32 +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 4Kt4m861h4z4gbp; Tue, 3 May 2022 16:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651594472; 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=Z0CObWqm6Qq1Tq/1xaJNJpXZ/9VDADAUyJNKygNFrN0=; b=hrcM18GwpJmnY2+D4zFB9nVHvWS+6sLq9lb0ZDll+rl8ehqt7ykuTbWMnYiDKTkLYwY5l4 UBHV9zptYWSeOzPna9xAy+R7x6vTMXiDNfsp4BSyuEcCo2hKngxAM8K7/plpbDDfENaGTP E02quth+9omAApxKJJSFrdxmDTzm3G9l27s1GSRrBETDNS0Qx2eW9+31mb4c4GaO4Sd/S3 cOIfxPO6o6bKCnptVRXwPflEQRfUNkTVzQIKhltxmcD1Da6Tr/3MwnU/aqXzQL3HVl3h7O Ekv9EJ6YQDBcX0Yc9iemXf5JbCtNOQNNTeorGPkE+3Vyyi/Rb1sgOIrCmW4aFg== 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 ADD5321347; Tue, 3 May 2022 16:14:32 +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 243GEWB6054205; Tue, 3 May 2022 16:14:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 243GEWP1054204; Tue, 3 May 2022 16:14:32 GMT (envelope-from git) Date: Tue, 3 May 2022 16:14:32 GMT Message-Id: <202205031614.243GEWP1054204@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: 0139633fd311 - main - sysutils/u-boot: Bring back usb patch 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: 0139633fd311e7690f42ac9f4ac9c3e87e9d7e2e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651594472; 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=Z0CObWqm6Qq1Tq/1xaJNJpXZ/9VDADAUyJNKygNFrN0=; b=TCFGRQUtOUfsI2cyKm0H3V/aGT52sJY7TXRPsvvP5jOxRcqUg24WXQEgxlI0yflEwSGa/g 5ImDLVbmEpKfe/eOityWJCj5vNsxz2bmJopjXjKMKy70N5+GFu05EsTeG6PxPYxl5u5Nrr GXd6LhMz2FoJwLAK56Y8zwqMTJAvOh9rmbmUjeaWoJAAVEd46vw43H6R2gajjQLordH7dJ JbJ2LQGu8n443Ou2mYweSZJBLnnS97Bm6jpWPp/2uAqNMnaNd7KQQ8O37FiT6w7uFr/a6J 9rlUUXC1iAuTWf+fM0PEgAsCq2nY9NamNJzjrdle4yRGJmzRMbuVJ18pWaEVBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651594472; a=rsa-sha256; cv=none; b=UUQ2UuQdDBwNisGRWxZ1DixMNgovlgsL9uR9xf8fRrdNsq7lmuknh5jxlwMN9iHYGOLcdo G7QKAF8TzxKuHYoZCxA1GGKsWgRzkBcvZaRq2veQYBmiagFRz/NjH+7gMSJXhOAEwBbzB7 L1BlnpmIn7i/68cl4wwEiGqSUDk1naI5S+NPAnLTajZ48hDm3d4/eybzfG1nn1vbVk/rOX wHCDdJ1qPMgkrAYaL4CC5rz0uhbn6VI2xMjjoddeiTwCRTd0HjC10KquYu/BCGa3+TrkaW oP+H4qkocFKoGQvCPTcA9uFGh8ljqTN9HJvaXsWJMxOLI283U01IH1deDHglBw== 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=0139633fd311e7690f42ac9f4ac9c3e87e9d7e2e commit 0139633fd311e7690f42ac9f4ac9c3e87e9d7e2e Author: Emmanuel Vadot AuthorDate: 2022-05-03 16:12:59 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-03 16:14:21 +0000 sysutils/u-boot: Bring back usb patch The patch is still needed at least on rockchip platform where we probably don't do everything correctly for usb bring up. This is also needed is the next boot stage is usb. Reported by: kevans --- sysutils/u-boot-master/Makefile | 1 + sysutils/u-boot-master/files/patch-boot__bootm.c | 31 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile index 88464f01295c..aca7c0d03b6b 100644 --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -4,6 +4,7 @@ PORTNAME= u-boot PORTVERSION= ${UBOOT_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMESUFFIX?= -${MODEL} MASTER_SITES= https://ftp.denx.de/pub/u-boot/ \ diff --git a/sysutils/u-boot-master/files/patch-boot__bootm.c b/sysutils/u-boot-master/files/patch-boot__bootm.c new file mode 100644 index 000000000000..364ac0822593 --- /dev/null +++ b/sysutils/u-boot-master/files/patch-boot__bootm.c @@ -0,0 +1,31 @@ +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 +--- boot/bootm.c ++++ boot/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 +