Merge branch 'main' of https://github.com/adafruit/Adafruit_Blinka into vivid-unit2

diff --combined src/board.py
index 1a5ec9219a245cc6bccf5e59342b9509b9efea7f,667a2348e6fd77285095478b7d38d6a0fcbd9f4a..8bc94e83ec744bbce5232d79f7916d0548a74f9c
--- 1/src/board.py
--- 2/src/board.py
+++ b/src/board.py
@@@ -43,10 -43,9 +43,9 @@@ elif 
      or detector.board.RASPBERRY_PI_CM4
      or detector.board.RASPBERRY_PI_CM4S
      or detector.board.RASPBERRY_PI_400
+     or detector.board.RASPBERRY_PI_5
  ):
      from adafruit_blinka.board.raspberrypi.raspi_4b import *
- elif detector.board.RASPBERRY_PI_5:
-     from adafruit_blinka.board.raspberrypi.raspi_5b import *
  
  elif detector.board.any_raspberry_pi_40_pin:
      from adafruit_blinka.board.raspberrypi.raspi_40pin import *
@@@ -327,6 -326,9 +326,9 @@@ elif board_id == ap_board.LUBANCAT2
  elif board_id == ap_board.LUBANCAT4:
      from adafruit_blinka.board.lubancat.lubancat4 import *
  
+ elif board_id == ap_board.LUBANCAT5:
+     from adafruit_blinka.board.lubancat.lubancat5 import *
+ 
  elif board_id == ap_board.NANOPI_NEO_AIR:
      from adafruit_blinka.board.nanopi.neoair import *
  
@@@ -414,9 -416,6 +416,9 @@@ elif board_id == ap_board.LUCKFOX_PICO_
  elif board_id == ap_board.LUCKFOX_PICO_MAX:
      from adafruit_blinka.board.luckfox.luckfoxpico_max import *
  
 +elif board_id == ap_board.VIVID_UNIT:
 +    from adafruit_blinka.board.vivid_unit import *
 +
  elif "sphinx" in sys.modules:
      pass