On 4/25/25 15:15, Patrice Chotard wrote:
> Handle boot for the 3 instance of MMC and call the command stm32prog
> for serial boot on USB or on UART as it is done for other STM32MP platform.
>
> Signed-off-by: Patrick Delaunay <patrick.delau...@foss.st.com>
> Signed-off-by: Patrice Chotard <patrice.chot...@foss.st.com>
> ---
>
> (no changes since v1)
>
> include/configs/stm32mp25_common.h | 77 ++++++++++++++++++++++++++++++
> 1 file changed, 77 insertions(+)
>
> diff --git a/include/configs/stm32mp25_common.h
> b/include/configs/stm32mp25_common.h
> index ec980eea856..542de8f068d 100644
> --- a/include/configs/stm32mp25_common.h
> +++ b/include/configs/stm32mp25_common.h
> @@ -21,4 +21,81 @@
> */
> #define CFG_SYS_BOOTMAPSZ SZ_256M
>
> +/*****************************************************************************/
> +#ifdef CONFIG_DISTRO_DEFAULTS
> +/*****************************************************************************/
> +
> +#ifdef CONFIG_CMD_MMC
> +#define BOOT_TARGET_MMC0(func) func(MMC, mmc, 0)
> +#define BOOT_TARGET_MMC1(func) func(MMC, mmc, 1)
> +#define BOOT_TARGET_MMC2(func) func(MMC, mmc, 2)
> +#else
> +#define BOOT_TARGET_MMC0(func)
> +#define BOOT_TARGET_MMC1(func)
> +#define BOOT_TARGET_MMC2(func)
> +#endif
> +
> +#define BOOT_TARGET_DEVICES(func) \
> + BOOT_TARGET_MMC1(func) \
> + BOOT_TARGET_MMC0(func) \
> + BOOT_TARGET_MMC2(func)
> +
> +/*
> + * default bootcmd for stm32mp25:
> + * for serial/usb: execute the stm32prog command
> + * for mmc boot (eMMC, SD card), distro boot on the same mmc device
> + * for other boot, use the default distro order in ${boot_targets}
> + */
> +#define STM32MP_BOOTCMD "bootcmd_stm32mp=" \
> + "echo \"Boot over ${boot_device}${boot_instance}!\";" \
> + "if test ${boot_device} = serial || test ${boot_device} = usb;" \
> + "then stm32prog ${boot_device} ${boot_instance}; " \
> + "else " \
> + "run env_check;" \
> + "if test ${boot_device} = mmc;" \
> + "then env set boot_targets \"mmc${boot_instance}\"; fi;" \
> + "run distro_bootcmd;" \
> + "fi;\0"
> +
> +#ifndef STM32MP_BOARD_EXTRA_ENV
> +#define STM32MP_BOARD_EXTRA_ENV
> +#endif
> +
> +#define STM32MP_EXTRA \
> + "env_check=if env info -p -d -q; then env save; fi\0" \
> + "boot_net_usb_start=true\0"
> +/*
> + * memory layout for 96MB uncompressed/compressed kernel,
> + * 1M fdt, 1M script, 1M pxe and 1M for overlay
> + * and the ramdisk at the end.
> + */
> +#define __KERNEL_COMP_ADDR_R __stringify(0x84000000)
> +#define __KERNEL_COMP_SIZE_R __stringify(0x04000000)
> +#define __KERNEL_ADDR_R __stringify(0x8a000000)
> +#define __FDT_ADDR_R __stringify(0x90000000)
> +#define __SCRIPT_ADDR_R __stringify(0x90100000)
> +#define __PXEFILE_ADDR_R __stringify(0x90200000)
> +#define __FDTOVERLAY_ADDR_R __stringify(0x90300000)
> +#define __RAMDISK_ADDR_R __stringify(0x90400000)
> +
> +#define STM32MP_MEM_LAYOUT \
> + "kernel_addr_r=" __KERNEL_ADDR_R "\0" \
> + "fdt_addr_r=" __FDT_ADDR_R "\0" \
> + "scriptaddr=" __SCRIPT_ADDR_R "\0" \
> + "pxefile_addr_r=" __PXEFILE_ADDR_R "\0" \
> + "fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \
> + "ramdisk_addr_r=" __RAMDISK_ADDR_R "\0" \
> + "kernel_comp_addr_r=" __KERNEL_COMP_ADDR_R "\0" \
> + "kernel_comp_size=" __KERNEL_COMP_SIZE_R "\0"
> +
> +#include <config_distro_bootcmd.h>
> +#define CFG_EXTRA_ENV_SETTINGS \
> + STM32MP_MEM_LAYOUT \
> + STM32MP_BOOTCMD \
> + BOOTENV \
> + STM32MP_EXTRA \
> + STM32MP_BOARD_EXTRA_ENV
> +
> +#endif
> +
> #endif /* __CONFIG_STM32MP25_COMMMON_H */
Applied to u-boot-stm32/master
Thanks
Patrice
