stm32mp1: stm32prog: remove stm32prog_get_tee_partitions with FIP

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>

diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
index be53a529772017a82f38e8193dc504185dfad797..41452b5a290d9525b75b37a0864e6634dcab091e 100644 (file)
--- 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 26fe8b654a7a1c588a33bbd8b824b37bdb443761..3b6ca4e7732d3a0f2ccdc7582c495140d219e75b 100644 (file)
--- 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 9d58cf0e2dac4ee8485472213cff1a781582c604..240c5c44bcbee40db6cbe5b19815e10e4a312ae7 100644 (file)
--- 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 c080b9cc42ad4ea4fed821a49516cf685ab703d6..99be4e1d656b0edb851d7e1dae02e9d3440e7d34 100644 (file)
--- 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);