Revert "ipq: bootm: do pcie and usb deinit in bootm path"
This reverts commit 7bec79fb7c33027c8a5401e1b526164d10db976b.
Change-Id: Iec49eff0936d8af6fd093518522db8095fb6ef1c
Signed-off-by: Antony Arun T <antothom@codeaurora.org>
diff --git a/common/bootm.c b/common/bootm.c
index ca368c2..9c8d28a 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -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 @@
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 @@
}
/* 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: