16aabfe2f2
board_usb_init() should receive the controller_index as its first parameter instead of having it hardcoded as 0. All in-tree users have CONFIG_SPL_SDP_USB_DEV as 0, so this error should not affect any board. Fix it by passing controller_index as the parameter of board_usb_init(). Signed-off-by: Fabio Estevam <festevam@denx.de> Acked-by: Peng Fan <peng.fan@nxp.com>
49 lines
1.1 KiB
C
49 lines
1.1 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2016 Toradex
|
|
* Author: Stefan Agner <stefan.agner@toradex.com>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <log.h>
|
|
#include <spl.h>
|
|
#include <usb.h>
|
|
#include <g_dnl.h>
|
|
#include <sdp.h>
|
|
|
|
static int spl_sdp_load_image(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev)
|
|
{
|
|
int ret;
|
|
const int controller_index = CONFIG_SPL_SDP_USB_DEV;
|
|
|
|
usb_gadget_initialize(controller_index);
|
|
|
|
board_usb_init(controller_index, USB_INIT_DEVICE);
|
|
|
|
g_dnl_clear_detach();
|
|
ret = g_dnl_register("usb_dnl_sdp");
|
|
if (ret) {
|
|
pr_err("SDP dnl register failed: %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = sdp_init(controller_index);
|
|
if (ret) {
|
|
pr_err("SDP init failed: %d\n", ret);
|
|
return -ENODEV;
|
|
}
|
|
|
|
/*
|
|
* This command either loads a legacy image, jumps and never returns,
|
|
* or it loads a FIT image and returns it to be handled by the SPL
|
|
* code.
|
|
*/
|
|
ret = spl_sdp_handle(controller_index, spl_image, bootdev);
|
|
debug("SDP ended\n");
|
|
|
|
usb_gadget_release(controller_index);
|
|
return ret;
|
|
}
|
|
SPL_LOAD_IMAGE_METHOD("USB SDP", 0, BOOT_DEVICE_BOARD, spl_sdp_load_image);
|