fastboot: mmc: Add CONFIG_FASTBOOT_MMC_USER_SUPPORT
PATCH 1/4 fastboot: mmc: Add CONFIG_FASTBOOT_MMC_USER_SUPPORT
Split userdata and boot partition support for eMMC update and correct the description (update is supported).
The new configuration CONFIG_FASTBOOT_MMC_USER_SUPPORT allows to activate support of userdata partition update, based on target name=CONFIG_FASTBOOT_MMC_USER_NAME
This patch also removes the unnecessary dependency with ARCH_MEDIATEK and EFI_PARTITION.
---
configs/mt8518_ap1_emmc_defconfig | 1 + drivers/fastboot/Kconfig | 22 +++++++++++++++++----- drivers/fastboot/fb_mmc.c | 9 ++++++--- 3 files changed, 24 insertions(+), 8 deletions(-)
configs/mt8518_ap1_emmc_defconfig +1 -0
@@ -25,6 +25,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x1E00000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT=y +CONFIG_FASTBOOT_MMC_USER_SUPPORT=y CONFIG_DM_MMC=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_MMC_MTK=y
drivers/fastboot/Kconfig +17 -5
@@ -124,14 +124,26 @@ config FASTBOOT_MMC_BOOT1_NAME defined here. The default target name for updating EMMC_BOOT1 is "mmc0boot0". +config FASTBOOT_MMC_USER_SUPPORT + bool "Enable eMMC userdata partition flash/erase" + depends on FASTBOOT_FLASH_MMC + help + Define this to enable the support "flash" and "erase" command on + eMMC userdata. The "flash" command only update the MBR and GPT + header when CONFIG_EFI_PARTITION is supported. + The "erase" command erase all the userdata. + This occurs when the specified "partition name" on the + fastboot command line matches the value CONFIG_FASTBOOT_MMC_USER_NAME. + config FASTBOOT_MMC_USER_NAME - string "Target name for erasing EMMC_USER" - depends on FASTBOOT_FLASH_MMC && EFI_PARTITION && ARCH_MEDIATEK + string "Target name for updating EMMC_USER" + depends on FASTBOOT_MMC_USER_SUPPORT default "mmc0" help - The fastboot "erase" command supports erasing EMMC_USER. This occurs - when the specified "EMMC_USER name" on the "fastboot erase" commands - match the value defined here. + The fastboot "flash" and "erase" command supports EMMC_USER. + This occurs when the specified "EMMC_USER name" on the + "fastboot flash" and the "fastboot erase" commands match the value + defined here. The default target name for erasing EMMC_USER is "mmc0". config FASTBOOT_GPT_NAME
drivers/fastboot/fb_mmc.c +6 -3
@@ -132,7 +132,8 @@ static void write_raw_image(struct blk_desc *dev_desc,fastboot_okay (NULL , response); } -#ifdef CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT +#if defined(CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT ) || \ + defined(CONFIG_FASTBOOT_MMC_USER_SUPPORT )static int fb_mmc_erase_mmc_hwpart (struct blk_desc *dev_desc) {lbaint_t blks;
@@ -151,7 +152,9 @@ static int fb_mmc_erase_mmc_hwpart(struct blk_desc *dev_desc)return 0 ; } +#endif +#ifdef CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT static void fb_mmc_boot1_ops (struct blk_desc *dev_desc,void *buffer,u32 buff_sz,char *response) {
@@ -427,7 +430,7 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer,#endif #if CONFIG_IS_ENABLED(EFI_PARTITION) -#ifndef CONFIG_FASTBOOT_MMC_USER_NAME +#ifndef CONFIG_FASTBOOT_MMC_USER_SUPPORT if (strcmp(cmd, CONFIG_FASTBOOT_GPT_NAME) == 0) { #else if (strcmp(cmd, CONFIG_FASTBOOT_GPT_NAME) == 0 ||
@@ -551,7 +554,7 @@ void fastboot_mmc_erase(const char *cmd, char *response) }#endif -#ifdef CONFIG_FASTBOOT_MMC_USER_NAME +#ifdef CONFIG_FASTBOOT_MMC_USER_SUPPORT if (strcmp (cmd,CONFIG_FASTBOOT_MMC_USER_NAME ) ==0 ) {/* erase EMMC userdata */ if (fb_mmc_erase_mmc_hwpart (dev_desc))
Signature · 1 line
2.17.1
PATCH 1/4 fastboot: mmc: Add CONFIG_FASTBOOT_MMC_USER_SUPPORT
Hi Lukasz,
Quoted 23 lines
From: Patrick DELAUNAY <[email protected]>
Sent: mercredi 9 septembre 2020 15:23
To: u-boot at lists.denx.de
Cc: Patrick DELAUNAY <[email protected]>; Jagan Teki <[email protected]>; Kever Yang <[email protected]>; Mingming lee <[email protected]>; Miquel Raynal <[email protected]>; Peng Fan <[email protected]>; Simon Glass <[email protected]>; U-Boot STM32 <uboot-stm32@st-md- mailman.stormreply.com>
Subject: [PATCH 1/4] fastboot: mmc: AddCONFIG_FASTBOOT_MMC_USER_SUPPORT
Importance: HighSplit userdata and boot partition support for eMMC update and correct the description (update is supported).
The new configuration
CONFIG_FASTBOOT_MMC_USER_SUPPORTallows to activate support of userdata partition update, based on target name=CONFIG_FASTBOOT_MMC_USER_NAMEThis patch also removes the unnecessary dependency with
ARCH_MEDIATEKandEFI_PARTITION.
Quoted 8 lines
Signed-off-by Patrick Delaunay <[email protected]>---
configs/mt8518_ap1_emmc_defconfig | 1 + drivers/fastboot/Kconfig | 22 +++++++++++++++++----- drivers/fastboot/fb_mmc.c | 9 ++++++--- 3 files changed, 24 insertions(+), 8 deletions(-)
Gentle reminder,
Any comments on this serie [1]
[1] http://patchwork.ozlabs.org/project/uboot/list/?series=200509
Patrick
PATCH 1/4 fastboot: mmc: Add CONFIG_FASTBOOT_MMC_USER_SUPPORT
Hi Patrick,
Quoted 34 lines
Hi Lukasz,
Quoted 23 lines
From: Patrick DELAUNAY <[email protected]>
Sent: mercredi 9 septembre 2020 15:23
To: u-boot at lists.denx.de
Cc: Patrick DELAUNAY <[email protected]>; Jagan Teki <[email protected]>; Kever Yang <[email protected]>; Mingming lee <[email protected]>; Miquel Raynal <[email protected]>; Peng Fan <[email protected]>; Simon Glass <[email protected]>; U-Boot STM32 <uboot-stm32@st-md- mailman.stormreply.com> Subject: [PATCH 1/4] fastboot: mmc: AddCONFIG_FASTBOOT_MMC_USER_SUPPORT
Importance: HighSplit userdata and boot partition support for eMMC update and correct the description (update is supported).
The new configuration
CONFIG_FASTBOOT_MMC_USER_SUPPORTallows to activate support of userdata partition update, based on target name=CONFIG_FASTBOOT_MMC_USER_NAMEThis patch also removes the unnecessary dependency with
ARCH_MEDIATEKandEFI_PARTITION.Quoted 8 lines
Signed-off-by Patrick Delaunay <[email protected]>---
configs/mt8518_ap1_emmc_defconfig | 1 + drivers/fastboot/Kconfig | 22 +++++++++++++++++----- drivers/fastboot/fb_mmc.c | 9 ++++++--- 3 files changed, 24 insertions(+), 8 deletions(-)
Quoted 7 lines
Gentle reminder,
Any comments on this serie [1]
[1] http://patchwork.ozlabs.org/project/uboot/list/?series=200509
Patrick
Could you rebase this on top of current -master (after I do send the PR) and resend. There are now build / application errors on this series.
Thanks in advance and please find my apologize for very late reply (covid19 + personal matters).
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210123/03748a27/attachment.sig>
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/4 fastboot: mmc: Add CONFIG_FASTBOOT_MMC_USER_SUPPORT
Quoted 42 lines · Patrick DELAUNAY
From: Lukasz Majewski <[email protected]>
Sent: samedi 23 janvier 2021 13:16Hi Patrick,
Quoted 37 lines
Hi Lukasz,
Quoted 23 lines
From: Patrick DELAUNAY <[email protected]>
Sent: mercredi 9 septembre 2020 15:23
To: u-boot at lists.denx.de
Cc: Patrick DELAUNAY <[email protected]>; Jagan Teki <[email protected]>; Kever Yang <[email protected]>; Mingming lee <[email protected]>; Miquel Raynal <[email protected]>; Peng Fan <[email protected]>; Simon Glass <[email protected]>; U-Boot STM32 <uboot-stm32@st-md- mailman.stormreply.com> Subject: [PATCH 1/4] fastboot: mmc: AddCONFIG_FASTBOOT_MMC_USER_SUPPORT
Importance: HighSplit userdata and boot partition support for eMMC update and correct the description (update is supported).
The new configuration
CONFIG_FASTBOOT_MMC_USER_SUPPORTallows to activate support of userdata partition update, based on target name=CONFIG_FASTBOOT_MMC_USER_NAMEThis patch also removes the unnecessary dependency with
ARCH_MEDIATEKandEFI_PARTITION.Quoted 8 lines
Signed-off-by Patrick Delaunay <[email protected]>---
configs/mt8518_ap1_emmc_defconfig | 1 + drivers/fastboot/Kconfig | 22 +++++++++++++++++----- drivers/fastboot/fb_mmc.c | 9 ++++++--- 3 files changed, 24 insertions(+), 8 deletions(-)Gentle reminder,
Any comments on this serie [1]
Quoted 8 lines
Quoted 3 lines
[1] http://patchwork.ozlabs.org/project/uboot/list/?series=200509
Patrick
Could you rebase this on top of current -master (after I do send the PR) and resend. There are now build / application errors on this series.
Thanks in advance and please find my apologize for very late reply (covid19 + personal matters).
I wil rebase the serie.
And I understand and accept your apologies;
anyway the serie wasn't blocking for me.
Quoted 10 lines
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
Regards
PAtrick
PATCH 2/4 fastboot: mmc: extend flash/erase for both emmc hwpart 1 and 2
In reply to Patrick DelaunayUpdate the code and the configs for eMMC boot and userdata partitions acces
- FASTBOOT_MMC_BOOT_SUPPORT: boot partition 1 and 2 (erase/write)
- FASTBOOT_MMC_BOOT1_NAME: boot partition 1, default name="mmc0boot0"
- FASTBOOT_MMC_BOOT2_NAME: boot partition 2, default name="mmc0boot1"
This patch also removes the unnecessary dependency with ARCH_MEDIATEK and EFI_PARTITION.
---
configs/mt8518_ap1_emmc_defconfig | 2 +- drivers/fastboot/Kconfig | 26 ++++++++++++----- drivers/fastboot/fb_mmc.c | 47 ++++++++++++++++++++----------- 3 files changed, 50 insertions(+), 25 deletions(-)
configs/mt8518_ap1_emmc_defconfig +1 -1
@@ -24,7 +24,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x56000000 CONFIG_FASTBOOT_BUF_SIZE=0x1E00000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 -CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT=y +CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y CONFIG_FASTBOOT_MMC_USER_SUPPORT=y CONFIG_DM_MMC=y CONFIG_MMC_HS200_SUPPORT=y
drivers/fastboot/Kconfig +19 -7
@@ -104,18 +104,19 @@ config FASTBOOT_FLASH_NAND_TRIMFFS When flashing NAND enable the DROP_FFS flag to drop trailing all-0xff pages. -config FASTBOOT_MMC_BOOT1_SUPPORT - bool "Enable EMMC_BOOT1 flash/erase" - depends on FASTBOOT_FLASH_MMC && EFI_PARTITION && ARCH_MEDIATEK +config FASTBOOT_MMC_BOOT_SUPPORT + bool "Enable EMMC_BOOT flash/erase" + depends on FASTBOOT_FLASH_MMC help The fastboot "flash" and "erase" commands normally does operations - on EMMC userdata. Define this to enable the special commands to - flash/erase EMMC_BOOT1. - The default target name for updating EMMC_BOOT1 is "mmc0boot0". + on eMMC userdata. Define this to enable the special commands to + flash/erase eMMC boot partition. + The default target name for updating eMMC boot partition 1/2 is + CONFIG_FASTBOOT_MMC_BOOT1_NAME/CONFIG_FASTBOOT_MMC_BOOT2_NAME. config FASTBOOT_MMC_BOOT1_NAME string "Target name for updating EMMC_BOOT1" - depends on FASTBOOT_MMC_BOOT1_SUPPORT + depends on FASTBOOT_MMC_BOOT_SUPPORT default "mmc0boot0" help The fastboot "flash" and "erase" commands support operations on
@@ -124,6 +125,17 @@ config FASTBOOT_MMC_BOOT1_NAME defined here. The default target name for updating EMMC_BOOT1 is "mmc0boot0". +config FASTBOOT_MMC_BOOT2_NAME + string "Target name for updating EMMC_BOOT2" + depends on FASTBOOT_MMC_BOOT_SUPPORT + default "mmc0boot1" + help + The fastboot "flash" and "erase" commands support operations on + EMMC_BOOT2. This occurs when the specified "EMMC_BOOT2 name" on + the "fastboot flash" and "fastboot erase" commands match the value + defined here. + The default target name for updating EMMC_BOOT2 is "mmc0boot1". + config FASTBOOT_MMC_USER_SUPPORT bool "Enable eMMC userdata partition flash/erase" depends on FASTBOOT_FLASH_MMC
drivers/fastboot/fb_mmc.c +30 -17
94 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 3/4 fastboot: add command to select the default emmc hwpart for boot
In reply to Patrick DelaunayAdd fastboot command oem partconf which executes the command ``mmc partconf <id> <arg> 0`` on the current <id> mmc device to configure the eMMC boot partition with
<arg>: boot_ack boot_partition, so the command is:
$> fastboot oem partconf:<boot_ack> <boot_partition>
The partition_access argument is forced to 0 (userdata)
---
doc/android/fastboot.rst | 2 ++ drivers/fastboot/Kconfig | 7 +++++++ drivers/fastboot/fb_command.c | 36 +++++++++++++++++++++++++++++++++++ include/fastboot.h | 3 +++ 4 files changed, 48 insertions(+)
doc/android/fastboot.rst +2 -0
@@ -23,6 +23,8 @@ The current implementation supports the following standard commands: The following OEM commands are supported (if enabled): - ``oem format`` - this executes ``gpt write mmc %x $partitions`` +- ``oem partconf`` - this executes ``mmc partconf %x <arg> 0`` to configure eMMC + with <arg> = boot_ack boot_partition Support for both eMMC and NAND devices is included.
drivers/fastboot/Kconfig +7 -0
@@ -189,6 +189,13 @@ config FASTBOOT_CMD_OEM_FORMAT relies on the env variable partitions to contain the list of partitions as required by the gpt command. +config FASTBOOT_CMD_OEM_PARTCONF + bool "Enable the 'oem partconf' command" + depends on FASTBOOT_FLASH_MMC && SUPPORT_EMMC_BOOT + help + Add support for the "oem partconf" command from a client. This set + the mmc boot-partition for the selecting eMMC device. + endif # FASTBOOT endmenu
drivers/fastboot/fb_command.c +36 -0
@@ -40,6 +40,9 @@ static void reboot_bootloader(char *, char *);#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_FORMAT )static void oem_format (char *,char *);#endif +#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_PARTCONF ) +static void oem_partconf (char *,char *); +#endif static const struct { const char *command;
@@ -89,6 +92,12 @@ static const struct { .dispatch = oem_format, },#endif +#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_PARTCONF ) + [FASTBOOT_COMMAND_OEM_PARTCONF] = { + .command = "oem partconf", + .dispatch = oem_partconf, + }, +#endif };/**
@@ -336,3 +345,30 @@ static void oem_format(char *cmd_parameter, char *response) } }#endif + +#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_PARTCONF ) +/** +* oem_partconf() - Execute the OEM partconf command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void oem_partconf (char *cmd_parameter,char *response) +{ +char cmdbuf[32 ]; + +if (!cmd_parameter) { +fastboot_fail ("Expected command parameter" , response); +return ; + } + +/* execute 'mmc partconfg' command with cmd_parameter arguments*/ +snprintf (cmdbuf,sizeof (cmdbuf),"mmc partconf %x %s 0" , +CONFIG_FASTBOOT_FLASH_MMC_DEV , cmd_parameter); +printf ("Execute: %s\n" , cmdbuf); +if (run_command (cmdbuf,0 )) +fastboot_fail ("Cannot set oem partconf" , response); +else +fastboot_okay (NULL , response); +} +#endif
include/fastboot.h +3 -0
@@ -36,6 +36,9 @@ enum {#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_FORMAT ) FASTBOOT_COMMAND_OEM_FORMAT,#endif +#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_PARTCONF ) +FASTBOOT_COMMAND_OEM_PARTCONF , +#endifFASTBOOT_COMMAND_COUNT };
Signature · 1 line
2.17.1
PATCH 4/4 fastboot: add command to select the eMMC boot configuration
In reply to Patrick DelaunayAdd command oem bootbus which executes the command ``mmc bootbus <id> <arg>`` on the current fastboot mmc device (<i> = CONFIG_FASTBOOT_FLASH_MMC_DEV) to set the eMMC boot configuration on first update, with
<arg> = boot_bus_width reset_boot_bus_width boot_mode
$> fastboot oem bootbus:<boot_bus_width> <reset_boot_bus_width> <boot_mode>
---
doc/android/fastboot.rst | 1 + drivers/fastboot/Kconfig | 7 +++++++ drivers/fastboot/fb_command.c | 36 +++++++++++++++++++++++++++++++++++ include/fastboot.h | 3 +++ 4 files changed, 47 insertions(+)
doc/android/fastboot.rst +1 -0
@@ -25,6 +25,7 @@ The following OEM commands are supported (if enabled): - ``oem format`` - this executes ``gpt write mmc %x $partitions`` - ``oem partconf`` - this executes ``mmc partconf %x <arg> 0`` to configure eMMC with <arg> = boot_ack boot_partition +- ``oem bootbus`` - this executes ``mmc bootbus %x %s`` to configure eMMC Support for both eMMC and NAND devices is included.
drivers/fastboot/Kconfig +7 -0
@@ -196,6 +196,13 @@ config FASTBOOT_CMD_OEM_PARTCONF Add support for the "oem partconf" command from a client. This set the mmc boot-partition for the selecting eMMC device. +config FASTBOOT_CMD_OEM_BOOTBUS + bool "Enable the 'oem bootbus' command" + depends on FASTBOOT_FLASH_MMC && SUPPORT_EMMC_BOOT + help + Add support for the "oem bootbus" command from a client. This set + the mmc boot configuration for the selecting eMMC device. + endif # FASTBOOT endmenu
drivers/fastboot/fb_command.c +36 -0
@@ -43,6 +43,9 @@ static void oem_format(char *, char *);#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_PARTCONF )static void oem_partconf (char *,char *);#endif +#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_BOOTBUS ) +static void oem_bootbus (char *,char *); +#endif static const struct { const char *command;
@@ -98,6 +101,12 @@ static const struct { .dispatch = oem_partconf, },#endif +#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_BOOTBUS ) + [FASTBOOT_COMMAND_OEM_BOOTBUS] = { + .command = "oem bootbus", + .dispatch = oem_bootbus, + }, +#endif };/**
@@ -372,3 +381,30 @@ static void oem_partconf(char *cmd_parameter, char *response) fastboot_okay(NULL, response); }#endif + +#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_BOOTBUS ) +/** +* oem_bootbus() - Execute the OEM bootbus command +* +* @cmd_parameter: Pointer to command parameter +* @response: Pointer to fastboot response buffer +*/ +static void oem_bootbus (char *cmd_parameter,char *response) +{ +char cmdbuf[32 ]; + +if (!cmd_parameter) { +fastboot_fail ("Expected command parameter" , response); +return ; + } + +/* execute 'mmc bootbus' command with cmd_parameter arguments*/ +snprintf (cmdbuf,sizeof (cmdbuf),"mmc bootbus %x %s" , +CONFIG_FASTBOOT_FLASH_MMC_DEV , cmd_parameter); +printf ("Execute: %s\n" , cmdbuf); +if (run_command (cmdbuf,0 )) +fastboot_fail ("Cannot set oem bootbus" , response); +else +fastboot_okay (NULL , response); +} +#endif
include/fastboot.h +3 -0
@@ -39,6 +39,9 @@ enum {#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_PARTCONF ) FASTBOOT_COMMAND_OEM_PARTCONF,#endif +#if CONFIG_IS_ENABLED (FASTBOOT_CMD_OEM_BOOTBUS ) +FASTBOOT_COMMAND_OEM_BOOTBUS , +#endifFASTBOOT_COMMAND_COUNT };
Signature · 1 line
2.17.1