Commit 17da3c0c authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Marek Vasut

usb: Fastboot function config for better consistency with other functions

USB download gadget functions such as thor and dfu have a separate config option
for the USB gadget part of the code, independent from the command part.
This switches the fastboot USB gadget to the same scheme, for better
consistency.
Signed-off-by: 's avatarPaul Kocialkowski <contact@paulk.fr>
Tested-by: 's avatarLukasz Majewski <l.majewski@samsung.com>

Test HW: Odroid_XU3 (Exynos5422), trats (Exynos4210)
parent 01acd6ab
...@@ -1716,6 +1716,9 @@ The following options need to be configured: ...@@ -1716,6 +1716,9 @@ The following options need to be configured:
sending again an USB request to the device. sending again an USB request to the device.
- USB Device Android Fastboot support: - USB Device Android Fastboot support:
CONFIG_USB_FUNCTION_FASTBOOT
This enables the USB part of the fastboot gadget
CONFIG_CMD_FASTBOOT CONFIG_CMD_FASTBOOT
This enables the command "fastboot" which enables the Android This enables the command "fastboot" which enables the Android
fastboot mode for the platform's USB device. Fastboot is a USB fastboot mode for the platform's USB device. Fastboot is a USB
......
...@@ -163,7 +163,7 @@ void arch_preboot_os(void) ...@@ -163,7 +163,7 @@ void arch_preboot_os(void)
} }
#endif #endif
#if defined(CONFIG_CMD_FASTBOOT) && !defined(CONFIG_ENV_IS_NOWHERE) #if defined(CONFIG_USB_FUNCTION_FASTBOOT) && !defined(CONFIG_ENV_IS_NOWHERE)
int fb_set_reboot_flag(void) int fb_set_reboot_flag(void)
{ {
printf("Setting reboot to fastboot flag ...\n"); printf("Setting reboot to fastboot flag ...\n");
......
...@@ -42,8 +42,8 @@ NOTE: The CONFIG_G_DNL_VENDOR_NUM must be one of the numbers supported by ...@@ -42,8 +42,8 @@ NOTE: The CONFIG_G_DNL_VENDOR_NUM must be one of the numbers supported by
the fastboot client. The list of vendor IDs supported can be found in the the fastboot client. The list of vendor IDs supported can be found in the
fastboot client source code (fastboot.c) mentioned above. fastboot client source code (fastboot.c) mentioned above.
The fastboot function is enabled by defining CONFIG_CMD_FASTBOOT and The fastboot function is enabled by defining CONFIG_USB_FUNCTION_FASTBOOT,
CONFIG_ANDROID_BOOT_IMAGE. 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
......
...@@ -19,7 +19,7 @@ obj-$(CONFIG_USB_GADGET_DOWNLOAD) += g_dnl.o ...@@ -19,7 +19,7 @@ obj-$(CONFIG_USB_GADGET_DOWNLOAD) += g_dnl.o
obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o
obj-$(CONFIG_USB_FUNCTION_DFU) += f_dfu.o obj-$(CONFIG_USB_FUNCTION_DFU) += f_dfu.o
obj-$(CONFIG_USB_FUNCTION_MASS_STORAGE) += f_mass_storage.o obj-$(CONFIG_USB_FUNCTION_MASS_STORAGE) += f_mass_storage.o
obj-$(CONFIG_CMD_FASTBOOT) += f_fastboot.o obj-$(CONFIG_USB_FUNCTION_FASTBOOT) += f_fastboot.o
endif endif
ifdef CONFIG_USB_ETHER ifdef CONFIG_USB_ETHER
obj-y += ether.o obj-y += ether.o
......
...@@ -298,6 +298,7 @@ ...@@ -298,6 +298,7 @@
#ifndef CONFIG_SPL_USBETH_SUPPORT #ifndef CONFIG_SPL_USBETH_SUPPORT
/* Fastboot */ /* 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_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
......
...@@ -455,6 +455,7 @@ DEFAULT_LINUX_BOOT_ENV \ ...@@ -455,6 +455,7 @@ DEFAULT_LINUX_BOOT_ENV \
#ifndef CONFIG_SPL_USBETH_SUPPORT #ifndef CONFIG_SPL_USBETH_SUPPORT
/* Fastboot */ /* 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_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
......
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
DFU_ALT_INFO_RAM DFU_ALT_INFO_RAM
/* Fastboot */ /* 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_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
......
...@@ -346,6 +346,7 @@ ...@@ -346,6 +346,7 @@
#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
#define CONFIG_G_DNL_MANUFACTURER "Boundary" #define CONFIG_G_DNL_MANUFACTURER "Boundary"
#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_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
#define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
#define CONFIG_G_DNL_PRODUCT_NUM 0xd022 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022
#define CONFIG_G_DNL_MANUFACTURER "TI" #define CONFIG_G_DNL_MANUFACTURER "TI"
#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_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment