spl: sdp: call board_usb_init at spl_sdp_load_image
PATCH 1/5 spl: sdp: call board_usb_init at spl_sdp_load_image
From: Frank Li <[email protected]>
Need initialize UDC before run sdp download
--- common/spl/spl_sdp.c | 2 ++ 1 file changed, 2 insertions(+)
common/spl/spl_sdp.c +2 -0
@@ -16,6 +16,8 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,int ret;const int controller_index =0 ; +board_usb_init (0 ,USB_INIT_DEVICE ); +g_dnl_clear_detach (); ret =g_dnl_register ("usb_dnl_sdp" );if (ret) {
Signature · 1 line
2.16.4
PATCH 2/5 usb: gadget: sdp: use CONFIG_SDP_LOADADDR as default load address
From: Frank Li <[email protected]>
If SDP_WRITE and SDP_JUMP addr is zero, use CONFIG_SDP_LOADADDR as default address
--- drivers/usb/gadget/Kconfig | 4 ++++ drivers/usb/gadget/f_sdp.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/usb/gadget/Kconfig +4 -0
@@ -122,6 +122,10 @@ config USB_GADGET_VBUS_DRAW This value will be used except for system-specific gadget drivers that have more specific information. +config SDP_LOADADDR + hex "Default load address at SDP_WRITE and SDP_JUMP" + default 0 + # Selected by UDC drivers that support high-speed operation. config USB_GADGET_DUALSPEED bool
drivers/usb/gadget/f_sdp.c +2 -2
@@ -276,7 +276,7 @@ static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req) sdp->error_status =SDP_WRITE_FILE_COMPLETE ; sdp->state =SDP_STATE_RX_FILE_DATA ; - sdp->dnl_address =be32_to_cpu (cmd->addr); + sdp->dnl_address = cmd->addr ?be32_to_cpu (cmd->addr) :CONFIG_SDP_LOADADDR ; sdp->dnl_bytes_remaining =be32_to_cpu (cmd->cnt); sdp->dnl_bytes = sdp->dnl_bytes_remaining; sdp->next_state =SDP_STATE_IDLE ;
@@ -304,7 +304,7 @@ static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req) sdp->always_send_status = false; sdp->error_status =0 ; - sdp->jmp_address =be32_to_cpu (cmd->addr); + sdp->jmp_address = cmd->addr ?be32_to_cpu (cmd->addr) :CONFIG_SDP_LOADADDR ; sdp->state =SDP_STATE_TX_SEC_CONF ; sdp->next_state =SDP_STATE_JUMP ;break ;
Signature · 1 line
2.16.4
PATCH 2/5 usb: gadget: sdp: use CONFIG_SDP_LOADADDR as default load address
Quoted 5 lines
From: Frank Li <[email protected]>
IfSDP_WRITEandSDP_JUMPaddr is zero, useCONFIG_SDP_LOADADDRas default addressSigned-off-by Frank Li <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 3/5 spl: sdp: Add CONFIG_SPL_SDP_USB_DEV for USB device
In reply to Peng FanFrom: Ye Li <[email protected]>
Add a new configuration CONFIG_SPL_SDP_USB_DEV to specify the usb index for spl sdp driver, so that we change use different device. The default value is 0.
--- common/spl/Kconfig | 8 ++++++++ common/spl/spl_sdp.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-)
common/spl/Kconfig +8 -0
@@ -1181,6 +1181,14 @@ config SPL_USB_SDP_SUPPORT Enable Serial Download Protocol (SDP) device support in SPL. This allows to download images into memory and execute (jump to) them using the same protocol as implemented by the i.MX family's boot ROM. + +config SPL_SDP_USB_DEV + int "SDP USB controller index" + default 0 + depends on SPL_USB_SDP_SUPPORT + help + Some boards have USB controller other than 0. Define this option + so it can be used in compiled environment. endif config SPL_WATCHDOG_SUPPORT
common/spl/spl_sdp.c +2 -2
@@ -14,9 +14,9 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) {int ret; -const int controller_index =0 ; +const int controller_index =CONFIG_SPL_SDP_USB_DEV ; -board_usb_init (0 ,USB_INIT_DEVICE ); +board_usb_init (controller_index,USB_INIT_DEVICE );g_dnl_clear_detach (); ret =g_dnl_register ("usb_dnl_sdp" );
Signature · 1 line
2.16.4
PATCH 3/5 spl: sdp: Add CONFIG_SPL_SDP_USB_DEV for USB device
Quoted 6 lines
From: Ye Li <[email protected]>
Add a new configurationCONFIG_SPL_SDP_USB_DEVto specify the usb index for spl sdp driver, so that we change use different device. The default value is 0.Signed-off-by Ye Li <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 4/5 spl: sdp: Add a callback to clean up USB driver
In reply to Peng FanFrom: Ye Li <[email protected]>
Because SDP directly jumps to next level boot image, we'd better clean up the USB driver before it. Implement a weak callback function, that spl sdp can use it to clean up USB driver.
--- common/spl/spl_sdp.c | 1 + 1 file changed, 1 insertion(+)
common/spl/spl_sdp.c +1 -0
@@ -39,6 +39,7 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image, ret =spl_sdp_handle (controller_index, spl_image);debug ("SDP ended\n" ); +board_usb_cleanup (controller_index,USB_INIT_DEVICE );return ret; }SPL_LOAD_IMAGE_METHOD ("USB SDP" ,0 ,BOOT_DEVICE_BOARD , spl_sdp_load_image);
Signature · 1 line
2.16.4
PATCH 4/5 spl: sdp: Add a callback to clean up USB driver
Quoted 6 lines
From: Ye Li <[email protected]>
Because SDP directly jumps to next level boot image, we'd better clean up the USB driver before it. Implement a weak callback function, that spl sdp can use it to clean up USB driver.Signed-off-by Ye Li <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 5/5 spl: sdp: Add DM gadget support for sdp
In reply to Peng FanFrom: Sherry Sun <[email protected]>
When enable CONFG_SPL_DM_USB_GADGET, sdp should use usb_gadget_initialize() and usb_gadget_release() to support DM gadget driver.
--- common/spl/spl_sdp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
common/spl/spl_sdp.c +2 -2
@@ -16,7 +16,7 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,int ret;const int controller_index =CONFIG_SPL_SDP_USB_DEV ; -board_usb_init (controller_index,USB_INIT_DEVICE ); +usb_gadget_initialize (controller_index);g_dnl_clear_detach (); ret =g_dnl_register ("usb_dnl_sdp" );
@@ -39,7 +39,7 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image, ret =spl_sdp_handle (controller_index, spl_image);debug ("SDP ended\n" ); -board_usb_cleanup (controller_index,USB_INIT_DEVICE ); +usb_gadget_release (controller_index);return ret; }SPL_LOAD_IMAGE_METHOD ("USB SDP" ,0 ,BOOT_DEVICE_BOARD , spl_sdp_load_image);
Signature · 1 line
2.16.4
PATCH 5/5 spl: sdp: Add DM gadget support for sdp
Quoted 6 lines
From: Sherry Sun <[email protected]>
When enableCONFG_SPL_DM_USB_GADGET, sdp should useusb_gadget_initialize()andusb_gadget_release()to support DM gadget driver.Signed-off-by Sherry Sun <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/5 spl: sdp: call board_usb_init at spl_sdp_load_image
In reply to Peng FanQuoted 4 lines
From: Frank Li <[email protected]> Need initialize UDC before run sdp download
Signed-off-by Frank Li <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================