diff options
| author | Eric Woudstra | 2023-03-04 22:06:03 +0100 |
|---|---|---|
| committer | Eric Woudstra | 2023-03-04 22:06:03 +0100 |
| commit | 180fa3d0063d70735eaab78e13d81ae538b43001 (patch) | |
| tree | 50cc3108803ca6c0699bf3bab5db27ba81f29d7c | |
| parent | b1e67c0b462e770e01bd06052ce3e5140d3243be (diff) | |
| download | aur-180fa3d0063d70735eaab78e13d81ae538b43001.tar.gz | |
fix bl31 in bl2, now just a normal build
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
2 files changed, 8 insertions, 12 deletions
@@ -1,7 +1,7 @@ pkgbase = bpir64-atf-git pkgdesc = ATF bpir64 images including fiptool - pkgver = v2.8r12079.98b090de4 - pkgrel = 2 + pkgver = v2.8r12079.7155480e7 + pkgrel = 1 epoch = 2 url = https://github.com/mtk-openwrt/arm-trusted-firmware.git install = bpir64-atf-git.install @@ -10,7 +10,7 @@ pkgbase = bpir64-atf-git makedepends = git makedepends = bpir64-mkimage depends = linux - source = git+https://github.com/ericwoud/arm-trusted-firmware.git#branch=bpir64 + source = git+https://github.com/ericwoud/arm-trusted-firmware.git#branch=bpir source = 95-atf.hook source = bpir64-writefip sha256sums = SKIP @@ -2,12 +2,12 @@ _gitname="arm-trusted-firmware" _gitroot=https://github.com/ericwoud/${_gitname} -_gitbranch="bpir64" +_gitbranch="bpir" #_gitbranch="master" pkgname=bpir64-atf-git epoch=2 -pkgver=v2.8r12079.98b090de4 -pkgrel=2 +pkgver=v2.8r12079.7155480e7 +pkgrel=1 pkgdesc='ATF bpir64 images including fiptool' url='https://github.com/mtk-openwrt/arm-trusted-firmware.git' arch=(aarch64) @@ -40,17 +40,13 @@ prepare() { _buildimage() { _plat=$1; _bpir=$2; _atfdev=$3; _rest="${@:4}" - _makeatf="PLAT=${_plat} BOOT_DEVICE=$_atfdev LOG_LEVEL=40 MTK_BL33_IS_64BIT=1 ${_rest}" - _makeatf="$_makeatf USE_MKIMAGE=1 MKIMAGE=$(which bpir64-mkimage)" sed -i 's/.*entry = get_partition_entry.*/\tentry = get_partition_entry("'${_bpir}'-'${_atfdev}'-fip");/' \ plat/mediatek/${_plat}/bl2_boot_mmc.c touch plat/mediatek/${_plat}/platform.mk unset CXXFLAGS CPPFLAGS LDFLAGS export CFLAGS=-Wno-error - # PRELOADED_BL33_BASE is not being used in mt7xxx atf code, so we use it as binairy flags: - # 0b0001 : incbin BL31.bin inside of BL2 image, disable it during BL31 build because of common code! - make $_makeatf PRELOADED_BL33_BASE=0b0000 bl31.bin.o - make $_makeatf PRELOADED_BL33_BASE=0b0001 ${srcdir}/${_gitname}/build/${_plat}/release/bl2.img + make PLAT=${_plat} BOOT_DEVICE=$_atfdev LOG_LEVEL=40 MTK_BL33_IS_64BIT=1 \ + USE_MKIMAGE=1 MKIMAGE=$(which bpir64-mkimage) ${_rest} all dd of=build/${_plat}/release/${_bpir}-atf-${_atfdev}-header.bin bs=1 count=440 if=build/${_plat}/release/bl2.img dd of=build/${_plat}/release/${_bpir}-atf-${_atfdev}-atf.bin skip=34 if=build/${_plat}/release/bl2.img } |