leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: Convert to use FIT generator for optee

Browse Source 
Use generator script so that we can use environment for TEE source.
$TEE for tee.bin, and if file not exist, the script can report a warning,
and meke the build success without a error.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Kever Yang 2019-11-15 10:27:07 +08:00
parent d4a31e8ee5
commit 65325fba5a
3 changed files with 79 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
arch/arm/mach-rockchip/fit_spl_optee.its
View File

@ -1,50 +0,0 @@
/*
* Copyright (C) 2017 Rockchip Electronic Co.,Ltd
*
* Simple U-boot fit source file containing U-Boot, dtb and optee
*/
/dts-v1/;
/ {
description = "Simple image with OP-TEE support";
#address-cells = <1>;
images {
uboot {
description = "U-Boot";
data = /incbin/("../../../u-boot-nodtb.bin");
type = "standalone";
os = "U-Boot";
arch = "arm";
compression = "none";
load = <0x61000000>;
};
optee {
description = "OP-TEE";
data = /incbin/("../../../tee.bin");
type = "firmware";
arch = "arm";
os = "tee";
compression = "none";
load = <0x68400000>;
entry = <0x68400000>;
};
fdt {
description = "dtb";
data = /incbin/("../../../u-boot.dtb");
type = "flat_dt";
compression = "none";
};
};
configurations {
default = "conf";
conf {
description = "Rockchip armv7 with OP-TEE";
firmware = "optee";
loadables = "uboot";
fdt = "fdt";
};
};
};

78
arch/arm/mach-rockchip/fit_spl_optee.sh Executable file
View File

@ -0,0 +1,78 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2019 Rockchip Electronic Co.,Ltd
#
# Script to generate FIT image source for 32-bit Rockchip SoCs with
# U-Boot proper, OPTEE, and devicetree.
#
# usage: $0 <dt_name>
[ -z "$TEE" ] && TEE="tee.bin"
if [ ! -f $TEE ]; then
echo "WARNING: TEE file $TEE NOT found, U-Boot.itb is non-functional" >&2
echo "Please export path for TEE or copy tee.bin to U-Boot folder" >&2
TEE=/dev/null
fi
dtname=$1
cat << __HEADER_EOF
/*
* Copyright (C) 2017-2019 Rockchip Electronic Co.,Ltd
*
* Simple U-boot FIT source file containing U-Boot, dtb and optee
*/
/dts-v1/;
/ {
description = "FIT image with OP-TEE support";
#address-cells = <1>;
images {
uboot {
description = "U-Boot";
data = /incbin/("u-boot-nodtb.bin");
type = "standalone";
os = "U-Boot";
arch = "arm";
compression = "none";
load = <0x61000000>;
};
optee {
description = "OP-TEE";
data = /incbin/("$TEE");
type = "firmware";
arch = "arm";
os = "tee";
compression = "none";
load = <0x68400000>;
entry = <0x68400000>;
};
fdt {
description = "$(basename $dtname .dtb)";
data = /incbin/("$dtname");
type = "flat_dt";
compression = "none";
};
__HEADER_EOF
cat << __CONF_HEADER_EOF
};
configurations {
default = "conf";
conf {
description = "$(basename $dtname .dtb)";
firmware = "optee";
loadables = "uboot";
fdt = "fdt";
};
__CONF_HEADER_EOF
cat << __ITS_EOF
};
};
__ITS_EOF

2
configs/evb-rk3229_defconfig
View File

@ -14,7 +14,7 @@ CONFIG_SPL_TEXT_BASE=0x60000000
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_FIT_SOURCE="arch/arm/mach-rockchip/fit_spl_optee.its"
CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/fit_spl_optee.sh"
CONFIG_USE_PREBOOT=y
CONFIG_DEFAULT_FDT_FILE="rk3229-evb.dtb"
# CONFIG_DISPLAY_CPUINFO is not set