usb: CONFIG_USB_FASTBOOT prefix replacement for consistency

PATCH Superseded Paul Kocialkowski 4 participants 9 messages Jul 20, 2015 – Jul 25, 2015

Subsystems (3)

USB Broadcom BCM2711/BCM2835 Arm architecture Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture

lore

Share & tools

lore

Paul Kocialkowski

author

2015-07-20 10:38 UTC #0 lore raw

PATCH v2 1/1 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 <[email protected]>

---
 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(-)

README +2 -2

index f7a55fc..7a131f3 100644
@@ -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.

doc/README.android-fastboot +2 -2

index 92f2897..ce12bc5 100644
@@ -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"

drivers/usb/gadget/f_fastboot.c +4 -4

index 60c846d..ca01a01 100644
@@ -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);

include/configs/am335x_evm.h +2 -2

index 1425b6d..d85a635 100644
@@ -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

include/configs/bav335x.h +2 -2

index 99e3a00..108efaf 100644
@@ -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

include/configs/bcm28155_ap.h +2 -2

index f023f27..c6ef0d1 100644
@@ -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

include/configs/dra7xx_evm.h +2 -2

index db15cad..456f3c7 100644
@@ -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

include/configs/nitrogen6x.h +2 -2

index 191c0dd..d01a75b 100644
@@ -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 */

include/configs/omap3_beagle.h +2 -2

index 9089876..4d7f355 100644
@@ -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

Signature · 1 line

1.9.1

Lukasz Majewski

2015-07-20 12:57 UTC #1 lore raw

PATCH v2 1/1 usb: CONFIG_USB_FASTBOOT prefix replacement for consistency

Hi Paul,

Quoted 8 lines

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!

Quoted 178 lines

Signed-off-by Paul Kocialkowski <[email protected]>

---
 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(-)

README +0 -0

index f7a55fc..7a131f3 100644
@@ -1732,12 +1732,12 @@ The following options need to be configured:
 		This enables support for booting images which use

the Android image format header.

README +1 -1

-		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

README +1 -1

 		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

doc/README.android-fastboot +0 -0

@@ -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.

doc/README.android-fastboot +2 -0

+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

drivers/usb/gadget/f_fastboot.c +1 -1

@@ -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)) {

drivers/usb/gadget/f_fastboot.c +3 -3

 		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);

(quoted diff) +0 -0

b/include/configs/am335x_evm.h index 1425b6d..d85a635 100644

include/configs/am335x_evm.h +2 -2

@@ -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

include/configs/bav335x.h +2 -2

index 99e3a00..108efaf 100644
@@ -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

(quoted diff) +0 -0

b/include/configs/bcm28155_ap.h index f023f27..c6ef0d1 100644

include/configs/bcm28155_ap.h +0 -1

@@ -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

(quoted diff) +0 -0

b/include/configs/dra7xx_evm.h index db15cad..456f3c7 100644

include/configs/dra7xx_evm.h +2 -2

@@ -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

(quoted diff) +0 -0

b/include/configs/nitrogen6x.h index 191c0dd..d01a75b 100644

include/configs/nitrogen6x.h +2 -2

@@ -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 */

(quoted diff) +0 -0

b/include/configs/omap3_beagle.h index 9089876..4d7f355 100644

include/configs/omap3_beagle.h +2 -2

@@ -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

Signature · 5 lines

Best regards,

Lukasz Majewski

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

Paul Kocialkowski

author

2015-07-22 08:20 UTC #2 lore raw

PATCH v2 1/1 usb: CONFIG_USB_FASTBOOT prefix replacement for consistency

Le lundi 20 juillet 2015 ? 14:57 +0200, Lukasz Majewski a ?crit :

Quoted 8 lines

Hi Paul,
Quoted 6 lines
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.

Quoted 6 lines

