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)
MFH:		2020Q1
Differential Revision:	https://reviews.freebsd.org/D24085
This commit is contained in:
Kyle Evans 2020-03-16 21:32:55 +00:00
parent cf116bf998
commit 3efdcc42ff
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=528547
5 changed files with 15 additions and 1 deletions

View File

@ -1,4 +1,4 @@
TIMESTAMP = 1573202420 TIMESTAMP = 1584323217
SHA256 (u-boot/u-boot-2019.10.tar.bz2) = 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014 SHA256 (u-boot/u-boot-2019.10.tar.bz2) = 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014
SIZE (u-boot/u-boot-2019.10.tar.bz2) = 14214608 SIZE (u-boot/u-boot-2019.10.tar.bz2) = 14214608
SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97 SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
@ -23,3 +23,7 @@ SHA256 (u-boot/1189497/raw) = 3c433ddf46b8c64f56a9699aeead85954d922e5fcfad52a7bf
SIZE (u-boot/1189497/raw) = 2241 SIZE (u-boot/1189497/raw) = 2241
SHA256 (u-boot/1189495/raw) = ad1233a1da6171b83936e422c67467a54559364cc426d6804d20d425949a933d SHA256 (u-boot/1189495/raw) = ad1233a1da6171b83936e422c67467a54559364cc426d6804d20d425949a933d
SIZE (u-boot/1189495/raw) = 3918 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

View File

@ -2,8 +2,12 @@
MASTERDIR= ${.CURDIR}/../u-boot-master MASTERDIR= ${.CURDIR}/../u-boot-master
U_BOOT_SLAVE_PORTREVISION_2019.10= 1
EXTRA_PATCHES= ${.CURDIR}/files/ EXTRA_PATCHES= ${.CURDIR}/files/
PATCHFILES+= 939129/raw PATCHFILES+= 939129/raw
# Allow variable reservation of lowest pages for increased PSCI stub size.
PATCHFILES+= 1245351/raw 1245352/raw
MODEL= rpi3 MODEL= rpi3
BOARD_CONFIG= rpi_3_defconfig BOARD_CONFIG= rpi_3_defconfig

View File

@ -1,3 +1,4 @@
CONFIG_OF_EMBED=n CONFIG_OF_EMBED=n
CONFIG_OF_BOARD=y CONFIG_OF_BOARD=y
CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
CONFIG_RPI_EFI_NR_SPIN_PAGES=2

View File

@ -2,12 +2,16 @@
MASTERDIR= ${.CURDIR}/../u-boot-master MASTERDIR= ${.CURDIR}/../u-boot-master
U_BOOT_SLAVE_PORTREVISION_2019.10= 1
EXTRA_PATCHES= ${.CURDIR}/files/ EXTRA_PATCHES= ${.CURDIR}/files/
PATCHFILES+= 939129/raw PATCHFILES+= 939129/raw
# Updated libfdt, pre-req to the next set # Updated libfdt, pre-req to the next set
PATCHFILES+= 1137331/raw 1137330/raw PATCHFILES+= 1137331/raw 1137330/raw
# Fix memory bank issues # Fix memory bank issues
PATCHFILES+= 1189494/raw 1189493/raw 1189497/raw 1189495/raw 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 MODEL= rpi4
BOARD_CONFIG= rpi_4_defconfig BOARD_CONFIG= rpi_4_defconfig

View File

@ -1 +1,2 @@
CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
CONFIG_RPI_EFI_NR_SPIN_PAGES=2