| Message ID | 20210726111931.v3.5.I1aeda5b6cc2115de802f79656884387d7a7ca94c@changeid |
|---|---|
| State | Accepted |
| Commit | f64d32a27ad00af7445068f78421c24243428c1e |
| Delegated to: | Patrice Chotard |
| Headers | show |
| Series | stm32mp1: handle TF-A boot with FIP | expand |
Hi Patrick On 7/26/21 11:21 AM, Patrick Delaunay wrote: > The MTD tee partitions used to save the OP-TEE binary are needed when > TF-A doesn't use the FIP container to load binaries. > > This patch puts under CONFIG_STM32MP15x_STM32IMAGE flag the associated > code in U-Boot binary and prepare the code cleanup when > CONFIG_STM32MP15x_STM32IMAGE support will be removed after TF-A migration > to FIP support. > > Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com> > Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> > --- > > (no changes since v1) > > arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 ++ > arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 4 ++++ > arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h | 2 ++ > arch/arm/mach-stm32mp/include/mach/stm32prog.h | 2 ++ > 4 files changed, 10 insertions(+) > > diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > index 064f51b2c7..1bccad4e6d 100644 > --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > @@ -185,6 +185,7 @@ U_BOOT_CMD(stm32prog, 5, 0, do_stm32prog, > " <size> = size of flashlayout (optional for image with STM32 header)\n" > ); > > +#ifdef CONFIG_STM32MP15x_STM32IMAGE > bool stm32prog_get_tee_partitions(void) > { > if (stm32prog_data) > @@ -192,6 +193,7 @@ bool stm32prog_get_tee_partitions(void) > > return false; > } > +#endif > > bool stm32prog_get_fsbl_nor(void) > { > diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c > index 96ebc6d978..0971ee79af 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; > } > diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h > index 9d58cf0e2d..240c5c44bc 100644 > --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h > +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h > @@ -122,7 +122,9 @@ struct stm32prog_data { > struct stm32prog_dev_t dev[STM32PROG_MAX_DEV]; /* array of device */ > int part_nb; /* nb of partition */ > struct stm32prog_part_t *part_array; /* array of partition */ > +#ifdef CONFIG_STM32MP15x_STM32IMAGE > bool tee_detected; > +#endif > bool fsbl_nor_detected; > > /* command internal information */ > diff --git a/arch/arm/mach-stm32mp/include/mach/stm32prog.h b/arch/arm/mach-stm32mp/include/mach/stm32prog.h > index c080b9cc42..99be4e1d65 100644 > --- a/arch/arm/mach-stm32mp/include/mach/stm32prog.h > +++ b/arch/arm/mach-stm32mp/include/mach/stm32prog.h > @@ -11,6 +11,8 @@ int stm32prog_read_medium_virt(struct dfu_entity *dfu, u64 offset, > void *buf, long *len); > int stm32prog_get_medium_size_virt(struct dfu_entity *dfu, u64 *size); > > +#ifdef CONFIG_STM32MP15x_STM32IMAGE > bool stm32prog_get_tee_partitions(void); > +#endif > > bool stm32prog_get_fsbl_nor(void); > Applied to u-boot-stm/master Thanks Patrice
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c index 064f51b2c7..1bccad4e6d 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c @@ -185,6 +185,7 @@ U_BOOT_CMD(stm32prog, 5, 0, do_stm32prog, " <size> = size of flashlayout (optional for image with STM32 header)\n" ); +#ifdef CONFIG_STM32MP15x_STM32IMAGE bool stm32prog_get_tee_partitions(void) { if (stm32prog_data) @@ -192,6 +193,7 @@ bool stm32prog_get_tee_partitions(void) return false; } +#endif bool stm32prog_get_fsbl_nor(void) { diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c index 96ebc6d978..0971ee79af 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; } diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h index 9d58cf0e2d..240c5c44bc 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h @@ -122,7 +122,9 @@ struct stm32prog_data { struct stm32prog_dev_t dev[STM32PROG_MAX_DEV]; /* array of device */ int part_nb; /* nb of partition */ struct stm32prog_part_t *part_array; /* array of partition */ +#ifdef CONFIG_STM32MP15x_STM32IMAGE bool tee_detected; +#endif bool fsbl_nor_detected; /* command internal information */ diff --git a/arch/arm/mach-stm32mp/include/mach/stm32prog.h b/arch/arm/mach-stm32mp/include/mach/stm32prog.h index c080b9cc42..99be4e1d65 100644 --- a/arch/arm/mach-stm32mp/include/mach/stm32prog.h +++ b/arch/arm/mach-stm32mp/include/mach/stm32prog.h @@ -11,6 +11,8 @@ int stm32prog_read_medium_virt(struct dfu_entity *dfu, u64 offset, void *buf, long *len); int stm32prog_get_medium_size_virt(struct dfu_entity *dfu, u64 *size); +#ifdef CONFIG_STM32MP15x_STM32IMAGE bool stm32prog_get_tee_partitions(void); +#endif bool stm32prog_get_fsbl_nor(void);