From owner-svn-ports-all@freebsd.org Wed Mar 18 01:58:11 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E4D3B278CFF; Wed, 18 Mar 2020 01:58:11 +0000 (UTC) (envelope-from kevans@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48htVB5TfXz3KYl; Wed, 18 Mar 2020 01:58:10 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 709351AA41; Wed, 18 Mar 2020 01:58:09 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02I1w9EY013338; Wed, 18 Mar 2020 01:58:09 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02I1w874013331; Wed, 18 Mar 2020 01:58:08 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202003180158.02I1w874013331@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 18 Mar 2020 01:58:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528622 - in branches/2020Q1/sysutils: u-boot-master u-boot-rpi3 u-boot-rpi3/files u-boot-rpi4 u-boot-rpi4/files X-SVN-Group: ports-branches X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in branches/2020Q1/sysutils: u-boot-master u-boot-rpi3 u-boot-rpi3/files u-boot-rpi4 u-boot-rpi4/files X-SVN-Commit-Revision: 528622 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2020 01:58:12 -0000 Author: kevans Date: Wed Mar 18 01:58:08 2020 New Revision: 528622 URL: https://svnweb.freebsd.org/changeset/ports/528622 Log: MFH: r528547 sysutils/u-boot-rpi{3,4}: Add patch to fix PSCI stub reservation For the traditional spin table setup, only the lowest page needs to be reserved. However, our PSCI stubs are slightly bigger and occupy a little over one page. These patches, already sent upstream, allow a variable number of initial pages to be reserved for the SMP stubs. We then set the values for these in our fragment to '2' to reserve the first and second page. Approved by: koobs (mentor) Approved by: manu (uboot, maintainer) Differential Revision: https://reviews.freebsd.org/D24085 Approved by: ports-secteam (joneum) Modified: branches/2020Q1/sysutils/u-boot-master/distinfo branches/2020Q1/sysutils/u-boot-rpi3/Makefile branches/2020Q1/sysutils/u-boot-rpi3/files/rpi3_fragment branches/2020Q1/sysutils/u-boot-rpi4/Makefile branches/2020Q1/sysutils/u-boot-rpi4/files/rpi4_fragment Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/sysutils/u-boot-master/distinfo ============================================================================== --- branches/2020Q1/sysutils/u-boot-master/distinfo Wed Mar 18 00:55:12 2020 (r528621) +++ branches/2020Q1/sysutils/u-boot-master/distinfo Wed Mar 18 01:58:08 2020 (r528622) @@ -1,4 +1,4 @@ -TIMESTAMP = 1573202420 +TIMESTAMP = 1584323217 SHA256 (u-boot/u-boot-2019.10.tar.bz2) = 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014 SIZE (u-boot/u-boot-2019.10.tar.bz2) = 14214608 SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97 @@ -23,3 +23,7 @@ SHA256 (u-boot/1189497/raw) = 3c433ddf46b8c64f56a9699a SIZE (u-boot/1189497/raw) = 2241 SHA256 (u-boot/1189495/raw) = ad1233a1da6171b83936e422c67467a54559364cc426d6804d20d425949a933d SIZE (u-boot/1189495/raw) = 3918 +SHA256 (u-boot/1245351/raw) = 02cec0ca1934ba64d010ec7f0453faa127b19aaae679d6bd9b946a3653837434 +SIZE (u-boot/1245351/raw) = 707 +SHA256 (u-boot/1245352/raw) = a4f48937cd9403b7f7708ba1fc5b9405da97bdedff25fdeb198ab613294e7d45 +SIZE (u-boot/1245352/raw) = 465 Modified: branches/2020Q1/sysutils/u-boot-rpi3/Makefile ============================================================================== --- branches/2020Q1/sysutils/u-boot-rpi3/Makefile Wed Mar 18 00:55:12 2020 (r528621) +++ branches/2020Q1/sysutils/u-boot-rpi3/Makefile Wed Mar 18 01:58:08 2020 (r528622) @@ -2,8 +2,12 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2019.10= 1 + EXTRA_PATCHES= ${.CURDIR}/files/ PATCHFILES+= 939129/raw +# Allow variable reservation of lowest pages for increased PSCI stub size. +PATCHFILES+= 1245351/raw 1245352/raw MODEL= rpi3 BOARD_CONFIG= rpi_3_defconfig Modified: branches/2020Q1/sysutils/u-boot-rpi3/files/rpi3_fragment ============================================================================== --- branches/2020Q1/sysutils/u-boot-rpi3/files/rpi3_fragment Wed Mar 18 00:55:12 2020 (r528621) +++ branches/2020Q1/sysutils/u-boot-rpi3/files/rpi3_fragment Wed Mar 18 01:58:08 2020 (r528622) @@ -1,3 +1,4 @@ CONFIG_OF_EMBED=n CONFIG_OF_BOARD=y CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" +CONFIG_RPI_EFI_NR_SPIN_PAGES=2 Modified: branches/2020Q1/sysutils/u-boot-rpi4/Makefile ============================================================================== --- branches/2020Q1/sysutils/u-boot-rpi4/Makefile Wed Mar 18 00:55:12 2020 (r528621) +++ branches/2020Q1/sysutils/u-boot-rpi4/Makefile Wed Mar 18 01:58:08 2020 (r528622) @@ -2,12 +2,16 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2019.10= 1 + EXTRA_PATCHES= ${.CURDIR}/files/ PATCHFILES+= 939129/raw # Updated libfdt, pre-req to the next set PATCHFILES+= 1137331/raw 1137330/raw # Fix memory bank issues PATCHFILES+= 1189494/raw 1189493/raw 1189497/raw 1189495/raw +# Allow variable reservation of lowest pages for increased PSCI stub size. +PATCHFILES+= 1245351/raw 1245352/raw MODEL= rpi4 BOARD_CONFIG= rpi_4_defconfig Modified: branches/2020Q1/sysutils/u-boot-rpi4/files/rpi4_fragment ============================================================================== --- branches/2020Q1/sysutils/u-boot-rpi4/files/rpi4_fragment Wed Mar 18 00:55:12 2020 (r528621) +++ branches/2020Q1/sysutils/u-boot-rpi4/files/rpi4_fragment Wed Mar 18 01:58:08 2020 (r528622) @@ -1 +1,2 @@ CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" +CONFIG_RPI_EFI_NR_SPIN_PAGES=2