From 637586a9c05c08f1e04d3e3fff6e6a515f4a81b8 Mon Sep 17 00:00:00 2001 From: Maxim Karasev Date: Fri, 25 Jun 2021 20:53:53 +0300 Subject: [PATCH] temp/u-boot-{pinebookpro,pinephone,rockpro64}: fixup for arm-trusted-firmware package changes (MR 2270) [ci:skip-build] already built successfully in CI --- temp/u-boot-pinebookpro/APKBUILD | 6 +++--- temp/u-boot-pinephone/APKBUILD | 6 +++--- temp/u-boot-rockpro64/APKBUILD | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/temp/u-boot-pinebookpro/APKBUILD b/temp/u-boot-pinebookpro/APKBUILD index 965b18497..9984c84a4 100644 --- a/temp/u-boot-pinebookpro/APKBUILD +++ b/temp/u-boot-pinebookpro/APKBUILD @@ -2,13 +2,13 @@ # a driver for the display and supports efi loading operating systems pkgname=u-boot-pinebookpro pkgver=2020.07 -pkgrel=1 +pkgrel=2 pkgdesc="u-boot bootloader for the rk3399" url="https://gitlab.denx.de/u-boot/u-boot" arch="aarch64" license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs ISC LGPL-2.0-only LGPL-2.1-only X11" -makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev arm-trusted-firmware-rk3399 u-boot-tools" +makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev arm-trusted-firmware u-boot-tools" options="!check" source=" ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2 @@ -30,7 +30,7 @@ build() { LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > include/timestamp_autogenerated.h LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> include/timestamp_autogenerated.h - export BL31="/usr/share/arm-trusted-firmware-rk3399/bl31.elf" + export BL31="/usr/share/arm-trusted-firmware/rk3399/bl31.elf" export BUILD_DIR="$builddir"/build mkdir -p "$BUILD_DIR" make O="$BUILD_DIR" HOSTCC=gcc ARCH=arm LOGO_BMP=$srcdir/pine64.bmp pinebook-pro-rk3399_defconfig diff --git a/temp/u-boot-pinephone/APKBUILD b/temp/u-boot-pinephone/APKBUILD index 54b9907ab..33a9c5414 100644 --- a/temp/u-boot-pinephone/APKBUILD +++ b/temp/u-boot-pinephone/APKBUILD @@ -1,7 +1,7 @@ # U-boot with patches to make the PinePhone boot faster and have control over the ddr clock speed pkgname=u-boot-pinephone pkgver=2021.01_git20201228 -pkgrel=3 +pkgrel=4 # Last commit from "crust" branch, as used in "crust-meta": # https://gitlab.com/pine64-org/crust-meta/-/blob/8886bcc829179bf77216fade71f0ede9bd014e67/Makefile#L78 _commit="7492749fec31b1086bc8933bf113a766aea021aa" @@ -11,7 +11,7 @@ arch="aarch64" license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs ISC LGPL-2.0-only LGPL-2.1-only X11" depends="linux-postmarketos-allwinner>=5.12" -makedepends="$depends_dev bc dtc python3-dev py3-setuptools swig bison flex openssl-dev arm-trusted-firmware-sun50i crust" +makedepends="$depends_dev bc dtc python3-dev py3-setuptools swig bison flex openssl-dev arm-trusted-firmware-crust crust" options="!check" source="https://gitlab.com/pine64-org/u-boot/-/archive/$_commit/u-boot-$_commit.tar.gz 0001-expose-DRAM-clock-speed.patch @@ -26,7 +26,7 @@ build() { LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > include/timestamp_autogenerated.h LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> include/timestamp_autogenerated.h - export BL31="/usr/share/arm-trusted-firmware-sun50i/bl31.bin" + export BL31="/usr/share/crust/arm-trusted-firmware/sun50i_a64/bl31.bin" export SCP="/usr/share/crust/pinephone/scp.bin" export BUILD_DIR="$builddir"/build diff --git a/temp/u-boot-rockpro64/APKBUILD b/temp/u-boot-rockpro64/APKBUILD index 2d4ff1ab7..7e34fb4cc 100644 --- a/temp/u-boot-rockpro64/APKBUILD +++ b/temp/u-boot-rockpro64/APKBUILD @@ -2,13 +2,13 @@ pkgname=u-boot-rockpro64 pkgver=2020.04 -pkgrel=2 +pkgrel=3 pkgdesc="u-boot bootloader for the rk3399" url="https://gitlab.com/pine64-org/u-boot" arch="aarch64" license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs ISC LGPL-2.0-only LGPL-2.1-only X11" -makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev arm-trusted-firmware-rk3399" +makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev arm-trusted-firmware" options="!check" source=" ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2 @@ -22,7 +22,7 @@ build() { LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > include/timestamp_autogenerated.h LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> include/timestamp_autogenerated.h - export BL31="/usr/share/arm-trusted-firmware-rk3399/bl31.elf" + export BL31="/usr/share/arm-trusted-firmware/rk3399/bl31.elf" export BUILD_DIR="$builddir"/build mkdir -p "$BUILD_DIR" make O="$BUILD_DIR" HOSTCC=gcc ARCH=arm rockpro64-rk3399_defconfig