From: Paul Kocialkowski Date: Mon, 20 Jul 2015 13:17:15 +0000 (+0200) Subject: sniper: Fastboot support X-Git-Tag: v2015.10-rc2~125 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fbdd3299d2ce67aa04b62e44038dd355af349b7e;p=u-boot sniper: Fastboot support This adds support for the fastboot USB gadget, including flashing to the internal MMC and reboot to bootloader or not. Signed-off-by: Paul Kocialkowski Reviewed-by: Tom Rini [trini: Update to use Kconfig for MUSB] Signed-off-by: Tom Rini --- diff --git a/board/lge/sniper/sniper.c b/board/lge/sniper/sniper.c index b211528e2b..2bfc9c5b4a 100644 --- a/board/lge/sniper/sniper.c +++ b/board/lge/sniper/sniper.c @@ -10,6 +10,8 @@ #include #include #include +#include +#include #include #include #include @@ -37,6 +39,25 @@ U_BOOT_DEVICE(sniper_serial) = { .platdata = &serial_omap_platdata }; +static struct musb_hdrc_config musb_config = { + .multipoint = 1, + .dyn_fifo = 1, + .num_eps = 16, + .ram_bits = 12 +}; + +static struct omap_musb_board_data musb_board_data = { + .interface_type = MUSB_INTERFACE_ULPI, +}; + +static struct musb_hdrc_platform_data musb_platform_data = { + .mode = MUSB_PERIPHERAL, + .config = &musb_config, + .power = 100, + .platform_ops = &omap2430_ops, + .board_data = &musb_board_data, +}; + #ifdef CONFIG_SPL_BUILD void get_board_mem_timings(struct board_sdrc_timings *timings) { @@ -95,6 +116,10 @@ int misc_init_r(void) setenv("serial#", serial_string); } + /* MUSB */ + + musb_register(&musb_platform_data, &musb_board_data, (void *)MUSB_BASE); + return 0; } @@ -116,6 +141,11 @@ void get_board_serial(struct tag_serialnr *serialnr) } } +int fb_set_reboot_flag(void) +{ + return omap_reboot_mode_store('b'); +} + void set_muxconf_regs(void) { MUX_SNIPER(); diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index d2e10a9c04..44cf3595b3 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -5,3 +5,5 @@ CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set +CONFIG_USB=y +CONFIG_USB_MUSB_GADGET=y diff --git a/include/configs/sniper.h b/include/configs/sniper.h index f17bb04149..b40c4c0591 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -215,6 +215,42 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, \ 115200 } +/* + * USB gadget + */ + +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_OMAP2PLUS +#define CONFIG_TWL4030_USB + +#define CONFIG_USB_GADGET +#define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_VBUS_DRAW 0 + +/* + * Download + */ + +#define CONFIG_USB_GADGET_DOWNLOAD + +#define CONFIG_G_DNL_VENDOR_NUM 0x0451 +#define CONFIG_G_DNL_PRODUCT_NUM 0xd022 +#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" + +/* + * Fastboot + */ + +#define CONFIG_USB_FUNCTION_FASTBOOT + +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR +#define CONFIG_FASTBOOT_BUF_SIZE 0x2000000 + +#define CONFIG_FASTBOOT_FLASH +#define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 + +#define CONFIG_CMD_FASTBOOT + /* * Environment */ @@ -255,6 +291,8 @@ "setenv boot_mmc_part ${kernel_mmc_part}; " \ "if test reboot-${reboot-mode} = reboot-r; then " \ "echo recovery; setenv boot_mmc_part ${recovery_mmc_part}; fi; " \ + "if test reboot-${reboot-mode} = reboot-b; then " \ + "echo fastboot; fastboot 0; fi; " \ "part start mmc ${boot_mmc_dev} ${boot_mmc_part} boot_mmc_start; " \ "part size mmc ${boot_mmc_dev} ${boot_mmc_part} boot_mmc_size; " \ "mmc dev ${boot_mmc_dev}; " \