From f35ce379feffea0a7a2d52c599992dadb742378f Mon Sep 17 00:00:00 2001 From: Jean-Philippe ROMAIN <jean-philippe.romain@st.com> Date: Wed, 9 Sep 2020 15:24:33 +0200 Subject: [PATCH] configs: stm32mp1: enable the fastboot oem command format Enable the fastboot oem command format and set the variable "partitions" with default eMMC partitions list. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Signed-off-by: Jean-Philippe ROMAIN <jean-philippe.romain@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com> --- configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + include/configs/stm32mp1.h | 14 ++++++++++++++ 3 files changed, 16 insertions(+) diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index b816f26011..9c207d0b04 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -84,6 +84,7 @@ 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_GPIO_HOG=y CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig index 5e81e61262..8ce1d79673 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -63,6 +63,7 @@ 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_GPIO_HOG=y CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 863b652ca4..c5539285af 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -132,6 +132,19 @@ "run distro_bootcmd;" \ "fi;\0" +#ifdef CONFIG_FASTBOOT_CMD_OEM_FORMAT +/* eMMC default partitions for fastboot command: oem format */ +#define 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 PARTS_DEFAULT +#endif + #include <config_distro_bootcmd.h> /* @@ -150,6 +163,7 @@ "altbootcmd=run bootcmd\0" \ "env_check=if env info -p -d -q; then env save; fi\0" \ STM32MP_BOOTCMD \ + PARTS_DEFAULT \ BOOTENV \ "boot_net_usb_start=true\0" -- 2.39.5