qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configs: rv1126: use make_fit_optee.sh as fit generator 

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I31237cbcefcd62a0abbe7a549f46ad41f646ac55
This commit is contained in:
Joseph Chen 2020-10-16 16:00:28 +08:00 committed by Jianhong Chen
parent 65a17145ae
commit 9e84e21cf4
3 changed files with 2 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
arch/arm/mach-rockchip/rv1126/rv1126_make_fit.sh
View File

@ -1,152 +0,0 @@
#!/bin/bash
#
# Copyright (C) 2020 Rockchip Electronics Co., Ltd
#
# SPDX-License-Identifier: GPL-2.0+
#
# Process args and auto set variables
source ./${srctree}/arch/arm/mach-rockchip/make_fit_args.sh
rm -f ${srctree}/*.digest ${srctree}/*.bin.gz
if [ "${COMPRESSION}" == "gzip" ]; then
SUFFIX=".gz"
else
COMPRESSION="none"
SUFFIX=
fi
# digest
if [ "${COMPRESSION}" == "gzip" ]; then
openssl dgst -sha256 -binary -out ${srctree}/u-boot-nodtb.digest ${srctree}/u-boot-nodtb.bin
openssl dgst -sha256 -binary -out ${srctree}/tee.digest ${srctree}/tee.bin
gzip -k -f -9 ${srctree}/tee.bin
UBOOT_SZ=`ls -l u-boot-nodtb.bin | awk '{ print $5 }'`
if [ ${UBOOT_SZ} -gt 0 ]; then
gzip -k -f -9 ${srctree}/u-boot-nodtb.bin
else
touch ${srctree}/u-boot-nodtb.bin.gz
fi
if [ ! -z "${MCU_LOAD_ADDR}" ]; then
openssl dgst -sha256 -binary -out ${srctree}/mcu.digest ${srctree}/mcu.bin
gzip -k -f -9 ${srctree}/mcu.bin
fi
UBOOT_DIGEST=" digest {
value = /incbin/(\"./u-boot-nodtb.digest\");
algo = \"sha256\";
};"
TEE_DIGEST=" digest {
value = /incbin/(\"./tee.digest\");
algo = \"sha256\";
};"
MCU_DIGEST=" digest {
value = /incbin/(\"./mcu.digest\");
algo = \"sha256\";
};"
fi
# mcu
if [ ! -z "${MCU_LOAD_ADDR}" ]; then
MCU_NODE=" mcu {
description = \"mcu\";
type = \"standalone\";
arch = \"riscv\";
data = /incbin/(\"./mcu.bin${SUFFIX}\");
compression = \"${COMPRESSION}\";
load = <0x"${MCU_LOAD_ADDR}">;
hash {
algo = \"sha256\";
};
${MCU_DIGEST}
};"
MCU_STANDALONE=" standalone = \"mcu\";"
SIGN_IMAGES=" sign-images = \"fdt\", \"firmware\", \"loadables\", \"standalone\";"
else
SIGN_IMAGES=" sign-images = \"fdt\", \"firmware\", \"loadables\";"
fi
########################################################################################################
cat << EOF
/*
* Copyright (C) 2020 Rockchip Electronic Co.,Ltd
*
* Simple U-boot fit source file containing U-Boot, dtb and optee
*/
/dts-v1/;
/ {
description = "FIT Image with U-Boot/OP-TEE/MCU";
#address-cells = <1>;
images {
uboot {
description = "U-Boot (32-bit)";
data = /incbin/("./u-boot-nodtb.bin${SUFFIX}");
type = "standalone";
arch = "arm";
os = "U-Boot";
compression = "${COMPRESSION}";
load = <${UBOOT_LOAD_ADDR}>;
hash {
algo = "sha256";
};
EOF
echo "${UBOOT_DIGEST}"
cat << EOF
};
optee {
description = "OP-TEE";
data = /incbin/("./tee.bin${SUFFIX}");
type = "firmware";
arch = "arm";
os = "op-tee";
compression = "${COMPRESSION}";
load = <0x${TEE_LOAD_ADDR}>;
entry = <0x${TEE_LOAD_ADDR}>;
hash {
algo = "sha256";
};
EOF
echo "${TEE_DIGEST}"
cat << EOF
};
fdt {
description = "U-Boot dtb";
data = /incbin/("./u-boot.dtb");
type = "flat_dt";
compression = "none";
hash {
algo = "sha256";
};
};
EOF
echo "${MCU_NODE}"
cat << EOF
};
configurations {
default = "conf";
conf {
description = "Rockchip armv7 with OP-TEE";
rollback-index = <0x0>;
firmware = "optee";
loadables = "uboot";
fdt = "fdt";
EOF
echo "${MCU_STANDALONE}"
cat << EOF
signature {
algo = "sha256,rsa2048";
padding = "pss";
key-name-hint = "dev";
EOF
echo "${SIGN_IMAGES}"
cat << EOF
};
};
};
};
EOF

2
configs/rv1126-spi-nor-tiny_defconfig
View File

@ -3,7 +3,7 @@ CONFIG_ARCH_ROCKCHIP=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x80000
CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/rv1126/rv1126_make_fit.sh" CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_optee.sh"
CONFIG_ROCKCHIP_RV1126=y CONFIG_ROCKCHIP_RV1126=y
CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
# CONFIG_SPL_MMC_SUPPORT is not set # CONFIG_SPL_MMC_SUPPORT is not set

2
configs/rv1126_defconfig
View File

@ -3,7 +3,7 @@ CONFIG_ARCH_ROCKCHIP=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x80000
CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/rv1126/rv1126_make_fit.sh" CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_optee.sh"
CONFIG_ROCKCHIP_RV1126=y CONFIG_ROCKCHIP_RV1126=y
CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
CONFIG_ROCKCHIP_FIT_IMAGE=y CONFIG_ROCKCHIP_FIT_IMAGE=y