mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-22 15:11:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "configs: stm32mp1: only support SD card after NOR in bootcmd_stm32mp"

Browse Source 
This reverts commit d5d726d3cc47691ace3c68fa31147ad104aaf579,
which breaks boards which ship with multiple SD/eMMC sockets.

This stm32mp1.h config is not used only by the ST reference
boards, but all the other STM32MP1 based boards in U-Boot, so
changes to this stm32mp1.h cannot break the other boards.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Patrice Chotard <patrice.chotard@foss.st.com>
Cc: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
This commit is contained in:
Marek Vasut 2021-10-04 13:48:08 +02:00 committed by Patrice Chotard
parent 5d81616fb8
commit 2d0808161b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/configs/stm32mp1.h
View File

@ -115,7 +115,7 @@
* for serial/usb: execute the stm32prog command * for serial/usb: execute the stm32prog command
* for mmc boot (eMMC, SD card), boot only on the same device * for mmc boot (eMMC, SD card), boot only on the same device
* for nand or spi-nand boot, boot with on ubifs partition on UBI partition * for nand or spi-nand boot, boot with on ubifs partition on UBI partition
* for nor boot, use SD card = mmc0 * for nor boot, use the default order
*/ */
#define STM32MP_BOOTCMD "bootcmd_stm32mp=" \ #define STM32MP_BOOTCMD "bootcmd_stm32mp=" \
"echo \"Boot over ${boot_device}${boot_instance}!\";" \ "echo \"Boot over ${boot_device}${boot_instance}!\";" \
@ -128,8 +128,6 @@
"if test ${boot_device} = nand ||" \ "if test ${boot_device} = nand ||" \
" test ${boot_device} = spi-nand ;" \ " test ${boot_device} = spi-nand ;" \
"then env set boot_targets ubifs0; fi;" \ "then env set boot_targets ubifs0; fi;" \
"if test ${boot_device} = nor;" \
"then env set boot_targets mmc0; fi;" \
"run distro_bootcmd;" \ "run distro_bootcmd;" \
"fi;\0" "fi;\0"