Skip to content

Commit c1fabae

Browse files
committed
Make OP-TEE builds conditional, default to disabled
Signed-off-by: Alexey Charkov <alchark@flipper.net>
1 parent 79eb7e3 commit c1fabae

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

build-uboot.sh

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
: "${RKBIN_BRANCH:=master}"
2525

2626
: "${USE_BL31:=opensource}"
27+
: "${USE_TEE:=no}"
2728

2829
set -e
2930

@@ -42,14 +43,16 @@ done
4243
[ ! -d "$UBOOT_DIR" ] && git clone --depth 1 -b "$UBOOT_BRANCH" "$UBOOT_GIT" "$UBOOT_DIR"
4344
[ ! -d "$RKBIN_DIR" ] && git clone --depth 1 -b "$RKBIN_BRANCH" "$RKBIN_GIT" "$RKBIN_DIR"
4445
[ ! -d "$TFA_DIR" ] && [ x"$USE_BL31" = x"opensource" ] && git clone --depth 1 -b "$TFA_BRANCH" "$TFA_GIT" "$TFA_DIR"
45-
[ ! -d "$TEE_DIR" ] && git clone --depth 1 -b "$TEE_BRANCH" "$TEE_GIT" "$TEE_DIR"
46+
[ ! -d "$TEE_DIR" -a x"$USE_TEE" = x"yes" ] && git clone --depth 1 -b "$TEE_BRANCH" "$TEE_GIT" "$TEE_DIR"
4647

4748
TEE=
48-
pushd "$TEE_DIR"
49-
make PLATFORM=rockchip-rk3576 CROSS_COMPILE32="$CROSS_COMPILE32" CROSS_COMPILE64="$CROSS_COMPILE64" -j$(nproc) clean
50-
make PLATFORM=rockchip-rk3576 CROSS_COMPILE32="$CROSS_COMPILE32" CROSS_COMPILE64="$CROSS_COMPILE64" CFG_USER_TA_TARGETS=ta_arm64 -j$(nproc)
51-
TEE=`realpath out/arm-plat-rockchip/core/tee.bin`
52-
popd
49+
if [ x"$USE_TEE" = x"yes" ]; then
50+
pushd "$TEE_DIR"
51+
make PLATFORM=rockchip-rk3576 CROSS_COMPILE32="$CROSS_COMPILE32" CROSS_COMPILE64="$CROSS_COMPILE64" -j$(nproc) clean
52+
make PLATFORM=rockchip-rk3576 CROSS_COMPILE32="$CROSS_COMPILE32" CROSS_COMPILE64="$CROSS_COMPILE64" CFG_USER_TA_TARGETS=ta_arm64 -j$(nproc)
53+
TEE=`realpath out/arm-plat-rockchip/core/tee.bin`
54+
popd
55+
fi
5356

5457
CONFIGS=`realpath "$CONFIGS"/*`
5558
ROCKCHIP_TPL=`realpath "$RKBIN_DIR"/bin/rk35/rk3576_ddr_*.bin | tail -n1`
@@ -58,7 +61,7 @@ BL31=
5861
if [ x"$USE_BL31" = x"opensource" ]; then
5962
pushd "$TFA_DIR"
6063
make PLAT=rk3576 -j$(nproc) clean
61-
make PLAT=rk3576 BL32="$TEE" SPD=opteed -j$(nproc)
64+
[ x"$USE_TEE" = x"yes" ] && make PLAT=rk3576 BL32="$TEE" SPD=opteed -j$(nproc) || make PLAT=rk3576 -j$(nproc)
6265
popd
6366
BL31=`realpath "$TFA_DIR"/build/rk3576/release/bl31/bl31.elf`
6467
else

0 commit comments

Comments
 (0)