Quoted 2 lines
This replaces the CONFIG_USB_FASTBOOT prefix with CONFIG_FASTBOOT, for consistency.
Applied to u-boot-dfu tree.
Thanks for your patch!

Thanks for merging all those. Perhaps it's time to submit a pull request? I need those patches merged to get some other things accepted.

Thanks!

Quoted 175 lines

Signed-off-by Paul Kocialkowski <[email protected]>

---
 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(-)

README +0 -0

index f7a55fc..7a131f3 100644
@@ -1732,12 +1732,12 @@ The following options need to be configured:
 		This enables support for booting images which use

the Android image format header.

README +1 -1

-		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

README +1 -1

 		downloaded images.
 
-		CONFIG_USB_FASTBOOT_BUF_SIZE
+		CONFIG_FASTBOOT_BUF_SIZE
 		The fastboot protocol requires a large memory buffer

doc/README.android-fastboot +0 -0

@@ -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.

doc/README.android-fastboot +2 -0

+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

drivers/usb/gadget/f_fastboot.c +1 -1

@@ -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)) {

drivers/usb/gadget/f_fastboot.c +3 -3

 		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);

(quoted diff) +0 -0

b/include/configs/am335x_evm.h index 1425b6d..d85a635 100644

include/configs/am335x_evm.h +2 -2

@@ -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

include/configs/bav335x.h +2 -2

index 99e3a00..108efaf 100644
@@ -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

(quoted diff) +0 -0

b/include/configs/bcm28155_ap.h index f023f27..c6ef0d1 100644

include/configs/bcm28155_ap.h +0 -1

@@ -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 -

(quoted diff) +0 -0

b/include/configs/dra7xx_evm.h index db15cad..456f3c7 100644

include/configs/dra7xx_evm.h +2 -2

@@ -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

(quoted diff) +0 -0

b/include/configs/nitrogen6x.h index 191c0dd..d01a75b 100644

include/configs/nitrogen6x.h +2 -2

@@ -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 */

(quoted diff) +0 -0

b/include/configs/omap3_beagle.h index 9089876..4d7f355 100644

include/configs/omap3_beagle.h +2 -2

@@ -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

Quoted 5 lines

include/configs/omap3_beagle.h line 82
Quoted 2 lines
include/configs/omap3_beagle.h +0 -0
 /* USB EHCI */
 #define CONFIG_CMD_USB

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150722/171ba71e/attachment.sig>

Lukasz Majewski

2015-07-23 07:15 UTC #3 lore raw

PATCH v2 1/1 usb: CONFIG_USB_FASTBOOT prefix replacement for consistency

Hi Paul,

Quoted 12 lines

Le lundi 20 juillet 2015 ? 14:57 +0200, Lukasz Majewski a ?crit :
Quoted 11 lines
Hi Paul,
Quoted 8 lines
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.

Quoted 7 lines

Quoted 3 lines
Applied to u-boot-dfu tree.
Thanks for your patch!
Thanks for merging all those. Perhaps it's time to submit a pull request? I need those patches merged to get some other things accepted.

Could you check if all your posted patches are available in Marek's Vasut tree (u-boot-usb)?

It seems like they all are there.

Quoted 187 lines

Thanks!

Quoted 183 lines

Quoted 180 lines

Signed-off-by Paul Kocialkowski <[email protected]>

---
 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(-)

README +0 -0

index f7a55fc..7a131f3 100644
@@ -1732,12 +1732,12 @@ The following options need to be

configured: This enables support for booting images which use the Android image format header.

README +1 -1

-		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.

README +1 -1

-		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

doc/README.android-fastboot +0 -0

@@ -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.

doc/README.android-fastboot +2 -0

+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

drivers/usb/gadget/f_fastboot.c +1 -1

@@ -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)) {

drivers/usb/gadget/f_fastboot.c +1 -1

 		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);

drivers/usb/gadget/f_fastboot.c +1 -1

 	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");

drivers/usb/gadget/f_fastboot.c +1 -1

 	} 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

