Merge remote-tracking branch 'upstream/master' into pr

[soc.git] / src / soc / fu / compunits / test / test_branch_compunit.py

diff --git a/src/soc/fu/compunits/test/test_branch_compunit.py b/src/soc/fu/compunits/test/test_branch_compunit.py
index 7c85050e3eed956db109244ea678b4cfb4057d36..b8e7aa326032cb979da46db58c5d20b6bbcb2cea 100644 (file)
--- a/src/soc/fu/compunits/test/test_branch_compunit.py
+++ b/src/soc/fu/compunits/test/test_branch_compunit.py
@@ -1,13 +1,11 @@
 import unittest
-from openpower.decoder.power_enums import (XER_bits, Function, spr_dict, SPR)
+from openpower.decoder.power_enums import (XER_bits, Function)
 
 from soc.fu.branch.test.test_pipe_caller import BranchTestCase, get_cu_inputs
 
 from soc.fu.compunits.compunits import BranchFunctionUnit
 from soc.fu.compunits.test.test_compunit import TestRunner
-from soc.config.endian import bigendian
-
-from soc.regfile.util import fast_reg_to_spr  # HACK!
+from openpower.endian import bigendian
 
 
 """