diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-16 09:31:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-16 09:31:00 -0400 |
| commit | 5a221adb2f593fc0661b50801109f00041a26f1e (patch) | |
| tree | 6a8466dfda239447062b9df2fcf104d09f2b494e /arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | |
| parent | fdc4fda33051bcb9eb782001afe2bdd3c0d09eae (diff) | |
| parent | 46a738a4ec81959c7545a4bb07e4f5232bbcfefe (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-stm
Highlights:
- Handle TF-A boot with FIP for STM32MP1
- Fix board_get_usable_ram_top(0) for STM32MP1
- DT alignement with kernel v5.14 for STM32MP1
- SPI-NOR DT update for DHSOM
- Add UCLASS API for ECDSA singnature and implement it for STM32MP1
Diffstat (limited to 'arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c')
| -rw-r--r-- | arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c index 26fe8b654a7..3b6ca4e7732 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c @@ -824,7 +824,9 @@ static int treat_partition_list(struct stm32prog_data *data) INIT_LIST_HEAD(&data->dev[j].part_list); } +#ifdef CONFIG_STM32MP15x_STM32IMAGE data->tee_detected = false; +#endif data->fsbl_nor_detected = false; for (i = 0; i < data->part_nb; i++) { part = &data->part_array[i]; @@ -878,10 +880,12 @@ static int treat_partition_list(struct stm32prog_data *data) /* fallthrough */ case STM32PROG_NAND: case STM32PROG_SPI_NAND: +#ifdef CONFIG_STM32MP15x_STM32IMAGE if (!data->tee_detected && !strncmp(part->name, "tee", 3)) data->tee_detected = true; break; +#endif default: break; } |