mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ipq: bootm: do pcie and usb deinit in bootm path"

Browse source 
This reverts commit 7bec79fb7c.

Change-Id: Iec49eff0936d8af6fd093518522db8095fb6ef1c
Signed-off-by: Antony Arun T <antothom@codeaurora.org>
This commit is contained in:
Antony Arun T 2019-09-26 13:44:22 +05:30
parent 8523967598
commit 8d977bd916
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common/bootm.c
View file

@ -39,8 +39,6 @@
#ifndef USE_HOSTCC
extern void board_usb_deinit(int id);
DECLARE_GLOBAL_DATA_PTR;
static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
@ -603,9 +601,6 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
boot_os_fn *boot_fn;
ulong iflag = 0;
int ret = 0, need_boot_fn;
#ifdef CONFIG_USB_XHCI_IPQ
unsigned int i;
#endif
images->state |= states;
@ -707,18 +702,9 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
}
/* Now run the OS! We hope this doesn't return */
if (!ret && (states & BOOTM_STATE_OS_GO)) {
board_pci_deinit();
#ifdef CONFIG_USB_XHCI_IPQ
usb_stop();
for (i=0; i<CONFIG_USB_MAX_CONTROLLER_COUNT; i++) {
board_usb_deinit(i);
}
#endif
if (!ret && (states & BOOTM_STATE_OS_GO))
ret = boot_selected_os(argc, argv, BOOTM_STATE_OS_GO,
images, boot_fn);
}
/* Deal with any fallout */
err: