aboutsummaryrefslogtreecommitdiff
path: root/board/stmicroelectronics
diff options
context:
space:
mode:
authorGravatar Shlomi Vaknin <shlomi.39sd@gmail.com>2020-10-07 17:49:43 +0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-10-13 23:04:03 +0200
commit4d15114713c9f20a6901ec156c8ae73f0cf3739d (patch)
treebaff8db2566021250512622ce517f38362561aeb /board/stmicroelectronics
parent5d277d20cc4e98d5571beb1d62e92c8c229a80e7 (diff)
downloadbuildroot-4d15114713c9f20a6901ec156c8ae73f0cf3739d.tar.gz
buildroot-4d15114713c9f20a6901ec156c8ae73f0cf3739d.tar.bz2
configs/stm32mp157*: switch to use TF-A based configurations
This commit changes the stm32mp1 configurations to use the TF-A -> U-Boot boot flow (called "trusted boot flow" by ST) instead of the U-Boot SPL -> U-Boot boot flow. ST recommands this trusted boot, and it's also the only one that allows to use the STM32 Cube Programmer for reflashing devices. As part of this, the genimage configuration file is now generated, as it contains some file names that depend on the platform. Removing partition-type from genimage.cfg is mandatory, since it would cause a hybrid MBR partition table to be created, which itself would prevent ATF from finding the ssbl parition. Signed-off-by: Shlomi Vaknin <shlomi.39sd@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'board/stmicroelectronics')
-rw-r--r--board/stmicroelectronics/common/stm32mp157/genimage.cfg.template (renamed from board/stmicroelectronics/common/stm32mp157/genimage.cfg)7
-rwxr-xr-xboard/stmicroelectronics/common/stm32mp157/post-image.sh36
2 files changed, 39 insertions, 4 deletions
diff --git a/board/stmicroelectronics/common/stm32mp157/genimage.cfg b/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template
index d1ce530cc5..f341c19f2f 100644
--- a/board/stmicroelectronics/common/stm32mp157/genimage.cfg
+++ b/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template
@@ -4,20 +4,19 @@ image sdcard.img {
}
partition fsbl1 {
- image = "u-boot-spl.stm32"
+ image = "%ATFBIN%"
}
partition fsbl2 {
- image = "u-boot-spl.stm32"
+ image = "%ATFBIN%"
}
partition ssbl {
- image = "u-boot.img"
+ image = "u-boot.stm32"
}
partition rootfs {
image = "rootfs.ext4"
- partition-type = 0x83
bootable = "yes"
}
}
diff --git a/board/stmicroelectronics/common/stm32mp157/post-image.sh b/board/stmicroelectronics/common/stm32mp157/post-image.sh
new file mode 100755
index 0000000000..eec3cb739d
--- /dev/null
+++ b/board/stmicroelectronics/common/stm32mp157/post-image.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+#
+# atf_image extracts the ATF binary image from DTB_FILE_NAME that appears in
+# BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES in ${BR_CONFIG},
+# then prints the corresponding file name for the genimage
+# configuration file
+#
+atf_image()
+{
+ local ATF_VARIABLES="$(sed -n 's/^BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="\([\/a-zA-Z0-9_=. \-]*\)"$/\1/p' ${BR2_CONFIG})"
+
+ if grep -Eq "DTB_FILE_NAME=stm32mp157c-dk2.dtb" <<< ${ATF_VARIABLES}; then
+ echo "tf-a-stm32mp157c-dk2.stm32"
+ elif grep -Eq "DTB_FILE_NAME=stm32mp157a-dk1.dtb" <<< ${ATF_VARIABLES}; then
+ echo "tf-a-stm32mp157a-dk1.stm32"
+ fi
+}
+
+main()
+{
+ local ATFBIN="$(atf_image)"
+ local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)"
+ local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+ sed -e "s/%ATFBIN%/${ATFBIN}/" \
+ board/stmicroelectronics/common/stm32mp157/genimage.cfg.template > ${GENIMAGE_CFG}
+
+ support/scripts/genimage.sh -c ${GENIMAGE_CFG}
+
+ rm -f ${GENIMAGE_CFG}
+
+ exit $?
+}
+
+main $@