drivers/usb/gadget/f_fastboot.c +0 -0

 	fastboot_tx_write_str(response);

(quoted diff) +0 -0

b/include/configs/am335x_evm.h index 1425b6d..d85a635 100644

include/configs/am335x_evm.h +2 -2

@@ -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

include/configs/bav335x.h +2 -2

index 99e3a00..108efaf 100644
@@ -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

(quoted diff) +0 -0

b/include/configs/bcm28155_ap.h index f023f27..c6ef0d1 100644

include/configs/bcm28155_ap.h +0 -1

@@ -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

(quoted diff) +0 -0

b/include/configs/dra7xx_evm.h index db15cad..456f3c7 100644

include/configs/dra7xx_evm.h +2 -2

@@ -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

(quoted diff) +0 -0

b/include/configs/nitrogen6x.h index 191c0dd..d01a75b 100644

include/configs/nitrogen6x.h +2 -2

@@ -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 */

(quoted diff) +0 -0

b/include/configs/omap3_beagle.h index 9089876..4d7f355 100644

include/configs/omap3_beagle.h +2 -2

@@ -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

Signature · 5 lines

Best regards,

Lukasz Majewski

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

Paul Kocialkowski

author

2015-07-24 17:24 UTC #4 lore raw

PATCH v2 1/1 usb: CONFIG_USB_FASTBOOT prefix replacement for consistency

Le jeudi 23 juillet 2015 ? 09:15 +0200, Lukasz Majewski a ?crit :

Quoted 18 lines

Hi Paul,
Quoted 16 lines
Le lundi 20 juillet 2015 ? 14:57 +0200, Lukasz Majewski a ?crit :
Quoted 14 lines
Hi Paul,
Quoted 8 lines
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!

Quoted 8 lines

Quoted 3 lines
Thanks for merging all those. Perhaps it's time to submit a pull request? I need those patches merged to get some other things accepted.
Could you check if all your posted patches are available in Marek's Vasut tree (u-boot-usb)?
It seems like they all are there.

That's right, but it looks like your tree has some more commits on top.

Either way, I would be happy with seeing my patches getting merged, either from Marek's tree or from yours.

Quoted 180 lines

Thanks!

Quoted 178 lines

Signed-off-by Paul Kocialkowski <[email protected]>

---
 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(-)

README +0 -0

index f7a55fc..7a131f3 100644
@@ -1732,12 +1732,12 @@ The following options need to be

configured: This enables support for booting images which use the Android image format header.

README +1 -1

-		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.

README +1 -1

-		CONFIG_USB_FASTBOOT_BUF_SIZE
+		CONFIG_FASTBOOT_BUF_SIZE
 		The fastboot protocol requires a large memory

doc/README.android-fastboot +0 -0

@@ -47,8 +47,8 @@ CONFIG_CMD_FASTBOOT and

doc/README.android-fastboot +2 -0

+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

drivers/usb/gadget/f_fastboot.c +1 -1

@@ -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)) {

drivers/usb/gadget/f_fastboot.c +1 -1

 		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);

drivers/usb/gadget/f_fastboot.c +1 -1

 	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");

drivers/usb/gadget/f_fastboot.c +1 -1

 	} 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

drivers/usb/gadget/f_fastboot.c +0 -0

 	fastboot_tx_write_str(response);

(quoted diff) +0 -0

b/include/configs/am335x_evm.h index 1425b6d..d85a635 100644

include/configs/am335x_evm.h +2 -2

@@ -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

include/configs/bav335x.h +2 -2

index 99e3a00..108efaf 100644
@@ -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

(quoted diff) +0 -0

b/include/configs/bcm28155_ap.h index f023f27..c6ef0d1 100644

include/configs/bcm28155_ap.h +0 -1

@@ -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

(quoted diff) +0 -0

b/include/configs/dra7xx_evm.h index db15cad..456f3c7 100644

