On 6/8/23 17:16, Patrick Delaunay wrote:
> From: Patrice Chotard <patrice.chot...@foss.st.com>
>
> As stm32prog_get_tee_partitions() is no more used, remove tee_detected
> boolean from stm32prog_data struct and all code using it.
>
> Signed-off-by: Patrice Chotard <patrice.chot...@foss.st.com>
> Signed-off-by: Patrick Delaunay <patrick.delau...@foss.st.com>
> ---
>
> arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 9 ---------
> arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 11 -----------
> arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h | 3 ---
> arch/arm/mach-stm32mp/include/mach/stm32prog.h | 4 ----
> 4 files changed, 27 deletions(-)
>
> diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
> b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
> index cfafa539aeb9..c695cc11232b 100644
> --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
> +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
> @@ -180,15 +180,6 @@ 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)
> - return stm32prog_data->tee_detected;
> -
> - 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 241ad40abb7c..0cdc14dd5bc8 100644
> --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
> +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
> @@ -995,9 +995,6 @@ 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];
> @@ -1049,14 +1046,6 @@ static int treat_partition_list(struct stm32prog_data
> *data)
> !strncmp(part->name, "fsbl", 4))
> data->fsbl_nor_detected = true;
> /* 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 58f4b96fa752..04a899ee1184 100644
> --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
> +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h
> @@ -149,9 +149,6 @@ 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 99be4e1d656b..23d1adfbad92 100644
> --- a/arch/arm/mach-stm32mp/include/mach/stm32prog.h
> +++ b/arch/arm/mach-stm32mp/include/mach/stm32prog.h
> @@ -11,8 +11,4 @@ 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);
Reviewed-by: Patrice Chotard <patrice.chot...@foss.st.com>
Thanks
Patrice
