V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

usb: CONFIG_USB_FASTBOOT prefix replacement for consistency 

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.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
This commit is contained in:
Paul Kocialkowski 2015-07-20 12:38:22 +02:00 committed by Marek Vasut
parent d00bf78121
commit a588d99ac1
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -1730,12 +1730,12 @@ The following options need to be configured:
This enables support for booting images which use the Android This enables support for booting images which use the Android
image format header. image format header.
CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_FASTBOOT_BUF_ADDR
The fastboot protocol requires a large memory buffer for The fastboot protocol requires a large memory buffer for
downloads. Define this to the starting RAM address to use for downloads. Define this to the starting RAM address to use for
downloaded images. downloaded images.
CONFIG_USB_FASTBOOT_BUF_SIZE CONFIG_FASTBOOT_BUF_SIZE
The fastboot protocol requires a large memory buffer for The fastboot protocol requires a large memory buffer for
downloads. This buffer should be as large as possible for a downloads. This buffer should be as large as possible for a
platform. Define this to the size available RAM for fastboot. platform. Define this to the size available RAM for fastboot.

4
doc/README.android-fastboot
View File

@ -47,8 +47,8 @@ CONFIG_CMD_FASTBOOT and CONFIG_ANDROID_BOOT_IMAGE.
The fastboot protocol requires a large memory buffer for downloads. This 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 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 buffer and size are set with CONFIG_FASTBOOT_BUF_ADDR and
CONFIG_USB_FASTBOOT_BUF_SIZE. CONFIG_FASTBOOT_BUF_SIZE.
Fastboot partition aliases can also be defined for devices where GPT Fastboot partition aliases can also be defined for devices where GPT
limitations prevent user-friendly partition names such as "boot", "system" limitations prevent user-friendly partition names such as "boot", "system"

8
drivers/usb/gadget/f_fastboot.c
View File

@ -380,7 +380,7 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req)
!strcmp_l1("max-download-size", cmd)) { !strcmp_l1("max-download-size", cmd)) {
char str_num[12]; 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); strncat(response, str_num, chars_left);
} else if (!strcmp_l1("serialno", cmd)) { } else if (!strcmp_l1("serialno", cmd)) {
s = getenv("serial#"); 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) if (buffer_size < transfer_size)
transfer_size = buffer_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); buffer, transfer_size);
pre_dot_num = download_bytes / BYTES_PER_DOT; 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) { if (0 == download_size) {
sprintf(response, "FAILdata invalid 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; download_size = 0;
sprintf(response, "FAILdata too large"); sprintf(response, "FAILdata too large");
} else { } else {
@ -544,7 +544,7 @@ static void cb_flash(struct usb_ep *ep, struct usb_request *req)
strcpy(response, "FAILno flash device defined"); strcpy(response, "FAILno flash device defined");
#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV #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); download_bytes, response);
#endif #endif
fastboot_tx_write_str(response); fastboot_tx_write_str(response);

4
include/configs/am335x_evm.h
View File

@ -301,8 +301,8 @@
#define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_USB_FUNCTION_FASTBOOT
#define CONFIG_CMD_FASTBOOT #define CONFIG_CMD_FASTBOOT
#define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_ANDROID_BOOT_IMAGE
#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000 #define CONFIG_FASTBOOT_BUF_SIZE 0x07000000
/* To support eMMC booting */ /* To support eMMC booting */
#define CONFIG_STORAGE_EMMC #define CONFIG_STORAGE_EMMC

4
include/configs/bav335x.h
View File

@ -458,8 +458,8 @@ DEFAULT_LINUX_BOOT_ENV \
#define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_USB_FUNCTION_FASTBOOT
#define CONFIG_CMD_FASTBOOT #define CONFIG_CMD_FASTBOOT
#define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_ANDROID_BOOT_IMAGE
#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000 #define CONFIG_FASTBOOT_BUF_SIZE 0x07000000
/* To support eMMC booting */ /* To support eMMC booting */
#define CONFIG_STORAGE_EMMC #define CONFIG_STORAGE_EMMC

4
include/configs/bcm28155_ap.h
View File

@ -140,8 +140,8 @@
#define CONFIG_FASTBOOT_FLASH #define CONFIG_FASTBOOT_FLASH
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 #define CONFIG_FASTBOOT_FLASH_MMC_DEV 0
#define CONFIG_SYS_CACHELINE_SIZE 64 #define CONFIG_SYS_CACHELINE_SIZE 64
#define CONFIG_USB_FASTBOOT_BUF_SIZE (CONFIG_SYS_SDRAM_SIZE - SZ_1M) #define CONFIG_FASTBOOT_BUF_SIZE (CONFIG_SYS_SDRAM_SIZE - SZ_1M)
#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_SDRAM_BASE #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_SDRAM_BASE
#define CONFIG_USB_GADGET #define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_VBUS_DRAW 0 #define CONFIG_USB_GADGET_VBUS_DRAW 0

4
include/configs/dra7xx_evm.h
View File

@ -92,8 +92,8 @@
#define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_USB_FUNCTION_FASTBOOT
#define CONFIG_CMD_FASTBOOT #define CONFIG_CMD_FASTBOOT
#define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_ANDROID_BOOT_IMAGE
#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_USB_FASTBOOT_BUF_SIZE 0x2F000000 #define CONFIG_FASTBOOT_BUF_SIZE 0x2F000000
#define CONFIG_FASTBOOT_FLASH #define CONFIG_FASTBOOT_FLASH
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1
#endif #endif

4
include/configs/nitrogen6x.h
View File

@ -349,7 +349,7 @@
#define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_USB_FUNCTION_FASTBOOT
#define CONFIG_CMD_FASTBOOT #define CONFIG_CMD_FASTBOOT
#define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_ANDROID_BOOT_IMAGE
#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000 #define CONFIG_FASTBOOT_BUF_SIZE 0x07000000
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

4
include/configs/omap3_beagle.h
View File

@ -75,8 +75,8 @@
#define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_USB_FUNCTION_FASTBOOT
#define CONFIG_CMD_FASTBOOT #define CONFIG_CMD_FASTBOOT
#define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_ANDROID_BOOT_IMAGE
#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
#define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000 #define CONFIG_FASTBOOT_BUF_SIZE 0x07000000
/* USB EHCI */ /* USB EHCI */
#define CONFIG_CMD_USB #define CONFIG_CMD_USB