include/configs/dra7xx_evm.h +2 -2

@@ -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

(quoted diff) +0 -0

b/include/configs/nitrogen6x.h index 191c0dd..d01a75b 100644

include/configs/nitrogen6x.h +2 -2

@@ -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 */

(quoted diff) +0 -0

b/include/configs/omap3_beagle.h index 9089876..4d7f355 100644

include/configs/omap3_beagle.h +2 -2

@@ -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

Quoted 9 lines

Quoted 6 lines
Quoted 5 lines
include/configs/omap3_beagle.h line 82
Quoted 2 lines
include/configs/omap3_beagle.h +0 -0
 /* USB EHCI */
 #define CONFIG_CMD_USB

Marek Vasut

2015-07-24 19:54 UTC #5 lore raw

PATCH v2 1/1 usb: CONFIG_USB_FASTBOOT prefix replacement for consistency

Quoted 26 lines · Paul Kocialkowski

Le jeudi 23 juillet 2015 ? 09:15 +0200, Lukasz Majewski a ?crit :
Quoted 25 lines
Hi Paul,
Quoted 12 lines
Le lundi 20 juillet 2015 ? 14:57 +0200, Lukasz Majewski a ?crit :
Quoted 11 lines
Hi Paul,
Quoted 8 lines
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.
Quoted 7 lines
Quoted 3 lines
Applied to u-boot-dfu tree.
Thanks for your patch!
Thanks for merging all those. Perhaps it's time to submit a pull request? I need those patches merged to get some other things accepted.
Could you check if all your posted patches are available in Marek's Vasut tree (u-boot-usb)?

Quoted 6 lines

Quoted 1 line
It seems like they all are there.
That's right, but it looks like your tree has some more commits on top.
Either way, I would be happy with seeing my patches getting merged, either from Marek's tree or from yours.

Hi,

what wrong ? Some patches got lost ? What's the problem ?

I still didn't send a PR to Tom, waiting for a bit more of a settlement on the USB front. I will do that later today or tomorrow though.

Best regards,
Marek Vasut

Paul Kocialkowski

author

2015-07-25 14:47 UTC #6 lore raw

PATCH v2 1/1 usb: CONFIG_USB_FASTBOOT prefix replacement for consistency

Le vendredi 24 juillet 2015 ? 21:54 +0200, Marek Vasut a ?crit :

Quoted 29 lines · Paul Kocialkowski

Quoted 28 lines
Le jeudi 23 juillet 2015 ? 09:15 +0200, Lukasz Majewski a ?crit :
Quoted 26 lines
Hi Paul,
Quoted 12 lines
Le lundi 20 juillet 2015 ? 14:57 +0200, Lukasz Majewski a ?crit :
Quoted 11 lines
Hi Paul,
Quoted 8 lines
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.
Quoted 7 lines
Quoted 3 lines
Applied to u-boot-dfu tree.
Thanks for your patch!
Thanks for merging all those. Perhaps it's time to submit a pull request? I need those patches merged to get some other things accepted.
Could you check if all your posted patches are available in Marek's Vasut tree (u-boot-usb)?
It seems like they all are there.

Quoted 8 lines

Quoted 4 lines
That's right, but it looks like your tree has some more commits on top.
Either way, I would be happy with seeing my patches getting merged, either from Marek's tree or from yours.
Hi,
what wrong ? Some patches got lost ? What's the problem ?

Nothing in particular, I just wish to get those patches merged as soon as posible!

Quoted 2 lines

I still didn't send a PR to Tom, waiting for a bit more of a settlement on the USB front. I will do that later today or tomorrow though.

Alright then. Lukasz, anything preventing a PR on your side at this point?

Thanks!

Signature · 16 lines

Paul Kocialkowski, Replicant developer

Replicant is a fully free Android distribution running on several
devices, a free software mobile operating system putting the emphasis on
freedom and privacy/security.

