"""
 import sys
 
-from adafruit_blinka.agnostic import board_id
+from adafruit_blinka.agnostic import board_id, detector
 import adafruit_platformdetect.board as ap_board
 
 # pylint: disable=wildcard-import,unused-wildcard-import,ungrouped-imports
 elif board_id == ap_board.PYBOARD:
     from adafruit_blinka.board.pyboard import *
 
-elif board_id in ap_board.ANY_RASPBERRY_PI_2_OR_3:
-    from adafruit_blinka.board.raspi_23 import *
+elif detector.board.any_raspberry_pi_40_pin:
+    from adafruit_blinka.board.raspi_40pin import *
+
+elif detector.board.RASPBERRY_PI_B_REV1:
+    from adafruit_blinka.board.raspi_1b_rev1 import *
+
+elif detector.board.RASPBERRY_PI_B_REV2:
+    from adafruit_blinka.board.raspi_1b_rev2 import *
 
 elif board_id == ap_board.BEAGLEBONE_BLACK:
     from adafruit_blinka.board.beaglebone_black import *
 elif board_id == ap_board.ORANGE_PI_PC:
     from adafruit_blinka.board.orangepipc import *
 
+elif board_id == ap_board.GIANT_BOARD:
+    from adafruit_blinka.board.giantboard import *
+
 elif "sphinx" in sys.modules:
     pass