A '.stm32' extension is not allowed anymore, so change it.
Signed-off-by: Simon Glass <s...@chromium.org>
---
arch/arm/dts/stm32mp15-u-boot.dtsi | 2 +-
doc/board/st/stm32mp1.rst | 18 +++++++++---------
include/configs/stm32mp15_dh_dhsom.h | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/dts/stm32mp15-u-boot.dtsi
b/arch/arm/dts/stm32mp15-u-boot.dtsi
index 573dd4d3ed56..717eb96a517c 100644
--- a/arch/arm/dts/stm32mp15-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15-u-boot.dtsi
@@ -222,7 +222,7 @@
#if defined(CONFIG_SPL)
&binman {
spl-stm32 {
- filename = "u-boot-spl.stm32";
+ filename = "u-boot-spl-stm32.bin";
mkimage {
args = "-T stm32image -a 0x2ffc2500 -e 0x2ffc2500";
u-boot-spl {
diff --git a/doc/board/st/stm32mp1.rst b/doc/board/st/stm32mp1.rst
index 63b44776ffc1..01ba817aa80d 100644
--- a/doc/board/st/stm32mp1.rst
+++ b/doc/board/st/stm32mp1.rst
@@ -318,7 +318,7 @@ Build Procedure
- stm32mp15_basic_defconfig
- - FSBL = spl/u-boot-spl.stm32
+ - FSBL = spl/u-boot-spl-stm32.bin
- SSBL = u-boot.img (without CONFIG_SPL_LOAD_FIT) or
u-boot.itb (with CONFIG_SPL_LOAD_FIT=y)
@@ -361,7 +361,7 @@ Build Procedure
8. The bootloaders files
+ The **ROM code** expects FSBL binaries with STM32 image header =
- tf-a.stm32 or u-boot-spl.stm32
+ tf-a.stm32 or u-boot-spl-stm32.bin
According the FSBL / the boot mode:
@@ -468,9 +468,9 @@ or:
+-------+--------+---------+------------------------+------------------------+
| *Num* | *Name* | *Size* | *Trusted boot content* | *Basic boot content*
|
+=======+========+=========+========================+========================+
- | 1 | fsbl1 | 256 KiB | TF-A_ BL2 (tf-a.stm32) | SPL (u-boot-spl.stm32)
|
+ | 1 | fsbl1 | 256 KiB | TF-A_ BL2 (tf-a.stm32) | SPL
(u-boot-spl-stm32.bin) |
+-------+--------+---------+------------------------+------------------------+
- | 2 | fsbl2 | 256 KiB | TF-A_ BL2 (tf-a.stm32) | SPL (u-boot-spl.stm32)
|
+ | 2 | fsbl2 | 256 KiB | TF-A_ BL2 (tf-a.stm32) | SPL
(u-boot-spl-stm32.bin) |
+-------+--------+---------+------------------------+------------------------+
| 3 | ssbl | 2MB | U-Boot (u-boot.stm32) | U-Boot (u-boot.img)
|
+-------+--------+---------+------------------------+------------------------+
@@ -528,8 +528,8 @@ c) copy the FSBL (2 times) and SSBL file on the correct
partition.
for basic boot mode : <SD card dev> = /dev/mmcblk0::
- # dd if=u-boot-spl.stm32 of=/dev/mmcblk0p1
- # dd if=u-boot-spl.stm32 of=/dev/mmcblk0p2
+ # dd if=u-boot-spl-stm32.bin of=/dev/mmcblk0p1
+ # dd if=u-boot-spl-stm32.bin of=/dev/mmcblk0p2
# dd if=u-boot.img of=/dev/mmcblk0p3 # Without CONFIG_SPL_LOAD_FIT
OR
dd if=u-boot.itb of=/dev/mmcblk0p3 # With CONFIG_SPL_LOAD_FIT=y
@@ -542,7 +542,7 @@ Prepare eMMC
You can use U-Boot to copy binary in eMMC.
In the next example, you need to boot from SD card and the images
-(tf-a.stm32, fip.bin / u-boot-spl.stm32, u-boot.img for systems without
+(tf-a.stm32, fip.bin / u-boot-spl-stm32.bin, u-boot.img for systems without
CONFIG_SPL_LOAD_FIT or u-boot.itb for systems with CONFIG_SPL_LOAD_FIT=y) are
presents on SD card (mmc 0) in ext4 partition 4 (bootfs)
@@ -561,7 +561,7 @@ b) copy FSBL, TF-A_ or SPL, on first eMMC boot partition
# ext4load mmc 0:4 0xC0000000 tf-a.stm32
or
- # ext4load mmc 0:4 0xC0000000 u-boot-spl.stm32
+ # ext4load mmc 0:4 0xC0000000 u-boot-spl-stm32.bin
# mmc dev 1
# mmc partconf 1 1 1 1
@@ -838,4 +838,4 @@ Arm TrustZone technology
+ https://www.op-tee.org/
+ https://optee.readthedocs.io/en/latest/
+ https://optee.readthedocs.io/en/latest/building/devices/stm32mp1.html
- + https://github.com/OP-TEE/optee_os
\ No newline at end of file
+ + https://github.com/OP-TEE/optee_os
diff --git a/include/configs/stm32mp15_dh_dhsom.h
b/include/configs/stm32mp15_dh_dhsom.h
index 919216906249..ad4e93805ded 100644
--- a/include/configs/stm32mp15_dh_dhsom.h
+++ b/include/configs/stm32mp15_dh_dhsom.h
@@ -22,7 +22,7 @@
"usb_pgood_delay=1000\0" \
"update_sf=" /* Erase SPI NOR and install U-Boot from SD */ \
"setexpr loadaddr1 ${loadaddr} + 0x1000000 && " \
- "load mmc 0:4 ${loadaddr1} /boot/u-boot-spl.stm32 && " \
+ "load mmc 0:4 ${loadaddr1} /boot/u-boot-spl-stm32.bin && "
\
"env set filesize1 ${filesize} && " \
"load mmc 0:4 ${loadaddr} /boot/u-boot.itb && " \
"sf probe && sf erase 0 0x200000 && " \
--
2.42.0.rc1.204.g551eb34607-goog
