fix merge conflict in branch

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

diff --git a/src/board.py b/src/board.py
index 7fb99ae231748762b77e83b667868843f98e61ce..30b9f0ac077ce9a846164ef8c1aad9d0db30f765 100755 (executable)
--- a/src/board.py
+++ b/src/board.py
@@ -66,7 +66,8 @@ elif board_id == ap_board.BEAGLEBONE_BLACK_INDUSTRIAL:
 
 elif board_id == ap_board.BEAGLEBONE_GREEN_WIRELESS:
     from adafruit_blinka.board.beagleboard.beaglebone_black import *
-
+elif board_id == ap_board.BEAGLEBONE_BLACK_WIRELESS:
+    from adafruit_blinka.board.beagleboard.beaglebone_black import *
 elif board_id == ap_board.BEAGLEBONE_POCKETBEAGLE:
     from adafruit_blinka.board.beagleboard.beaglebone_pocketbeagle import *
 
@@ -115,6 +116,9 @@ elif board_id == ap_board.CORAL_EDGE_TPU_DEV:
 elif board_id == ap_board.ODROID_C2:
     from adafruit_blinka.board.hardkernel.odroidc2 import *
 
+elif board_id == ap_board.ODROID_C4:
+    from adafruit_blinka.board.hardkernel.odroidc4 import *
+
 elif board_id == ap_board.ODROID_N2:
     from adafruit_blinka.board.hardkernel.odroidn2 import *
 
@@ -136,6 +140,12 @@ elif board_id == ap_board.SIFIVE_UNLEASHED:
 elif board_id == ap_board.PINE64:
     from adafruit_blinka.board.pine64 import *
 
+elif board_id == ap_board.CLOCKWORK_CPI3:
+    from adafruit_blinka.board.clockworkcpi3 import *
+
+elif board_id == ap_board.ONION_OMEGA2:
+    from adafruit_blinka.board.onion.omega2 import *
+
 elif "sphinx" in sys.modules:
     pass