Merge branch 'adafruit:main' into main

diff --combined src/board.py
index bd93eb515b4bf6790a01faad0e00032e72aab20d,4ff79e10201ba88dad72f0bc8d3a87a22b6ef5c2..a1e800c2fc9f3a0800cdfd1fa2665e69990e8085
--- 1/src/board.py
--- 2/src/board.py
+++ b/src/board.py
@@@ -229,9 -229,6 +229,9 @@@ elif board_id == ap_board.ONION_OMEGA2
  elif board_id == ap_board.RADXA_CM3:
      from adafruit_blinka.board.radxa.radxacm3 import *
  
 +elif board_id == ap_board.ROCK_PI_3A:
 +    from adafruit_blinka.board.radxa.rockpi3a import *
 +
  elif board_id == ap_board.RADXA_ZERO:
      from adafruit_blinka.board.radxa.radxazero import *
  
@@@ -310,9 -307,15 +310,15 @@@ elif board_id == ap_board.LICHEE_RV
  elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_ADV:
      from adafruit_blinka.board.siemens.siemens_iot2050 import *
  
+ elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_BASIC:
+     from adafruit_blinka.board.siemens.siemens_iot2050 import *
+ 
  elif board_id == ap_board.AML_S905X_CC:
      from adafruit_blinka.board.librecomputer.aml_s905x_cc_v1 import *
  
+ elif board_id == ap_board.GENERIC_LINUX_PC:
+     from adafruit_blinka.board.generic_linux_pc import *
+ 
  elif "sphinx" in sys.modules:
      pass