| Message ID | 20220827070436.2062-1-gwenj@trabucayre.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | configs/rockpro64: Use mainline ATF | expand |
On 27/08/2022 09:04, Gwenhael Goavec-Merou wrote: > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > Use the mainline ATF as it supports the Pine64 ROCKPro64 board. > > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/2812054016 > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> Applied to master, thanks. Regards, Arnout > --- > configs/rockpro64_defconfig | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/configs/rockpro64_defconfig b/configs/rockpro64_defconfig > index 5086320cbc..d39640f855 100644 > --- a/configs/rockpro64_defconfig > +++ b/configs/rockpro64_defconfig > @@ -7,9 +7,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y > > # Firmware > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y
>>>>> "Gwenhael" == Gwenhael Goavec-Merou <gwenj@trabucayre.com> writes: > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > Use the mainline ATF as it supports the Pine64 ROCKPro64 board. > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/2812054016 > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> Committed to 2022.05.x and 2022.02.x, thanks.
diff --git a/configs/rockpro64_defconfig b/configs/rockpro64_defconfig index 5086320cbc..d39640f855 100644 --- a/configs/rockpro64_defconfig +++ b/configs/rockpro64_defconfig @@ -7,9 +7,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y