[U-Boot] [PATCH v5 10/16] fastboot: Rename public fb_ functions to fastboot_
Alex Kiernan
alex.kiernan at gmail.com
Thu May 17 15:59:23 UTC 2018
Rename fb_mmc_flash_write/fb_mmc_erase/fb_nand_flash_write/fb_nand_erase to
fastboot_... as they form a public interface
Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
---
Changes in v5:
- new
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/fastboot/fb_mmc.c | 6 +++---
drivers/fastboot/fb_nand.c | 6 +++---
drivers/usb/gadget/f_fastboot.c | 12 ++++++------
include/fb_mmc.h | 6 +++---
include/fb_nand.h | 6 +++---
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 038905f..6bb4b87 100644
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -251,8 +251,8 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,
}
#endif
-void fb_mmc_flash_write(const char *cmd, void *download_buffer,
- unsigned int download_bytes, char *response)
+void fastboot_mmc_flash_write(const char *cmd, void *download_buffer,
+ unsigned int download_bytes, char *response)
{
struct blk_desc *dev_desc;
disk_partition_t info;
@@ -349,7 +349,7 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
}
}
-void fb_mmc_erase(const char *cmd, char *response)
+void fastboot_mmc_erase(const char *cmd, char *response)
{
int ret;
struct blk_desc *dev_desc;
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index 849a6f1..28059b0 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -145,8 +145,8 @@ static lbaint_t fb_nand_sparse_reserve(struct sparse_storage *info,
return blkcnt + bad_blocks;
}
-void fb_nand_flash_write(const char *cmd, void *download_buffer,
- unsigned int download_bytes, char *response)
+void fastboot_nand_flash_write(const char *cmd, void *download_buffer,
+ unsigned int download_bytes, char *response)
{
struct part_info *part;
struct mtd_info *mtd = NULL;
@@ -204,7 +204,7 @@ void fb_nand_flash_write(const char *cmd, void *download_buffer,
fastboot_okay(NULL, response);
}
-void fb_nand_erase(const char *cmd, char *response)
+void fastboot_nand_erase(const char *cmd, char *response)
{
struct part_info *part;
struct mtd_info *mtd = NULL;
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 25784a1..07d6a62 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -577,12 +577,12 @@ static void cb_flash(struct usb_ep *ep, struct usb_request *req)
fastboot_fail("no flash device defined", response);
#ifdef CONFIG_FASTBOOT_FLASH_MMC
- fb_mmc_flash_write(cmd, (void *)CONFIG_FASTBOOT_BUF_ADDR,
- download_bytes, response);
+ fastboot_mmc_flash_write(cmd, (void *)CONFIG_FASTBOOT_BUF_ADDR,
+ download_bytes, response);
#endif
#ifdef CONFIG_FASTBOOT_FLASH_NAND
- fb_nand_flash_write(cmd, (void *)CONFIG_FASTBOOT_BUF_ADDR,
- download_bytes, response);
+ fastboot_nand_flash_write(cmd, (void *)CONFIG_FASTBOOT_BUF_ADDR,
+ download_bytes, response);
#endif
fastboot_tx_write_str(response);
}
@@ -625,10 +625,10 @@ static void cb_erase(struct usb_ep *ep, struct usb_request *req)
fastboot_fail("no flash device defined", response);
#ifdef CONFIG_FASTBOOT_FLASH_MMC
- fb_mmc_erase(cmd, response);
+ fastboot_mmc_erase(cmd, response);
#endif
#ifdef CONFIG_FASTBOOT_FLASH_NAND
- fb_nand_erase(cmd, response);
+ fastboot_nand_erase(cmd, response);
#endif
fastboot_tx_write_str(response);
}
diff --git a/include/fb_mmc.h b/include/fb_mmc.h
index 39a960c..5243dd5 100644
--- a/include/fb_mmc.h
+++ b/include/fb_mmc.h
@@ -3,6 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/
-void fb_mmc_flash_write(const char *cmd, void *download_buffer,
- unsigned int download_bytes, char *response);
-void fb_mmc_erase(const char *cmd, char *response);
+void fastboot_mmc_flash_write(const char *cmd, void *download_buffer,
+ unsigned int download_bytes, char *response);
+void fastboot_mmc_erase(const char *cmd, char *response);
diff --git a/include/fb_nand.h b/include/fb_nand.h
index 2c92a4e..bc34074 100644
--- a/include/fb_nand.h
+++ b/include/fb_nand.h
@@ -4,6 +4,6 @@
* Copyright 2015 Free Electrons.
*/
-void fb_nand_flash_write(const char *cmd, void *download_buffer,
- unsigned int download_bytes, char *response);
-void fb_nand_erase(const char *cmd, char *response);
+void fastboot_nand_flash_write(const char *cmd, void *download_buffer,
+ unsigned int download_bytes, char *response);
+void fastboot_nand_erase(const char *cmd, char *response);
--
2.7.4
More information about the U-Boot
mailing list