Recover the leading underline of "androidboot.slot_suffix" cmdline

The androidboot.slot_suffix kernel cmdline will be used to constitute
the full name of some partitions(like vendor partition), removing the
leading underline will cause these partitions mount failed.

Bug: 65174205

Change-Id: Icda99b51af75633b62c1950e44b5c27f02370ea4
Signed-off-by: ji.luo <ji.luo@nxp.com>

diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 63ff415..02f29d9 100644 (file)
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -1559,7 +1559,7 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
                /*
                char bootargs_sec[2048];
                sprintf(bootargs_sec, "androidboot.slot_suffix=%s %s",
-                       (avb_out_data->ab_suffix + sizeof(char)), avb_out_data->cmdline);
+                       avb_out_data->ab_suffix, avb_out_data->cmdline);
                setenv("bootargs_sec", bootargs_sec);
                */
 #ifdef CONFIG_SYSTEM_RAMDISK_SUPPORT
@@ -1609,7 +1609,7 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
                        goto fail;
                }
                char bootargs_sec[ANDR_BOOT_ARGS_SIZE];
-               sprintf(bootargs_sec, "androidboot.slot_suffix=%s", (slot + sizeof(char)));
+               sprintf(bootargs_sec, "androidboot.slot_suffix=%s", slot);
                setenv("bootargs_sec", bootargs_sec);
 #ifdef CONFIG_SYSTEM_RAMDISK_SUPPORT
                if(!is_recovery_mode)