Merge branch 'adafruit:main' into main

diff --combined src/board.py
index 4ab0af190cfa3b3b80732c9d0a435af0b70dde10,19bfe956d671f86dcc9ca5c8366e83c6c1ca3b55..ef2664c1ab4d0d9ed43bb14f2e1bb8175fb16160
--- 1/src/board.py
--- 2/src/board.py
+++ b/src/board.py
@@@ -223,6 -223,9 +223,9 @@@ elif board_id == ap_board.CLOCKWORK_CPI
  elif board_id == ap_board.ONION_OMEGA2:
      from adafruit_blinka.board.onion.omega2 import *
  
+ elif board_id == ap_board.RADXA_CM3:
+     from adafruit_blinka.board.radxa.radxacm3 import *
+ 
  elif board_id == ap_board.RADXA_ZERO:
      from adafruit_blinka.board.radxa.radxazero import *
  
@@@ -238,8 -241,8 +241,8 @@@ elif board_id == ap_board.ROCK_PI_E
  elif board_id == ap_board.UDOO_X86:
      from adafruit_blinka.board.udoo_x86ultra import *
  
 -elif board_id == ap_board.ODYSSEY_X86J4105:
 -    from adafruit_blinka.board.x86j4105 import *
 +elif board_id == ap_board.ODYSSEY_X86J41X5:
 +    from adafruit_blinka.board.x86j41x5 import *
  
  elif board_id == ap_board.STM32MP157C_DK2:
      from adafruit_blinka.board.stm32.stm32mp157c_dk2 import *