Website: http://www.replicant.us/
Blog: http://blog.replicant.us/
Wiki/tracker/forums: http://redmine.replicant.us/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150725/a55fbb17/attachment.sig>

Paul Kocialkowski

2015-07-25 14:50 UTC #7 lore raw

PATCH v2 1/1 usb: CONFIG_USB_FASTBOOT prefix replacement for consistency

Le samedi 25 juillet 2015 ? 16:47 +0200, Paul Kocialkowski a ?crit :

Quoted 39 lines

Le vendredi 24 juillet 2015 ? 21:54 +0200, Marek Vasut a ?crit :
Quoted 29 lines · Paul Kocialkowski
Quoted 28 lines
Le jeudi 23 juillet 2015 ? 09:15 +0200, Lukasz Majewski a ?crit :
Quoted 26 lines
Hi Paul,
Quoted 12 lines
Le lundi 20 juillet 2015 ? 14:57 +0200, Lukasz Majewski a ?crit :
Quoted 11 lines
Hi Paul,
Quoted 8 lines
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.
Quoted 7 lines
Quoted 3 lines
Applied to u-boot-dfu tree.
Thanks for your patch!
Thanks for merging all those. Perhaps it's time to submit a pull request? I need those patches merged to get some other things accepted.
Could you check if all your posted patches are available in Marek's Vasut tree (u-boot-usb)?
It seems like they all are there.
Quoted 8 lines
Quoted 4 lines
That's right, but it looks like your tree has some more commits on top.
Either way, I would be happy with seeing my patches getting merged, either from Marek's tree or from yours.
Hi,
what wrong ? Some patches got lost ? What's the problem ?

Quoted 8 lines

Nothing in particular, I just wish to get those patches merged as soon as posible!
Quoted 2 lines
I still didn't send a PR to Tom, waiting for a bit more of a settlement on the USB front. I will do that later today or tomorrow though.
Alright then. Lukasz, anything preventing a PR on your side at this point?

Oh well, I just saw that Marek has submitted a PR yesterday, thanks! -------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150725/bb1fbbe9/attachment.sig>

Paul Kocialkowski

author

2015-07-25 14:50 UTC #8 lore raw

PATCH v2 1/1 usb: CONFIG_USB_FASTBOOT prefix replacement for consistency

In reply to Paul Kocialkowski

Le samedi 25 juillet 2015 ? 16:47 +0200, Paul Kocialkowski a ?crit :

Quoted 39 lines

Le vendredi 24 juillet 2015 ? 21:54 +0200, Marek Vasut a ?crit :
Quoted 29 lines · Paul Kocialkowski
Quoted 28 lines
Le jeudi 23 juillet 2015 ? 09:15 +0200, Lukasz Majewski a ?crit :
Quoted 26 lines
Hi Paul,
Quoted 12 lines
Le lundi 20 juillet 2015 ? 14:57 +0200, Lukasz Majewski a ?crit :
Quoted 11 lines
Hi Paul,
Quoted 8 lines
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.
Quoted 7 lines
Quoted 3 lines
Applied to u-boot-dfu tree.
Thanks for your patch!
Thanks for merging all those. Perhaps it's time to submit a pull request? I need those patches merged to get some other things accepted.
Could you check if all your posted patches are available in Marek's Vasut tree (u-boot-usb)?
It seems like they all are there.
Quoted 8 lines
Quoted 4 lines
That's right, but it looks like your tree has some more commits on top.
Either way, I would be happy with seeing my patches getting merged, either from Marek's tree or from yours.
Hi,
what wrong ? Some patches got lost ? What's the problem ?

Quoted 8 lines

Nothing in particular, I just wish to get those patches merged as soon as posible!
Quoted 2 lines
I still didn't send a PR to Tom, waiting for a bit more of a settlement on the USB front. I will do that later today or tomorrow though.
Alright then. Lukasz, anything preventing a PR on your side at this point?