@@ -5,7 +5,7 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-stm.git
S: Maintained
F: arch/arm/dts/stm32mp15*
F: board/st/stm32mp1/
-F: configs/stm32mp15_defconfig
F: configs/stm32mp15_basic_defconfig
F: configs/stm32mp15_trusted_defconfig
+F: configs/stm32mp15_tfaboot_fip_defconfig
F: include/configs/stm32mp1.h
similarity index 100%
rename from configs/stm32mp15_defconfig
rename to configs/stm32mp15_tfaboot_fip_defconfig
@@ -76,7 +76,7 @@ The **Trusted** boot chain with TF-A_
`````````````````````````````````````
defconfig_file :
- + **stm32mp15_defconfig** (for TF-A_ with FIP support)
+ + **stm32mp15_tfaboot_fip_defconfig** (for TF-A_ with FIP support)
+ **stm32mp15_trusted_defconfig** (for TF-A_ without FIP support)
+-------------+--------------------------+------------+-------+
@@ -184,7 +184,7 @@ Build Procedure
with <defconfig_file>:
- - For **trusted** boot mode : **stm32mp15_defconfig** or
+ - For **trusted** boot mode : **stm32mp15_tfaboot_fip_defconfig** or
stm32mp15_trusted_defconfig
- For basic boot mode: stm32mp15_basic_defconfig
@@ -197,7 +197,7 @@ Build Procedure
a) trusted boot with FIP on ev1::
# export KBUILD_OUTPUT=stm32mp15
- # make stm32mp15_defconfig
+ # make stm32mp15_tfaboot_fip_defconfig
# make DEVICE_TREE=stm32mp157c-ev1 all
b) trusted boot without FIP on dk2::
@@ -235,7 +235,7 @@ Build Procedure
So in the output directory (selected by KBUILD_OUTPUT),
you can found the needed U-Boot files:
- - stm32mp15_defconfig = **u-boot-nodtb.bin** and **u-boot.dtb**
+ - stm32mp15_tfaboot_fip_defconfig = **u-boot-nodtb.bin** and **u-boot.dtb**
- stm32mp15_trusted_defconfig = u-boot.stm32
@@ -248,11 +248,11 @@ Build Procedure
7. TF-A_ compilation
- This step is required only for **Trusted** boot (stm32mp15_defconfig and
- stm32mp15_trusted_defconfig); see OP-TEE_ and TF-A_ documentation for build
- commands.
+ This step is required only for **Trusted** boot
+ (stm32mp15_tfaboot_fip_defconfig and stm32mp15_trusted_defconfig); see
+ OP-TEE_ and TF-A_ documentation for build commands.
- - For TF-A_ with FIP support: **stm32mp15_defconfig**
+ - For TF-A_ with FIP support: **stm32mp15_tfaboot_fip_defconfig**
- with OP-TEE_ support, compile the OP-TEE to generate the binary included
in FIP
STM32MP has several possible boot flows with either SPL or TF-A. The word from STM is that they only want to support TF-A with FIP images, and this should be default. We don't disagree. However, this argument is orthogonal to naming our defconfigs clearly. I'm concerned that users might be confused by the current naming. When given the choice between "basic", "trusted", or "<empty>", someone used with how u-boot works will think that the "<empty>" config is the customary "SPL + u-boot". However, such confusion is far less likely when the choices are "basic", "trusted", and "tfaboot_fip". To this effect, avoid having a naked config name and rename it to "stm32mp15_tfaboot_fip_defconig". Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> --- board/st/stm32mp1/MAINTAINERS | 2 +- ...defconfig => stm32mp15_tfaboot_fip_defconfig} | 0 doc/board/st/stm32mp1.rst | 16 ++++++++-------- 3 files changed, 9 insertions(+), 9 deletions(-) rename configs/{stm32mp15_defconfig => stm32mp15_tfaboot_fip_defconfig} (100%)