[PATCH 2/2] config: stm32mp15: remove CONFIG_FASTBOOT_CMD_OEM_FORMAT

[Patrice CHOTARD]

On 5/30/23 14:26, Patrick Delaunay wrote:
> Remove the support of the fastboot "oem format" command for STM32MP15x
> boards and removed the associated env variable "partitions".
> This command is not required; with fastboot tool, the GPT partition can
> be handle with "flash" command in "gpt" target (=CONFIG_FASTBOOT_GPT_NAME),
> for example: fastboot flash gpt gpt.bin
> 
> This patch avoids to define the GPT partitioning in U-Boot environment,
> which is incompatible with planned modifications, for example to
> support TF-A firmware update.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
> 
>  configs/stm32mp15_basic_defconfig     |  1 -
>  configs/stm32mp15_defconfig           |  1 -
>  configs/stm32mp15_trusted_defconfig   |  1 -
>  include/configs/stm32mp15_common.h    | 14 --------------
>  include/configs/stm32mp15_st_common.h |  1 -
>  5 files changed, 18 deletions(-)
> 
> diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
> index 174eb42d6447..dc67873d3934 100644
> --- a/configs/stm32mp15_basic_defconfig
> +++ b/configs/stm32mp15_basic_defconfig
> @@ -109,7 +109,6 @@ CONFIG_FASTBOOT_MMC_BOOT1_NAME="mmc1boot0"
>  CONFIG_FASTBOOT_MMC_BOOT2_NAME="mmc1boot1"
>  CONFIG_FASTBOOT_MMC_USER_SUPPORT=y
>  CONFIG_FASTBOOT_MMC_USER_NAME="mmc1"
> -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
>  CONFIG_FASTBOOT_CMD_OEM_PARTCONF=y
>  CONFIG_FASTBOOT_CMD_OEM_BOOTBUS=y
>  CONFIG_GPIO_HOG=y
> diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig
> index b25477c64d03..fd8c9121762e 100644
> --- a/configs/stm32mp15_defconfig
> +++ b/configs/stm32mp15_defconfig
> @@ -82,7 +82,6 @@ CONFIG_FASTBOOT_MMC_BOOT1_NAME="mmc1boot0"
>  CONFIG_FASTBOOT_MMC_BOOT2_NAME="mmc1boot1"
>  CONFIG_FASTBOOT_MMC_USER_SUPPORT=y
>  CONFIG_FASTBOOT_MMC_USER_NAME="mmc1"
> -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
>  CONFIG_FASTBOOT_CMD_OEM_PARTCONF=y
>  CONFIG_FASTBOOT_CMD_OEM_BOOTBUS=y
>  CONFIG_GPIO_HOG=y
> diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
> index e93a66f867cf..ec6298a0cb4a 100644
> --- a/configs/stm32mp15_trusted_defconfig
> +++ b/configs/stm32mp15_trusted_defconfig
> @@ -83,7 +83,6 @@ CONFIG_FASTBOOT_MMC_BOOT1_NAME="mmc1boot0"
>  CONFIG_FASTBOOT_MMC_BOOT2_NAME="mmc1boot1"
>  CONFIG_FASTBOOT_MMC_USER_SUPPORT=y
>  CONFIG_FASTBOOT_MMC_USER_NAME="mmc1"
> -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
>  CONFIG_FASTBOOT_CMD_OEM_PARTCONF=y
>  CONFIG_FASTBOOT_CMD_OEM_BOOTBUS=y
>  CONFIG_GPIO_HOG=y
> diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h
> index 7db72a19ed95..29a1197b5ae2 100644
> --- a/include/configs/stm32mp15_common.h
> +++ b/include/configs/stm32mp15_common.h
> @@ -92,19 +92,6 @@
>  		"run distro_bootcmd;" \
>  	"fi;\0"
>  
> -#ifdef CONFIG_FASTBOOT_CMD_OEM_FORMAT
> -/* eMMC default partitions for fastboot command: oem format */
> -#define STM32MP_PARTS_DEFAULT \
> -	"partitions=" \
> -	"name=ssbl,size=2M;" \
> -	"name=bootfs,size=64MB,bootable;" \
> -	"name=vendorfs,size=16M;" \
> -	"name=rootfs,size=746M;" \
> -	"name=userfs,size=-\0"
> -#else
> -#define STM32MP_PARTS_DEFAULT
> -#endif
> -
>  #define STM32MP_EXTRA \
>  	"env_check=if env info -p -d -q; then env save; fi\0" \
>  	"boot_net_usb_start=true\0"
> @@ -138,7 +125,6 @@
>  #define CFG_EXTRA_ENV_SETTINGS \
>  	STM32MP_MEM_LAYOUT \
>  	STM32MP_BOOTCMD \
> -	STM32MP_PARTS_DEFAULT \
>  	BOOTENV \
>  	STM32MP_EXTRA \
>  	STM32MP_BOARD_EXTRA_ENV
> diff --git a/include/configs/stm32mp15_st_common.h b/include/configs/stm32mp15_st_common.h
> index 866cd7a719f8..b45982a35b8c 100644
> --- a/include/configs/stm32mp15_st_common.h
> +++ b/include/configs/stm32mp15_st_common.h
> @@ -47,7 +47,6 @@
>  #define CFG_EXTRA_ENV_SETTINGS \
>  	STM32MP_MEM_LAYOUT \
>  	ST_STM32MP1_BOOTCMD \
> -	STM32MP_PARTS_DEFAULT \
>  	BOOTENV \
>  	STM32MP_EXTRA \
>  	STM32MP_BOARD_EXTRA_ENV

Applied to u-boot-stm/next

Thanks
Patrice