public
/
meta-st-stm32mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TF-A-STM32MP: Update to v2.2-stm32mp-r2 

Change-Id: Idce2199f48962dc2e16c815cfdde498042263098
This commit is contained in:
Christophe Priouzeau 2020-10-27 12:19:56 +01:00 committed by Bernard PUEL
parent faedbbe552
commit 562904550d
7 changed files with 3372 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
recipes-bsp/trusted-firmware-a/tf-a-stm32mp-archiver.inc
View File

@ -33,7 +33,7 @@ NM=
LOCAL_PATH=\$(PWD) LOCAL_PATH=\$(PWD)
EXTRA_OEMAKE=${EXTRA_OEMAKE} EXTRA_OEMAKE=${EXTRA_OEMAKE}
EXTRA_OEMAKE_SERIAL=$(subst STM32MP_SDMMC=1 STM32MP_EMMC=1 STM32MP_SPI_NOR=1 STM32MP_RAW_NAND=1 STM32MP_SPI_NAND=1,,${EXTRA_OEMAKE}) STM32MP_UART_PROGRAMMER=1 STM32MP_USB_PROGRAMMER=1 EXTRA_OEMAKE_SERIAL=\$(filter-out STM32MP_SDMMC=1 STM32MP_EMMC=1 STM32MP_SPI_NOR=1 STM32MP_RAW_NAND=1 STM32MP_SPI_NAND=1,\$(EXTRA_OEMAKE)) STM32MP_UART_PROGRAMMER=1 STM32MP_USB_PROGRAMMER=1
# Set default config # Set default config
ELF_DEBUG_ENABLE ?= ${ELF_DEBUG_ENABLE} ELF_DEBUG_ENABLE ?= ${ELF_DEBUG_ENABLE}
@ -78,27 +78,31 @@ tf: host_tools
mkdir -p \$(LOCAL_PATH)/../build/\$\$config ; \\ mkdir -p \$(LOCAL_PATH)/../build/\$\$config ; \\
if test -n "\$(TFA_DEVICETREE)" ; then \\ if test -n "\$(TFA_DEVICETREE)" ; then \\
for dt in \$(TFA_DEVICETREE) ; do \\ for dt in \$(TFA_DEVICETREE) ; do \\
if [ "\$(TF_A_CONFIG)" != "serialboot" ]; then \\ if [ "\$\$config" != "serialboot" ]; then \\
\$(MAKE) \$(EXTRA_OEMAKE) -C \$(LOCAL_PATH) DTB_FILE_NAME=\$\$dt.dtb BUILD_PLAT=\$(LOCAL_PATH)/../build/\$\$config \$\$add_extraoemake ; \\ \$(MAKE) \$(EXTRA_OEMAKE) -C \$(LOCAL_PATH) DTB_FILE_NAME=\$\$dt.dtb BUILD_PLAT=\$(LOCAL_PATH)/../build/\$\$config \$\$add_extraoemake ; \\
else \\ else \\
\$(MAKE) \$(EXTRA_OEMAKE_SERIAL) -C \$(LOCAL_PATH) DTB_FILE_NAME=\$\$dt.dtb BUILD_PLAT=\$(LOCAL_PATH)/../build/\$\$config \$\$add_extraoemake ; \\ \$(MAKE) \$(EXTRA_OEMAKE_SERIAL) -C \$(LOCAL_PATH) DTB_FILE_NAME=\$\$dt.dtb BUILD_PLAT=\$(LOCAL_PATH)/../build/\$\$config \$\$add_extraoemake ; \\
fi \\ fi ; \\
# Copy binary file with explicit name \\ # Copy binary file with explicit name \\
cp -f \$(LOCAL_PATH)/../build/\$\$config/${TF_A_BASENAME}-\$\$dt.${TF_A_SUFFIX} \$(LOCAL_PATH)/../build/\$\$config/${TF_A_BASENAME}-\$\$dt-\$\$config.${TF_A_SUFFIX} ; \\ cp -f \$(LOCAL_PATH)/../build/\$\$config/${TF_A_BASENAME}-\$\$dt.${TF_A_SUFFIX} \$(LOCAL_PATH)/../build/\$\$config/${TF_A_BASENAME}-\$\$dt-\$\$config.${TF_A_SUFFIX} ; \\
if [ "\$(TF_A_ENABLE_DEBUG_WRAPPER)" = "1" ]; then \\ if [ "\$(TF_A_ENABLE_DEBUG_WRAPPER)" = "1" ]; then \\
# Generate wrapper for debugging \\ # Generate wrapper for debugging \\
stm32wrapper4dbg -s \$(LOCAL_PATH)/../build/\$\$config/${TF_A_BASENAME}-\$\$dt.${TF_A_SUFFIX} -d \$(LOCAL_PATH)/../build/\$\$config/debug-${TF_A_BASENAME}-\$\$dt-\$\$config.${TF_A_SUFFIX} ; \\ stm32wrapper4dbg -s \$(LOCAL_PATH)/../build/\$\$config/${TF_A_BASENAME}-\$\$dt.${TF_A_SUFFIX} -d \$(LOCAL_PATH)/../build/\$\$config/debug-${TF_A_BASENAME}-\$\$dt-\$\$config.${TF_A_SUFFIX} ; \\
fi \\ fi ; \\
done ; \\ done ; \\
else \\ else \\
\$(MAKE) \$(EXTRA_OEMAKE) -C \$(LOCAL_PATH) BUILD_PLAT=\$(LOCAL_PATH)/../build/\$\$config \$\$add_extraoemake; \\ if [ "\$\$config" != "serialboot" ]; then \\
\$(MAKE) \$(EXTRA_OEMAKE) -C \$(LOCAL_PATH) BUILD_PLAT=\$(LOCAL_PATH)/../build/\$\$config \$\$add_extraoemake; \\
else \\
\$(MAKE) \$(EXTRA_OEMAKE_SERIAL) -C \$(LOCAL_PATH) BUILD_PLAT=\$(LOCAL_PATH)/../build/\$\$config \$\$add_extraoemake; \\
fi ; \\
tf_version=\$\$(find \$(LOCAL_PATH)/../build/\$\$config -name ${TF_A_BASENAME}*.${TF_A_SUFFIX} -exec basename {} \; | sed "s/\.${TF_A_SUFFIX}//") ; \\ tf_version=\$\$(find \$(LOCAL_PATH)/../build/\$\$config -name ${TF_A_BASENAME}*.${TF_A_SUFFIX} -exec basename {} \; | sed "s/\.${TF_A_SUFFIX}//") ; \\
# Copy binary file with explicit name \\ # Copy binary file with explicit name \\
cp -f \$(LOCAL_PATH)/../build/\$\$config/\$\$tf_version.${TF_A_SUFFIX} \$(LOCAL_PATH)/../build/\$\$config/\$\$tf_version-\$\$config.${TF_A_SUFFIX} ; \\ cp -f \$(LOCAL_PATH)/../build/\$\$config/\$\$tf_version.${TF_A_SUFFIX} \$(LOCAL_PATH)/../build/\$\$config/\$\$tf_version-\$\$config.${TF_A_SUFFIX} ; \\
if [ "\$(TF_A_ENABLE_DEBUG_WRAPPER)" = "1" ]; then \\ if [ "\$(TF_A_ENABLE_DEBUG_WRAPPER)" = "1" ]; then \\
# Generate wrapper for debugging \\ # Generate wrapper for debugging \\
stm32wrapper4dbg -s \$(LOCAL_PATH)/../build/\$\$config/\$\$tf_version.${TF_A_SUFFIX} \$(LOCAL_PATH)/../build/\$\$config/debug-\$\$tf_version-\$\$config.${TF_A_SUFFIX} ; \\ stm32wrapper4dbg -s \$(LOCAL_PATH)/../build/\$\$config/\$\$tf_version.${TF_A_SUFFIX} \$(LOCAL_PATH)/../build/\$\$config/debug-\$\$tf_version-\$\$config.${TF_A_SUFFIX} ; \\
fi \\ fi ; \\
fi ; \\ fi ; \\
# Copy elf files with explicit name \\ # Copy elf files with explicit name \\
if [ "\$(ELF_DEBUG_ENABLE)" = "1" ] ; then \\ if [ "\$(ELF_DEBUG_ENABLE)" = "1" ] ; then \\

