toolkit: Fix imports.

Signed-off-by: iabdalkader <[email protected]>

Author: iabdalkader

toolkit/isp/recovery.py

@@ -18,13 +18,13 @@
 # pylint: disable=unused-argument, invalid-name, bare-except
 import sys
 
-from isp_protocol import *
-from isp_core import *
-from isp_util import *
+from isp.isp_protocol import *
+from isp.isp_core import *
+from isp.isp_util import *
 import utils.config
 from utils.config import *
 from utils.user_validations import validateArgList
-import device_probe
+from isp import device_probe
 import time
 
 # Probe error codes

toolkit/maintenance.py

@@ -16,21 +16,22 @@
 import sys
 import argparse
 
-from serialport import serialPort  # ISP Serial support
-from serialport import COM_TIMEOUT_RX_DEFAULT
-from isp_protocol import *  # ISP protocol constants
-from isp_core import *
-from isp_util import *
-from isp_print import *
-import device_probe
+from isp.serialport import serialPort  # ISP Serial support
+from isp.serialport import COM_TIMEOUT_RX_DEFAULT
+from isp.isp_protocol import *  # ISP protocol constants
+from isp.isp_core import *
+from isp.isp_util import *
+from isp.isp_print import *
+from isp import device_probe
 
 # from isp_print import isp_print_color, isp_print_cursor_enable
 # from isp_print import isp_print_cursor_disable,isp_print_terminal_reset
-from toc_decode import *  # ISP TOC support
-from power_decode import *  # ISP POWER support
+from isp.toc_decode import *  # ISP TOC support
+from isp.power_decode import *  # ISP POWER support
 from utils.config import *
 from utils.user_validations import validateArgList
-from recovery import recovery_action, recovery_action_no_reset
+from isp.recovery import recovery_action, recovery_action_no_reset
+import utils
 
 
 # Define Version constant for each separate tool

toolkit/updateSystemPackage.py

@@ -12,13 +12,13 @@
 import sys
 import argparse
 
-from serialport import serialPort
-from serialport import COM_BAUD_RATE_MAXIMUM
+from isp.serialport import serialPort
+from isp.serialport import COM_BAUD_RATE_MAXIMUM
 
 # import ispcommands
-from isp_core import *
-from isp_util import *
-import device_probe
+from isp.isp_core import *
+from isp.isp_util import *
+from isp import device_probe
 import utils.config
 from utils.config import *