OPTEE-OS-STM32MP: update to 3.12.0-stm32mp-r1
Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>
This commit is contained in:
Romuald JEANNE
parent
ee3b4ddd69
commit
57ece9a998
|
|
@ -12,44 +12,82 @@ inherit archiver_stm32mp_clean
|
|||
archiver_create_makefile_for_sdk() {
|
||||
mkdir -p ${ARCHIVER_OUTDIR}
|
||||
|
||||
#remove default variable
|
||||
echo "LDFLAGS=" > ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo "CFLAGS=" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo "CPPFLAGS=" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo "" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
cat << EOF > ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
# Set default path
|
||||
SRC_PATH ?= \$(PWD)
|
||||
BLD_PATH ?= \$(SRC_PATH)/../build
|
||||
DEPLOYDIR ?= \$(SRC_PATH)/../deploy
|
||||
|
||||
echo "LOCAL_PATH=\$(PWD)" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo "" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
# Set default optee-os config
|
||||
CFG_EMBED_DTB_SOURCE_FILE ?= ${OPTEE_CONF}
|
||||
|
||||
#set default CONFIGURATION with configured OPTEE_CONF
|
||||
if [ -n "${OPTEE_CONF}" ]; then
|
||||
echo "PLATFORM ?= ${MACHINE}" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo "CFG_EMBED_DTB_SOURCE_FILE ?= ${OPTEE_CONF}" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
fi
|
||||
# Configure default optee-os features
|
||||
ENABLE_FIP ?= ${@bb.utils.contains('MACHINE_FEATURES','fip','1','',d)}
|
||||
|
||||
echo -n "EXTRA_OEMAKE=" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo "${EXTRA_OEMAKE}" | sed "s|LIBGCC_LOCATE_CFLAGS=[^ ]* |LIBGCC_LOCATE_CFLAGS=\$(OECORE_NATIVE_SYSROOTK) |;s|comp-cflagscore='[^']*'|comp-cflagscore='\$(KCFLAGS)'|" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
# Remove default variables
|
||||
LDFLAGS =
|
||||
CFLAGS =
|
||||
CPPFLAGS =
|
||||
# Define default make options
|
||||
EXTRA_OEMAKE = $(echo "${EXTRA_OEMAKE}" | sed "s|LIBGCC_LOCATE_CFLAGS=[^ ]* |LIBGCC_LOCATE_CFLAGS=\$(KCFLAGS) |;s|comp-cflagscore='[^']*'|comp-cflagscore='\$(KCFLAGS)'|")
|
||||
EXTRA_OEMAKE += \$(if \$(ENABLE_FIP),,CFG_STM32MP15x_STM32IMAGE=y)
|
||||
|
||||
echo "" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo "all:" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " if test -n \"\$(CFG_EMBED_DTB_SOURCE_FILE)\" ; then \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " for dt in \$(CFG_EMBED_DTB_SOURCE_FILE) ; do \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " \$(MAKE) \$(EXTRA_OEMAKE) -C \$(LOCAL_PATH) PREFIX=\$(SDKTARGETSYSROOT) O=\$(LOCAL_PATH)/../build/\$\$dt CFG_EMBED_DTB_SOURCE_FILE=\$\$dt.dts ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
# Copy binary files with explicit name
|
||||
echo " cp ../build/\$\$dt/core/${OPTEE_HEADER}.${OPTEE_SUFFIX} ../build/${OPTEE_HEADER}-\$\$dt-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX} ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " cp ../build/\$\$dt/core/${OPTEE_PAGER}.${OPTEE_SUFFIX} ../build/${OPTEE_PAGER}-\$\$dt-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX} ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " cp ../build/\$\$dt/core/${OPTEE_PAGEABLE}.${OPTEE_SUFFIX} ../build/${OPTEE_PAGEABLE}-\$\$dt-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX} ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " done ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " else \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " \$(MAKE) \$(EXTRA_OEMAKE) -C \$(LOCAL_PATH) PREFIX=\$(SDKTARGETSYSROOT) O=\$(LOCAL_PATH)/../build/ ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
# Copy binary files with explicit name
|
||||
echo " cp ../build/core/${OPTEE_HEADER}.${OPTEE_SUFFIX} ../build/${OPTEE_HEADER}-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX} ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " cp ../build/core/${OPTEE_PAGER}.${OPTEE_SUFFIX} ../build/${OPTEE_PAGER}-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX} ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " cp ../build/core/${OPTEE_PAGEABLE}.${OPTEE_SUFFIX} ../build/${OPTEE_PAGEABLE}-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX} ; \\" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " fi" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
# Configure default optee-os features
|
||||
OPTEE_SUFFIX ?= \$(if \$(ENABLE_FIP),bin,stm32)
|
||||
|
||||
echo "" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo "clean:" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
echo " rm -rf \$(LOCAL_PATH)/../build" >> ${ARCHIVER_OUTDIR}/Makefile.sdk
|
||||
help:
|
||||
@echo
|
||||
@echo "OPTEE-OS configuration:"
|
||||
@echo " CFG_EMBED_DTB_SOURCE_FILE = \$(CFG_EMBED_DTB_SOURCE_FILE)"
|
||||
@echo
|
||||
@echo "OPTEE-OS folder configuration:"
|
||||
@echo " SRC_PATH = \$(SRC_PATH)"
|
||||
@echo " BLD_PATH = \$(BLD_PATH)"
|
||||
@echo " DEPLOYDIR = \$(DEPLOYDIR)"
|
||||
@echo
|
||||
@echo "FIP configuration:"
|
||||
@echo " ENABLE_FIP = \$(ENABLE_FIP) ('1' to generate fip binary)"
|
||||
ifeq (\$(ENABLE_FIP),1)
|
||||
@echo " Do not forget to set FIP deploydir folders (such as FIP_DEPLOYDIR_ROOT) to provide path to needed binaries"
|
||||
endif
|
||||
@echo
|
||||
@echo "Available targets:"
|
||||
@echo " all : build OPTEE-OS binaries for defined config(s)"
|
||||
@echo " clean : clean build directories from generated files"
|
||||
@echo
|
||||
|
||||
all: optee \$(if \$(ENABLE_FIP),fip)
|
||||
|
||||
optee:
|
||||
@mkdir -p \$(DEPLOYDIR)
|
||||
@mkdir -p \$(DEPLOYDIR)/debug
|
||||
@if test -n "\$(CFG_EMBED_DTB_SOURCE_FILE)" ; then \\
|
||||
for dt in \$(CFG_EMBED_DTB_SOURCE_FILE) ; do \\
|
||||
\$(MAKE) \$(EXTRA_OEMAKE) -C \$(SRC_PATH) PREFIX=\$(SDKTARGETSYSROOT) O=\$(BLD_PATH)/\$\$dt CFG_EMBED_DTB_SOURCE_FILE=\$\$dt.dts ; \\
|
||||
# Copy binary files with explicit name \\
|
||||
cp \$(BLD_PATH)/\$\$dt/core/${OPTEE_HEADER}.\$(OPTEE_SUFFIX) \$(DEPLOYDIR)/${OPTEE_HEADER}-\$\$dt.\$(OPTEE_SUFFIX) ; \\
|
||||
cp \$(BLD_PATH)/\$\$dt/core/${OPTEE_PAGER}.\$(OPTEE_SUFFIX) \$(DEPLOYDIR)/${OPTEE_PAGER}-\$\$dt.\$(OPTEE_SUFFIX) ; \\
|
||||
cp \$(BLD_PATH)/\$\$dt/core/${OPTEE_PAGEABLE}.\$(OPTEE_SUFFIX) \$(DEPLOYDIR)/${OPTEE_PAGEABLE}-\$\$dt.\$(OPTEE_SUFFIX) ; \\
|
||||
cp \$(BLD_PATH)/\$\$dt/core/${OPTEE_ELF}.${OPTEE_ELF_SUFFIX} \$(DEPLOYDIR)/debug/${OPTEE_ELF}-\$\$dt.${OPTEE_ELF_SUFFIX} ; \\
|
||||
done ; \\
|
||||
else \\
|
||||
\$(MAKE) \$(EXTRA_OEMAKE) -C \$(SRC_PATH) PREFIX=\$(SDKTARGETSYSROOT) O=\$(BLD_PATH)/ ; \\
|
||||
# Copy binary files with explicit name \\
|
||||
cp \$(BLD_PATH)/core/${OPTEE_HEADER}.\$(OPTEE_SUFFIX) \$(DEPLOYDIR)/ ; \\
|
||||
cp \$(BLD_PATH)/core/${OPTEE_PAGER}.\$(OPTEE_SUFFIX) \$(DEPLOYDIR)/ ; \\
|
||||
cp \$(BLD_PATH)/core/${OPTEE_PAGEABLE}.\$(OPTEE_SUFFIX) \$(DEPLOYDIR)/ ; \\
|
||||
cp \$(BLD_PATH)/core/${OPTEE_ELF}.${OPTEE_ELF_SUFFIX} \$(DEPLOYDIR)/debug/ ; \\
|
||||
fi
|
||||
|
||||
fip: optee
|
||||
FIP_DEPLOYDIR_OPTEE=\$(DEPLOYDIR) FIP_DEVICETREE="\$(CFG_EMBED_DTB_SOURCE_FILE)" fiptool-stm32mp
|
||||
|
||||
clean:
|
||||
@echo "Removing \$(BLD_PATH) ..."
|
||||
@rm -rf \$(BLD_PATH)
|
||||
@echo "Removing \$(DEPLOYDIR) ..."
|
||||
@rm -rf \$(DEPLOYDIR)
|
||||
@echo
|
||||
EOF
|
||||
}
|
||||
do_ar_original[prefuncs] += "archiver_create_makefile_for_sdk"
|
||||
|
|
|
|||
|
|
@ -16,18 +16,17 @@ inherit deploy python3native
|
|||
OPTEEMACHINE ?= "${MACHINE}"
|
||||
OPTEEOUTPUTMACHINE ?= "${MACHINE}"
|
||||
|
||||
EXTRA_OEMAKE = "PLATFORM=${OPTEEMACHINE} \
|
||||
CROSS_COMPILE_core=${HOST_PREFIX} \
|
||||
CROSS_COMPILE_ta_arm64=${HOST_PREFIX} \
|
||||
${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'CFG_ARM64_core=y ta-targets=ta_arm64', 'CFG_ARM32_core=y CROSS_COMPILE_ta_arm32=${HOST_PREFIX}', d)} \
|
||||
NOWERROR=1 \
|
||||
LDFLAGS= \
|
||||
LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_HOST} \
|
||||
"
|
||||
|
||||
EXTRA_OEMAKE = "PLATFORM=${OPTEEMACHINE}"
|
||||
EXTRA_OEMAKE += "CROSS_COMPILE_core=${HOST_PREFIX}"
|
||||
EXTRA_OEMAKE += "CROSS_COMPILE_ta_arm64=${HOST_PREFIX}"
|
||||
EXTRA_OEMAKE += "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'CFG_ARM64_core=y ta-targets=ta_arm64', 'CFG_ARM32_core=y CROSS_COMPILE_ta_arm32=${HOST_PREFIX}', d)}"
|
||||
EXTRA_OEMAKE += "NOWERROR=1"
|
||||
EXTRA_OEMAKE += "LDFLAGS="
|
||||
EXTRA_OEMAKE += "LIBGCC_LOCATE_CFLAGS=--sysroot=${STAGING_DIR_TARGET}"
|
||||
EXTRA_OEMAKE += "CFG_TEE_CORE_LOG_LEVEL=2"
|
||||
EXTRA_OEMAKE += "CFG_TEE_CORE_DEBUG=n"
|
||||
EXTRA_OEMAKE += "comp-cflagscore='--sysroot=${STAGING_DIR_TARGET}'"
|
||||
EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'fip', '', 'CFG_STM32MP15x_STM32IMAGE=y', d)}"
|
||||
|
||||
OPTEE_ARCH_armv7a = "arm32"
|
||||
OPTEE_ARCH_armv7ve = "arm32"
|
||||
|
|
@ -62,11 +61,10 @@ do_install() {
|
|||
}
|
||||
|
||||
# Configure optee binaries
|
||||
OPTEE_BOOTCHAIN = "optee"
|
||||
OPTEE_HEADER = "tee-header_v2"
|
||||
OPTEE_PAGEABLE = "tee-pageable_v2"
|
||||
OPTEE_PAGER = "tee-pager_v2"
|
||||
OPTEE_SUFFIX = "stm32"
|
||||
OPTEE_SUFFIX = "${@bb.utils.contains('MACHINE_FEATURES','fip','bin','stm32',d)}"
|
||||
# Output the ELF generated
|
||||
ELF_DEBUG_ENABLE ?= ""
|
||||
OPTEE_ELF = "tee"
|
||||
|
|
@ -74,22 +72,22 @@ OPTEE_ELF_SUFFIX = "elf"
|
|||
|
||||
do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}/optee"
|
||||
do_deploy() {
|
||||
install -d ${DEPLOYDIR}
|
||||
install -d ${DEPLOYDIR}/debug
|
||||
if [ -n "${OPTEE_CONF}" ]; then
|
||||
for conf in ${OPTEE_CONF}; do
|
||||
install -m 644 ${B}/${conf}/core/${OPTEE_HEADER}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_HEADER}-${conf}-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX}
|
||||
install -m 644 ${B}/${conf}/core/${OPTEE_PAGER}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_PAGER}-${conf}-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX}
|
||||
install -m 644 ${B}/${conf}/core/${OPTEE_PAGEABLE}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_PAGEABLE}-${conf}-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX}
|
||||
install -m 644 ${B}/${conf}/core/${OPTEE_HEADER}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_HEADER}-${conf}.${OPTEE_SUFFIX}
|
||||
install -m 644 ${B}/${conf}/core/${OPTEE_PAGER}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_PAGER}-${conf}.${OPTEE_SUFFIX}
|
||||
install -m 644 ${B}/${conf}/core/${OPTEE_PAGEABLE}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_PAGEABLE}-${conf}.${OPTEE_SUFFIX}
|
||||
if [ -n "${ELF_DEBUG_ENABLE}" ]; then
|
||||
install -m 644 ${B}/${conf}/core/${OPTEE_ELF}.${OPTEE_ELF_SUFFIX} ${DEPLOYDIR}/${OPTEE_ELF}-${conf}-${OPTEE_BOOTCHAIN}.${OPTEE_ELF_SUFFIX}
|
||||
install -m 644 ${B}/${conf}/core/${OPTEE_ELF}.${OPTEE_ELF_SUFFIX} ${DEPLOYDIR}/debug/${OPTEE_ELF}-${conf}.${OPTEE_ELF_SUFFIX}
|
||||
fi
|
||||
done
|
||||
else
|
||||
install -m 644 ${B}/core/${OPTEE_HEADER}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_HEADER}-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX}
|
||||
install -m 644 ${B}/core/${OPTEE_PAGER}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_PAGER}-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX}
|
||||
install -m 644 ${B}/core/${OPTEE_PAGEABLE}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_PAGEABLE}-${OPTEE_BOOTCHAIN}.${OPTEE_SUFFIX}
|
||||
install -m 644 ${B}/core/${OPTEE_HEADER}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_HEADER}.${OPTEE_SUFFIX}
|
||||
install -m 644 ${B}/core/${OPTEE_PAGER}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_PAGER}.${OPTEE_SUFFIX}
|
||||
install -m 644 ${B}/core/${OPTEE_PAGEABLE}.${OPTEE_SUFFIX} ${DEPLOYDIR}/${OPTEE_PAGEABLE}.${OPTEE_SUFFIX}
|
||||
if [ -n "${ELF_DEBUG_ENABLE}" ]; then
|
||||
install -m 644 ${B}/core/${OPTEE_ELF}.${OPTEE_ELF_SUFFIX} ${DEPLOYDIR}/${OPTEE_ELF}-${OPTEE_BOOTCHAIN}.${OPTEE_ELF_SUFFIX}
|
||||
install -m 644 ${B}/core/${OPTEE_ELF}.${OPTEE_ELF_SUFFIX} ${DEPLOYDIR}/debug/${OPTEE_ELF}.${OPTEE_ELF_SUFFIX}
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,15 @@ SUMMARY = "OPTEE TA development kit for stm32mp"
|
|||
LICENSE = "BSD-2-Clause & BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
|
||||
|
||||
SRC_URI = "git://github.com/OP-TEE/optee_os.git;protocol=https"
|
||||
SRCREV = "af141c61fe7a2430f3b4bb89661d8414117013b3"
|
||||
SRC_URI = "git://github.com/OP-TEE/optee_os.git;protocol=https;name=os"
|
||||
SRCREV = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-3.9.0-stm32mp-r1.patch \
|
||||
file://0002-3.9.0-stm32mp-r2.patch \
|
||||
file://0001-3.12.0-stm32mp-r1.patch \
|
||||
"
|
||||
|
||||
OPTEE_VERSION = "3.9.0"
|
||||
PV = "${OPTEE_VERSION}.r2"
|
||||
OPTEE_VERSION = "3.12.0"
|
||||
PV = "${OPTEE_VERSION}.r1"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
@ -40,7 +39,7 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'optee-os-stm3
|
|||
BBCLASSEXTEND = "devupstream:target"
|
||||
|
||||
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/optee_os.git;protocol=https;branch=${OPTEE_VERSION}-stm32mp"
|
||||
SRCREV_class-devupstream = "6a3dd87a133bee8a18409969380dbb1fc289f803"
|
||||
SRCREV_class-devupstream = "0bd33404e9581d00514034b7b05a2cbe8649c1fd"
|
||||
|
||||
# ---------------------------------
|
||||
# Configure default preference to manage dynamic selection between tarball and github
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -68,71 +68,19 @@ MANDATORY: You must update sources
|
|||
|
||||
5. Build optee-os source code:
|
||||
--------------------------------
|
||||
To compile optee-os source code
|
||||
$> make -f $PWD/../Makefile.sdk
|
||||
or for a specific config :
|
||||
$ make -f $PWD/../Makefile.sdk CFG_EMBED_DTB_SOURCE_FILE=stm32mp157c-ev1
|
||||
Since OpenSTLinux has activated FIP by default, so the FIP_artifacts should be specified before launching compilation
|
||||
- In case of using SOURCES-xxxx.tar.gz of Developer package the FIP_DEPLOYDIR_ROOT should be set as below:
|
||||
$> export FIP_DEPLOYDIR_ROOT=$PWD/../../FIP_artifacts
|
||||
|
||||
Binaries generated are as follow:
|
||||
##> PWD/../build/tee-*-optee.stm32
|
||||
To compile optee-os source code
|
||||
$> make -f $PWD/../Makefile.sdk all
|
||||
or for a specific config :
|
||||
$ make -f $PWD/../Makefile.sdk CFG_EMBED_DTB_SOURCE_FILE=stm32mp157c-ev1 all
|
||||
|
||||
The generated FIP images are available in $FIP_DEPLOYDIR_ROOT/fip
|
||||
|
||||
|
||||
6. Update software on board:
|
||||
----------------------------
|
||||
6.1. partitioning of binaries:
|
||||
-----------------------------
|
||||
Using the above command, the OP-TEE provides 3 binary files which MUST
|
||||
be loaded in their respective partition as listed below:
|
||||
- "tee-header-*-optee.stm32" in "teeh" partition
|
||||
- "tee-pageable-*-optee.stm32" in "teed" partition
|
||||
- "tee-pager-*-optee.stm32" in "teex" partition
|
||||
Please use STM32CubeProgrammer and only tick the ssbl-boot and fip partitions (more informations on the wiki website http://wiki.st.com/stm32mpu)
|
||||
|
||||
6.2. Update via SDCARD:
|
||||
-----------------------
|
||||
Copy each binary to its dedicated partition, on SDCARD/USB disk
|
||||
the OP-TEE partitions are the partitions 4/5/6:
|
||||
- SDCARD: /dev/mmcblkXp4 /dev/mmcblkXp5 /dev/mmcblkXp6
|
||||
(where X is the instance number)
|
||||
- SDCARD via USB reader: /dev/sdX4 /dev/sdX5 /dev/sdX6
|
||||
(where X is the instance identifier)
|
||||
So, for each binary:
|
||||
$ dd if=<op-tee binary> of=/dev/<device partition> bs=1M conv=fdatasync
|
||||
|
||||
6.3. Update via USB mass storage on U-boot:
|
||||
-------------------------------------------
|
||||
* Plug the SDCARD on Board.
|
||||
* Start the board and stop on U-boot shell:
|
||||
Hit any key to stop autoboot: 0
|
||||
STM32MP>
|
||||
* plug an USB cable between the PC and the board via USB OTG port.
|
||||
* On U-Boot shell, call the USB mass storage functionnality:
|
||||
STM32MP> ums 0 mmc 0
|
||||
|
||||
ums <USB controller> <dev type: mmc|usb> <dev[:part]>
|
||||
ex.:
|
||||
For SDCARD: ums 0 mmc 0
|
||||
For USB disk: ums 0 usb 0
|
||||
|
||||
* Follow section 6.2 to load the "tee-*-optee.stm32" image files in the target
|
||||
partitions /dev/sd<X><Y>.
|
||||
|
||||
|
||||
|
||||
FAQ: Partitions identification
|
||||
|
||||
To find the partition associated to a specific label, connect the
|
||||
SDCARD to your PC or run on target U-boot 'ums' command
|
||||
and list /dev/disk/by-partlabel/ content, i.e:
|
||||
|
||||
$ ls -l /dev/disk/by-partlabel/
|
||||
total 0
|
||||
lrwxrwxrwx 1 root root 15 Jan 23 19:11 bootfs -> ../../mmcblk0p7
|
||||
lrwxrwxrwx 1 root root 15 Jan 23 19:11 fsbl1 -> ../../mmcblk0p1 # FSBL (TF-A)
|
||||
lrwxrwxrwx 1 root root 15 Jan 23 19:11 fsbl2 -> ../../mmcblk0p2 # FSBL backup (TF-A backup – same content as FSBL)
|
||||
lrwxrwxrwx 1 root root 15 Jan 23 19:11 rootfs -> ../../mmcblk0p9
|
||||
lrwxrwxrwx 1 root root 15 Jan 23 19:11 ssbl -> ../../mmcblk0p3 # SSBL (U-Boot)
|
||||
lrwxrwxrwx 1 root root 15 Jan 23 19:11 teed -> ../../mmcblk0p5 # TEED (OP-TEE tee-pageable)
|
||||
lrwxrwxrwx 1 root root 15 Jan 23 19:11 teeh -> ../../mmcblk0p4 # TEEH (OP-TEE tee-header)
|
||||
lrwxrwxrwx 1 root root 15 Jan 23 19:11 teex -> ../../mmcblk0p6 # TEEX (OP-TEE tee-pager)
|
||||
lrwxrwxrwx 1 root root 16 Jan 23 19:11 userfs -> ../../mmcblk0p10
|
||||
lrwxrwxrwx 1 root root 15 Jan 23 19:11 vendorfs -> ../../mmcblk0p8
|
||||
|
|
|
|||
Loading…
Reference in New Issue