[U-Boot] [PATCH v2] usb: CONFIG_USB_FASTBOOT prefix replacement for consistency

Lukasz Majewski
2015-07-20T12:57:19Z

Hi Paul,

> FASTBOOT is defined both by CONFIG_USB_FUNCTION_FASTBOOT AND
> CONFIG_CMD_FASTBOOT, so it doesn't make much sense to have a
> CONFIG_USB_FASTBOOT prefix for fastboot-specific options, especially
> given that other config options for fastboot use the CONFIG_FASTBOOT
> prefix.
>
> This replaces the CONFIG_USB_FASTBOOT prefix with CONFIG_FASTBOOT,
> for consistency.

Applied to u-boot-dfu tree.

Thanks for your patch!

>
> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
> ---
> README | 4 ++--
> doc/README.android-fastboot | 4 ++--
> drivers/usb/gadget/f_fastboot.c | 8 ++++----
> include/configs/am335x_evm.h | 4 ++--
> include/configs/bav335x.h | 4 ++--
> include/configs/bcm28155_ap.h | 4 ++--
> include/configs/dra7xx_evm.h | 4 ++--
> include/configs/nitrogen6x.h | 4 ++--
> include/configs/omap3_beagle.h | 4 ++--
> 9 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/README b/README
> index f7a55fc..7a131f3 100644
> --- a/README
> +++ b/README
> @@ -1732,12 +1732,12 @@ The following options need to be configured:
> This enables support for booting images which use
> the Android image format header.
>
> - CONFIG_USB_FASTBOOT_BUF_ADDR
> + CONFIG_FASTBOOT_BUF_ADDR
> The fastboot protocol requires a large memory buffer
> for downloads. Define this to the starting RAM address to use for
> downloaded images.
>
> - CONFIG_USB_FASTBOOT_BUF_SIZE
> + CONFIG_FASTBOOT_BUF_SIZE
> The fastboot protocol requires a large memory buffer
> for downloads. This buffer should be as large as possible for a
> platform. Define this to the size available RAM for
> fastboot. diff --git a/doc/README.android-fastboot
> b/doc/README.android-fastboot index 92f2897..ce12bc5 100644
> --- a/doc/README.android-fastboot
> +++ b/doc/README.android-fastboot
> @@ -47,8 +47,8 @@ CONFIG_CMD_FASTBOOT and CONFIG_ANDROID_BOOT_IMAGE.
>
> The fastboot protocol requires a large memory buffer for downloads.
> This buffer should be as large as possible for a platform. The
> location of the -buffer and size are set with
> CONFIG_USB_FASTBOOT_BUF_ADDR and -CONFIG_USB_FASTBOOT_BUF_SIZE.
> +buffer and size are set with CONFIG_FASTBOOT_BUF_ADDR and
> +CONFIG_FASTBOOT_BUF_SIZE.
>
> Fastboot partition aliases can also be defined for devices where GPT
> limitations prevent user-friendly partition names such as "boot",
> "system" diff --git a/drivers/usb/gadget/f_fastboot.c
> b/drivers/usb/gadget/f_fastboot.c index 60c846d..ca01a01 100644
> --- a/drivers/usb/gadget/f_fastboot.c
> +++ b/drivers/usb/gadget/f_fastboot.c
> @@ -380,7 +380,7 @@ static void cb_getvar(struct usb_ep *ep, struct
> usb_request *req) !strcmp_l1("max-download-size", cmd)) {
> char str_num[12];
>
> - sprintf(str_num, "0x%08x",
> CONFIG_USB_FASTBOOT_BUF_SIZE);
> + sprintf(str_num, "0x%08x", CONFIG_FASTBOOT_BUF_SIZE);
> strncat(response, str_num, chars_left);
> } else if (!strcmp_l1("serialno", cmd)) {
> s = getenv("serial#");
> @@ -430,7 +430,7 @@ static void rx_handler_dl_image(struct usb_ep
> *ep, struct usb_request *req) if (buffer_size < transfer_size)
> transfer_size = buffer_size;
>
> - memcpy((void *)CONFIG_USB_FASTBOOT_BUF_ADDR + download_bytes,
> + memcpy((void *)CONFIG_FASTBOOT_BUF_ADDR + download_bytes,
> buffer, transfer_size);
>
> pre_dot_num = download_bytes / BYTES_PER_DOT;
> @@ -483,7 +483,7 @@ static void cb_download(struct usb_ep *ep, struct
> usb_request *req)
> if (0 == download_size) {
> sprintf(response, "FAILdata invalid size");
> - } else if (download_size > CONFIG_USB_FASTBOOT_BUF_SIZE) {
> + } else if (download_size > CONFIG_FASTBOOT_BUF_SIZE) {
> download_size = 0;
> sprintf(response, "FAILdata too large");
> } else {
> @@ -544,7 +544,7 @@ static void cb_flash(struct usb_ep *ep, struct
> usb_request *req)
> strcpy(response, "FAILno flash device defined");
> #ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV
> - fb_mmc_flash_write(cmd, (void *)CONFIG_USB_FASTBOOT_BUF_ADDR,
> + fb_mmc_flash_write(cmd, (void *)CONFIG_FASTBOOT_BUF_ADDR,
> download_bytes, response);
> #endif
> fastboot_tx_write_str(response);
> diff --git a/include/configs/am335x_evm.h
> b/include/configs/am335x_evm.h index 1425b6d..d85a635 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h
> @@ -301,8 +301,8 @@
> #define CONFIG_USB_FUNCTION_FASTBOOT
> #define CONFIG_CMD_FASTBOOT
> #define CONFIG_ANDROID_BOOT_IMAGE
> -#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
> -#define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000
> +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
> +#define CONFIG_FASTBOOT_BUF_SIZE 0x07000000
>
> /* To support eMMC booting */
> #define CONFIG_STORAGE_EMMC
> diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
> index 99e3a00..108efaf 100644
> --- a/include/configs/bav335x.h
> +++ b/include/configs/bav335x.h
> @@ -458,8 +458,8 @@ DEFAULT_LINUX_BOOT_ENV \
> #define CONFIG_USB_FUNCTION_FASTBOOT
> #define CONFIG_CMD_FASTBOOT
> #define CONFIG_ANDROID_BOOT_IMAGE
> -#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
> -#define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000
> +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
> +#define CONFIG_FASTBOOT_BUF_SIZE 0x07000000
>
> /* To support eMMC booting */
> #define CONFIG_STORAGE_EMMC
> diff --git a/include/configs/bcm28155_ap.h
> b/include/configs/bcm28155_ap.h index f023f27..c6ef0d1 100644
> --- a/include/configs/bcm28155_ap.h
> +++ b/include/configs/bcm28155_ap.h
> @@ -143,8 +143,8 @@
> #define CONFIG_FASTBOOT_FLASH
> #define CONFIG_FASTBOOT_FLASH_MMC_DEV 0
> #define CONFIG_SYS_CACHELINE_SIZE 64
> -#define CONFIG_USB_FASTBOOT_BUF_SIZE (CONFIG_SYS_SDRAM_SIZE -
> SZ_1M) -#define CONFIG_USB_FASTBOOT_BUF_ADDR
> CONFIG_SYS_SDRAM_BASE +#define CONFIG_FASTBOOT_BUF_SIZE
> (CONFIG_SYS_SDRAM_SIZE - SZ_1M) +#define
> CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_SDRAM_BASE #define
> CONFIG_USB_GADGET #define CONFIG_USB_GADGET_DUALSPEED
> #define CONFIG_USB_GADGET_VBUS_DRAW 0
> diff --git a/include/configs/dra7xx_evm.h
> b/include/configs/dra7xx_evm.h index db15cad..456f3c7 100644
> --- a/include/configs/dra7xx_evm.h
> +++ b/include/configs/dra7xx_evm.h
> @@ -93,8 +93,8 @@
> #define CONFIG_USB_FUNCTION_FASTBOOT
> #define CONFIG_CMD_FASTBOOT
> #define CONFIG_ANDROID_BOOT_IMAGE
> -#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
> -#define CONFIG_USB_FASTBOOT_BUF_SIZE 0x2F000000
> +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
> +#define CONFIG_FASTBOOT_BUF_SIZE 0x2F000000
> #define CONFIG_FASTBOOT_FLASH
> #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1
> #endif
> diff --git a/include/configs/nitrogen6x.h
> b/include/configs/nitrogen6x.h index 191c0dd..d01a75b 100644
> --- a/include/configs/nitrogen6x.h
> +++ b/include/configs/nitrogen6x.h
> @@ -350,7 +350,7 @@
> #define CONFIG_USB_FUNCTION_FASTBOOT
> #define CONFIG_CMD_FASTBOOT
> #define CONFIG_ANDROID_BOOT_IMAGE
> -#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
> -#define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000
> +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
> +#define CONFIG_FASTBOOT_BUF_SIZE 0x07000000
>
> #endif /* __CONFIG_H */
> diff --git a/include/configs/omap3_beagle.h
> b/include/configs/omap3_beagle.h index 9089876..4d7f355 100644
> --- a/include/configs/omap3_beagle.h
> +++ b/include/configs/omap3_beagle.h
> @@ -75,8 +75,8 @@
> #define CONFIG_USB_FUNCTION_FASTBOOT
> #define CONFIG_CMD_FASTBOOT
> #define CONFIG_ANDROID_BOOT_IMAGE
> -#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
> -#define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000
> +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
> +#define CONFIG_FASTBOOT_BUF_SIZE 0x07000000
>
> /* USB EHCI */
> #define CONFIG_CMD_USB

--
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group