6
recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common.inc
View File

@ -52,8 +52,10 @@ STAGING_TFA_DIR = "${TMPDIR}/work-shared/${MACHINE}/tfa-source"
# Make sure to move ${S} to STAGING_TFA_DIR. We can't just # Make sure to move ${S} to STAGING_TFA_DIR. We can't just
# create the symlink in advance as the git fetcher can't cope with # create the symlink in advance as the git fetcher can't cope with
# the symlink. # the symlink.
do_unpack[cleandirs] += " ${S} ${STAGING_TFA_DIR}" do_unpack[cleandirs] += "${S}"
do_clean[cleandirs] += " ${S} ${STAGING_TFA_DIR}" do_unpack[cleandirs] += "${@bb.utils.contains('TFA_SHARED_SOURCES', '1', '${STAGING_TFA_DIR}', '', d)}"
do_clean[cleandirs] += "${S}"
do_clean[cleandirs] += "${@bb.utils.contains('TFA_SHARED_SOURCES', '1', '${STAGING_TFA_DIR}', '', d)}"
base_do_unpack_append () { base_do_unpack_append () {
# Specific part to update devtool-source class # Specific part to update devtool-source class
if bb.data.inherits_class('devtool-source', d): if bb.data.inherits_class('devtool-source', d):

3
recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common_2.2.inc
View File

@ -10,9 +10,10 @@ SRCREV = "a04808c16cfc126d9fe572ae7c4b5a3d39de5796"
SRC_URI += " \ SRC_URI += " \
file://0001-st-update-v2.2-r2.0.0.patch \ file://0001-st-update-v2.2-r2.0.0.patch \
file://0002-st-update-v2.2-r2.1.0.patch \
" "
TF_VERSION = "2.2" TF_VERSION = "2.2"
PV = "${TF_VERSION}.r1" PV = "${TF_VERSION}.r2"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

1775
recipes-bsp/trusted-firmware-a/tf-a-stm32mp/0100-st-update-ssp-v2.2-r2.0.0.patch → recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ssp/0100-v2.2-stm32mp-ssp-r2-rc2.patch
View File

File diff suppressed because it is too large Load Diff

25
recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ssp_2.2.bb
View File

@ -1,17 +1,28 @@
require tf-a-stm32mp-common_${PV}.inc
require tf-a-stm32mp-common.inc require tf-a-stm32mp-common.inc
SUMMARY = "Trusted Firmware-A SSP for STM32MP1" SUMMARY = "Trusted Firmware-A SSP for STM32MP1"
SECTION = "bootloaders"
LICENSE = "BSD-3-Clause" LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
SRC_URI = "git://github.com/ARM-software/arm-trusted-firmware.git;protocol=https;nobranch=1"
SRCREV = "a04808c16cfc126d9fe572ae7c4b5a3d39de5796"
SRC_URI += " \
file://0001-st-update-v2.2-r2.0.0.patch \
\
file://0100-v2.2-stm32mp-ssp-r2-rc2.patch \
"
TF_VERSION = "2.2"
PV = "${TF_VERSION}.r2"
S = "${WORKDIR}/git"
PROVIDES += "virtual/trusted-firmware-a-ssp" PROVIDES += "virtual/trusted-firmware-a-ssp"
TFA_SHARED_SOURCES = "0" TFA_SHARED_SOURCES = "0"
SRC_URI += " \
file://0100-st-update-ssp-v2.2-r2.0.0.patch \
"
TF_A_BASENAME = "tf-a-ssp" TF_A_BASENAME = "tf-a-ssp"
TF_A_CONFIG = "ssp" TF_A_CONFIG = "ssp"
TF_A_CONFIG_ssp = " STM32MP_SSP=1 " TF_A_CONFIG_ssp = " STM32MP_SSP=1 "
@ -33,8 +44,8 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'tf-a-stm32mp-
# --------------------------------- # ---------------------------------
BBCLASSEXTEND = "devupstream:target" BBCLASSEXTEND = "devupstream:target"
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=v${TF_VERSION}-stm32mp-ssp" SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=v${TF_VERSION}-r2-stm32mp-ssp"
SRCREV_class-devupstream = "3a5830ccfbcebfaa60540d50d42f0e37f3b532e9" SRCREV_class-devupstream = "91745e6389486247c8a4b11cc428f9ce235f319e"
# --------------------------------- # ---------------------------------
# Configure default preference to manage dynamic selection between tarball and github # Configure default preference to manage dynamic selection between tarball and github

1670
recipes-bsp/trusted-firmware-a/tf-a-stm32mp/0002-st-update-v2.2-r2.1.0.patch Normal file
View File

File diff suppressed because it is too large Load Diff

2
recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.2.bb
View File

@ -31,7 +31,7 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'tf-a-stm32mp-
BBCLASSEXTEND = "devupstream:target" BBCLASSEXTEND = "devupstream:target"
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=v${TF_VERSION}-stm32mp" SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=v${TF_VERSION}-stm32mp"
SRCREV_class-devupstream = "e587179e7b0823b5c6e38e029e417d10f088db51" SRCREV_class-devupstream = "9d1dd642963e2b47142d1d26d09b7e4a762d6954"
# --------------------------------- # ---------------------------------
# Configure default preference to manage dynamic selection between tarball and github # Configure default preference to manage dynamic selection between tarball and github