Resolving merge conflict

[hackapet/Adafruit_Blinka.git] / src / busio.py

diff --git a/src/busio.py b/src/busio.py
index 3e85335917252d083d99fdb41e7338f0d2362209..10535043154397227b44d486e2df7a3e1df8b521 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -156,6 +156,9 @@ class SPI(Lockable):
         elif board_id == ap_board.JETSON_XAVIER:
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.tegra.t194.pin import Pin
         elif board_id == ap_board.JETSON_XAVIER:
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.tegra.t194.pin import Pin

+        elif detector.board.SIFIVE_UNLEASHED:
+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
+            from adafruit_blinka.microcontroller.hfu540.pin import Pin

         elif board_id == ap_board.PINE64:
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
         elif board_id == ap_board.PINE64:
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin