From: Ye Li <ye.li@nxp.com>
Date: Thu, 3 Jan 2019 06:37:49 +0000 (-0800)
Subject: MLK-20559-1 spl_sdp: Add CONFIG_SPL_SDP_USB_DEV for USB device
X-Git-Tag: rel_imx_4.19.35_1.1.0~624
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=c2da455b3d690d1d0bafece240360a288dad661a;p=u-boot.git

MLK-20559-1 spl_sdp: Add CONFIG_SPL_SDP_USB_DEV for USB device

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.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit dba0d7c7dc3b9b60043726931b1f635b725e9756)
---

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 206c24076d..77b4616956 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -865,6 +865,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
diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
index e2da3f5cdc..b15f1a597c 100644
--- a/common/spl/spl_sdp.c
+++ b/common/spl/spl_sdp.c
@@ -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();
 	g_dnl_register("usb_dnl_sdp");